Merge remote branch 'origin/master' into ansharma_uint64_br
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/43595eaa Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/43595eaa Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/43595eaa Branch: refs/heads/master Commit: 43595eaa112229db88a226fc1c4b84a5f7287fa7 Parents: fa86814 75aebed Author: Anoop Sharma <[email protected]> Authored: Tue Jun 21 23:55:14 2016 +0000 Committer: Anoop Sharma <[email protected]> Committed: Tue Jun 21 23:55:14 2016 +0000 ---------------------------------------------------------------------- .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 78 ++ core/sql/bin/SqlciErrors.txt | 6 +- core/sql/comexe/ComTdb.h | 3 +- core/sql/common/CharType.cpp | 6 +- core/sql/common/CharType.h | 10 +- core/sql/common/NAType.cpp | 79 ++ core/sql/common/NAType.h | 2 + core/sql/executor/ExHbaseAccess.cpp | 26 + core/sql/exp/ExpAlignedFormat.h | 10 +- core/sql/exp/ExpErrorEnums.h | 4 +- core/sql/exp/ExpHbaseInterface.h | 16 - core/sql/exp/exp_conv.cpp | 88 ++ core/sql/exp/exp_tuple_desc.h | 2 +- core/sql/generator/GenPreCode.cpp | 91 +- core/sql/generator/GenRelScan.cpp | 59 +- core/sql/generator/Generator.cpp | 3 +- core/sql/optimizer/BindRelExpr.cpp | 25 +- core/sql/optimizer/BindWA.cpp | 3 +- core/sql/optimizer/BindWA.h | 37 +- core/sql/optimizer/ItemExpr.cpp | 1 + core/sql/optimizer/ItemFunc.h | 28 +- core/sql/optimizer/NAColumn.cpp | 15 + core/sql/optimizer/NAColumn.h | 3 + core/sql/optimizer/NAFileSet.h | 2 + core/sql/optimizer/NATable.cpp | 125 +- core/sql/optimizer/NATable.h | 25 +- core/sql/optimizer/RelExeUtil.cpp | 11 +- core/sql/optimizer/SynthType.cpp | 11 +- core/sql/parser/ElemDDLLike.cpp | 4 +- core/sql/parser/ElemDDLLikeCreateTable.h | 6 +- core/sql/parser/StmtDDLCreate.cpp | 43 +- core/sql/parser/sqlparser.y | 18 + core/sql/regress/charsets/EXPECTED315 | 4 +- core/sql/regress/core/EXPECTED116 | 125 +- core/sql/regress/core/TEST116 | 37 +- core/sql/regress/hive/EXPECTED005 | 12 +- core/sql/regress/hive/EXPECTED009 | 1131 +++++++++++++++--- core/sql/regress/hive/FILTER009 | 49 + core/sql/regress/hive/TEST009 | 91 +- core/sql/regress/hive/TEST020 | 2 +- core/sql/regress/privs2/EXPECTED129 | 36 +- core/sql/regress/seabase/EXPECTED003 | 2 +- core/sql/regress/seabase/EXPECTED011 | 16 +- core/sql/regress/seabase/EXPECTED031 | 237 ++++ core/sql/regress/seabase/TEST011 | 2 +- core/sql/regress/seabase/TEST031 | 53 + core/sql/sqlcat/desc.h | 3 +- core/sql/sqlcomp/CmpDescribe.cpp | 300 +++-- core/sql/sqlcomp/CmpSeabaseDDL.h | 136 ++- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 81 +- core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 89 +- core/sql/sqlcomp/CmpSeabaseDDLmd.h | 8 + core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 158 ++- core/sql/sqlcomp/DefaultConstants.h | 3 + core/sql/sqlcomp/nadefaults.cpp | 6 + 55 files changed, 2837 insertions(+), 584 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/43595eaa/core/sql/common/NAType.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/43595eaa/core/sql/common/NAType.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/43595eaa/core/sql/exp/exp_conv.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/43595eaa/core/sql/generator/GenPreCode.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/43595eaa/core/sql/optimizer/ItemExpr.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/43595eaa/core/sql/optimizer/NAColumn.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/43595eaa/core/sql/optimizer/NATable.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/43595eaa/core/sql/parser/StmtDDLCreate.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/43595eaa/core/sql/parser/sqlparser.y ----------------------------------------------------------------------
