Merge remote branch 'origin/pr/344/head' into merge_trafodion344
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b2fe5fd7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b2fe5fd7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b2fe5fd7 Branch: refs/heads/master Commit: b2fe5fd7a7a030bcd14adfdb3f45e9a80e5b07d4 Parents: fabfc80 7b99938 Author: Sandhya Sundaresan <sand...@apache.org> Authored: Tue Mar 1 06:48:58 2016 +0000 Committer: Sandhya Sundaresan <sand...@apache.org> Committed: Tue Mar 1 06:48:58 2016 +0000 ---------------------------------------------------------------------- core/sql/common/ComSmallDefs.h | 2 + core/sql/executor/HBaseClient_JNI.cpp | 25 +- core/sql/executor/HBaseClient_JNI.h | 3 +- core/sql/exp/ExpHbaseInterface.cpp | 8 +- core/sql/exp/ExpHbaseInterface.h | 12 +- core/sql/generator/Generator.cpp | 5 + core/sql/optimizer/NAColumn.h | 43 +- core/sql/optimizer/NATable.cpp | 7 +- .../sql/parser/StmtDDLAlterTableAlterColumn.cpp | 20 +- core/sql/parser/StmtDDLAlterTableAlterColumn.h | 17 +- core/sql/parser/sqlparser.y | 6 +- core/sql/regress/compGeneral/EXPECTED071 | 8 +- core/sql/regress/core/EXPECTED056.SB | 52 +- core/sql/regress/executor/EXPECTED013.SB | 38 +- core/sql/regress/privs2/EXPECTED138 | 2 +- core/sql/regress/seabase/EXPECTED011 | 101 +- core/sql/regress/seabase/EXPECTED027 | 433 ++++- core/sql/regress/seabase/TEST011 | 16 - core/sql/regress/seabase/TEST027 | 58 + core/sql/sqlcomp/CmpDescribe.cpp | 180 ++- core/sql/sqlcomp/CmpSeabaseDDL.h | 68 +- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 217 ++- core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 4 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 1504 ++++++++++++------ core/sql/sqlcomp/DefaultConstants.h | 4 + core/sql/sqlcomp/nadefaults.cpp | 8 +- .../java/org/trafodion/sql/HBaseClient.java | 33 +- 27 files changed, 1974 insertions(+), 900 deletions(-) ----------------------------------------------------------------------
