Repository: incubator-trafodion Updated Branches: refs/heads/master cacdd0fe8 -> 951c15d01
Merge branch 'master' of github.com:apache/incubator-trafodion into TRAFODION-2034 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/19cc70cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/19cc70cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/19cc70cc Branch: refs/heads/master Commit: 19cc70ccde415f824b17fac45600cf618aa5ee7a Parents: 5c1676b b6b9f43 Author: Amanda Moran <[email protected]> Authored: Mon Sep 19 18:39:20 2016 +0000 Committer: Amanda Moran <[email protected]> Committed: Mon Sep 19 18:39:20 2016 +0000 ---------------------------------------------------------------------- core/sqf/conf/log4j.hdfs.config | 2 + core/sqf/sqenvcom.sh | 3 +- .../hbase/client/transactional/RMInterface.java | 52 + .../transactional/SsccTransactionalTable.java | 153 +- .../transactional/TransactionalTable.java | 164 + .../transactional/TransactionalTableClient.java | 42 +- .../transactional/SsccRegionEndpoint.java.tmpl | 178 + .../transactional/TrxRegionEndpoint.java.tmpl | 386 +- .../generated/SsccRegionProtos.java | 12629 ++++++++++++----- .../generated/TrxRegionProtos.java | 11787 ++++++++++----- .../transactional/SsccTransactionState.java | 15 +- .../transactional/TransactionState.java | 16 +- .../transactional/TrxTransactionState.java.tmpl | 16 +- .../src/main/protobuf/SsccRegion.proto | 59 + .../hbase-trx/src/main/protobuf/TrxRegion.proto | 54 +- core/sql/SqlCompilerDebugger/TDBTreeView.cpp | 10 +- core/sql/bin/SqlciErrors.txt | 4 + core/sql/common/NumericType.cpp | 6 + core/sql/common/NumericType.h | 2 + core/sql/common/OperTypeEnum.h | 9 + core/sql/common/str.cpp | 310 +- core/sql/common/str.h | 10 + core/sql/executor/ExSequence.cpp | 17 +- core/sql/executor/ExSequence.h | 4 +- core/sql/exp/ExpAtp.cpp | 1 - core/sql/exp/ExpPackDefs.cpp | 14 + core/sql/exp/ExpSequenceFunction.cpp | 18 +- core/sql/exp/ExpSequenceFunction.h | 2 + core/sql/exp/ExpSqlTupp.h | 3 +- core/sql/exp/exp_clause.cpp | 21 + core/sql/exp/exp_clause.h | 19 +- core/sql/exp/exp_conv.cpp | 13 +- core/sql/exp/exp_function.cpp | 366 + core/sql/exp/exp_function.h | 93 + core/sql/exp/exp_math_func.cpp | 12 + core/sql/generator/GenExplain.cpp | 1 - core/sql/generator/GenItemFunc.cpp | 27 + core/sql/generator/GenRelSequence.cpp | 54 +- core/sql/generator/GenSequenceFunction.cpp | 102 + core/sql/langman/LmRoutineJavaObj.cpp | 1 + core/sql/optimizer/BindItemExpr.cpp | 22 +- core/sql/optimizer/BindRelExpr.cpp | 5 +- core/sql/optimizer/BindWA.h | 5 + core/sql/optimizer/ItemExpr.cpp | 87 + core/sql/optimizer/ItemFunc.h | 88 +- core/sql/optimizer/NormItemExpr.cpp | 32 + core/sql/optimizer/RelSequence.cpp | 8 + core/sql/optimizer/RelSequence.h | 4 + core/sql/optimizer/SynthType.cpp | 237 + core/sql/optimizer/ValueDesc.cpp | 40 + core/sql/optimizer/ValueDesc.h | 16 +- core/sql/parser/ParKeyWords.cpp | 7 + core/sql/parser/sqlparser.y | 116 +- core/sql/regress/compGeneral/EXPECTED006.SB | 508 + core/sql/regress/compGeneral/EXPECTED023 | 88 +- core/sql/regress/compGeneral/TEST006 | 157 +- core/sql/regress/compGeneral/TEST011 | 1 + core/sql/regress/compGeneral/TEST023 | 25 +- core/sql/regress/core/EXPECTED037.SB | 7 +- core/sql/regress/executor/EXPECTED015.SB | 16 + core/sql/regress/executor/TEST015 | 4 + core/sql/regress/seabase/EXPECTED003 | 42 + core/sql/regress/seabase/EXPECTED032 | 50 +- core/sql/regress/seabase/TEST003 | 3 + core/sql/regress/seabase/TEST032 | 8 + core/sql/regress/tools/sbdefs | 1 - core/sql/sqlcomp/DefaultConstants.h | 2 - core/sql/sqlcomp/nadefaults.cpp | 20 +- .../java/org/trafodion/sql/HTableClient.java | 107 +- core/sql/ustat/hs_cli.cpp | 43 +- core/sql/ustat/hs_const.h | 1 + .../src/asciidoc/_chapters/about.adoc | 4 +- .../src/asciidoc/_chapters/sort_msgs.adoc | 211 +- .../asciidoc/_chapters/update_stats_msgs.adoc | 482 + docs/messages_guide/src/asciidoc/index.adoc | 1 + docs/shared/revisions.txt | 1 + .../src/asciidoc/_chapters/about.adoc | 15 +- .../src/asciidoc/_chapters/sql_statements.adoc | 4 + .../src/asciidoc/_chapters/sql_utilities.adoc | 86 +- 79 files changed, 22053 insertions(+), 7176 deletions(-) ----------------------------------------------------------------------
