Merge remote-tracking branch 'origin/newms_zy' into newms_zqh
test oldms method about table index database node
Merge remote-tracking branch 'origin/newms_zy' into newms_zqh
Merge remote-tracking branch 'origin/newms_zy' into newms_zqh
merge newms and old ms diskmanager.
modify merge newms and old ms DiskManager.java
modify diskmanager use enum about rstype.
merge with zqh