merge optimize
Merge remote branch 'origin/wangyufei' into wangchangli
Merge remote branch 'origin/wangyufei' into wangchangli
misc
finish optimizer and hbase scanner