You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2016/08/07 23:48:07 UTC
[2/5] incubator-trafodion git commit: Merge remote branch 'origin'
into traf-2094
Merge remote branch 'origin' into traf-2094
Resolving merge conflicts.
Conflicts:
core/sql/regress/seabase/EXPECTED031
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/66d03a83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/66d03a83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/66d03a83
Branch: refs/heads/master
Commit: 66d03a83489ec6d72b8d98f54a6530253eb2682b
Parents: 6d26622 2a0a301
Author: Suresh Subbiah <su...@apache.org>
Authored: Wed Aug 3 20:53:36 2016 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Wed Aug 3 20:53:36 2016 +0000
----------------------------------------------------------------------
core/sql/arkcmp/CmpStoredProc.cpp | 96 +-
core/sql/arkcmp/CmpStoredProc.h | 21 +-
core/sql/bin/SqlciErrors.txt | 3 +-
core/sql/common/CmpCommon.h | 1 +
core/sql/common/ComSmallDefs.h | 3 +-
core/sql/common/OperTypeEnum.h | 2 +
core/sql/generator/GenExplain.cpp | 99 +-
core/sql/generator/GenPreCode.cpp | 4 +-
core/sql/generator/GenRelExeUtil.cpp | 43 +-
core/sql/generator/GenRelMisc.cpp | 129 +-
core/sql/generator/GenRelScan.cpp | 41 +-
core/sql/generator/GenUdr.cpp | 4 +-
core/sql/generator/Generator.cpp | 782 ++++---
core/sql/generator/Generator.h | 78 +-
core/sql/nskgmake/sqlcat/Makefile | 1 +
core/sql/optimizer/BindItemExpr.cpp | 7 +-
core/sql/optimizer/BindRI.cpp | 28 +-
core/sql/optimizer/BindRelExpr.cpp | 97 +-
core/sql/optimizer/BindWA.h | 6 +-
core/sql/optimizer/EncodedKeyValue.cpp | 77 +-
core/sql/optimizer/EncodedKeyValue.h | 21 +-
core/sql/optimizer/ItemConstr.h | 5 +-
core/sql/optimizer/NAColumn.cpp | 192 +-
core/sql/optimizer/NAColumn.h | 4 +-
core/sql/optimizer/NAFileSet.cpp | 2 +-
core/sql/optimizer/NAFileSet.h | 10 +-
core/sql/optimizer/NARoutine.cpp | 66 +-
core/sql/optimizer/NARoutine.h | 2 +-
core/sql/optimizer/NATable.cpp | 2067 +++++++++---------
core/sql/optimizer/NATable.h | 14 +-
core/sql/optimizer/RelExeUtil.cpp | 24 +-
core/sql/optimizer/RelExeUtil.h | 20 +-
core/sql/optimizer/RelMisc.h | 2 +-
core/sql/optimizer/RelRoutine.cpp | 15 +-
core/sql/optimizer/RelRoutine.h | 28 +-
core/sql/optimizer/RelScan.h | 10 +-
core/sql/optimizer/RelStoredProc.cpp | 2 +-
core/sql/optimizer/ValueDesc.cpp | 7 +-
core/sql/parser/AllStmtDDL.h | 1 +
core/sql/parser/AllStmtDDLAlterTable.h | 1 +
core/sql/parser/BindStmtDDL.cpp | 31 +
core/sql/parser/ElemDDLNode.cpp | 12 +
core/sql/parser/ElemDDLNode.h | 4 +
core/sql/parser/StmtDDLAlter.cpp | 91 +
core/sql/parser/StmtDDLAlterSchema.h | 177 ++
core/sql/parser/StmtDDLAlterTableStoredDesc.h | 102 +
core/sql/parser/sqlparser.y | 80 +-
core/sql/regress/compGeneral/EXPECTED001.SB | 2 +
core/sql/regress/executor/EXPECTED013.SB | 2 +
core/sql/regress/executor/TEST122 | 6 +
core/sql/regress/fullstack2/EXPECTED062 | 6 +
core/sql/regress/fullstack2/EXPECTED062.RELEASE | 6 +
core/sql/regress/hive/EXPECTED018 | 187 +-
core/sql/regress/hive/TEST018 | 3 +
core/sql/regress/seabase/EXPECTED031 | 243 +-
core/sql/regress/seabase/TEST031 | 48 +-
core/sql/regress/tools/sbdefs | 2 +
core/sql/sqlcat/ReadTableDef.cpp | 404 ----
core/sql/sqlcat/ReadTableDef.h | 17 -
core/sql/sqlcat/TrafDDLdesc.cpp | 617 ++++++
core/sql/sqlcat/TrafDDLdesc.h | 1120 ++++++++++
core/sql/sqlcat/desc.h | 473 +---
core/sql/sqlcat/readRealArk.cpp | 146 +-
core/sql/sqlcat/readRealArk.h | 1 -
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 1 +
core/sql/sqlcomp/CmpDescribe.cpp | 23 +-
core/sql/sqlcomp/CmpSeabaseDDL.h | 85 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 323 ++-
core/sql/sqlcomp/CmpSeabaseDDLincludes.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 40 +-
core/sql/sqlcomp/CmpSeabaseDDLmd.h | 7 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 1 -
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 246 +++
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 731 +++++--
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 12 +-
core/sql/sqlcomp/DefaultConstants.h | 6 +
core/sql/sqlcomp/nadefaults.cpp | 10 +-
docs/src/site/markdown/index.md | 14 +-
.../site/resources/images/carousel/meetup.png | Bin 0 -> 81640 bytes
79 files changed, 5930 insertions(+), 3366 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/66d03a83/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/66d03a83/core/sql/generator/GenRelScan.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/66d03a83/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/66d03a83/core/sql/regress/seabase/EXPECTED031
----------------------------------------------------------------------
diff --cc core/sql/regress/seabase/EXPECTED031
index c3141d2,b6f3a9d..9c2255d
--- a/core/sql/regress/seabase/EXPECTED031
+++ b/core/sql/regress/seabase/EXPECTED031
@@@ -560,8 -482,8 +560,9 @@@ LC RC OP OPERATOR OP
>>invoke t031t1;
-- Definition of Trafodion table TRAFODION.SCH.T031T1
--- Definition current Tue Aug 2 19:11:21 2016
+-- Definition current Wed Aug 3 15:45:17 2016
+
+
(
SYSKEY LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
, A INT DEFAULT NULL
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/66d03a83/core/sql/regress/seabase/TEST031
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/66d03a83/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------