Merge remote branch 'origin/master' into ansharma_br_misc
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d9644b22 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d9644b22 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d9644b22 Branch: refs/heads/master Commit: d9644b223bc5defd844ffee47c28c448f3a62a7d Parents: ae050f3 2a1e5fa Author: Anoop Sharma <anoop.sha...@esgyn.com> Authored: Fri Sep 16 19:52:24 2016 +0000 Committer: Anoop Sharma <anoop.sha...@esgyn.com> Committed: Fri Sep 16 19:52:24 2016 +0000 ---------------------------------------------------------------------- core/sqf/conf/log4j.hdfs.config | 2 + .../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 | 2 + 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/ExpSequenceFunction.cpp | 18 +- core/sql/exp/ExpSequenceFunction.h | 2 + core/sql/exp/ExpSqlTupp.h | 3 +- core/sql/generator/GenRelSequence.cpp | 54 +- core/sql/generator/GenSequenceFunction.cpp | 102 + core/sql/langman/LmRoutineJavaObj.cpp | 1 + core/sql/optimizer/BindItemExpr.cpp | 1 - core/sql/optimizer/ItemExpr.cpp | 70 + core/sql/optimizer/ItemFunc.h | 86 +- core/sql/optimizer/NormItemExpr.cpp | 32 + core/sql/optimizer/RelSequence.cpp | 8 + core/sql/optimizer/RelSequence.h | 4 + core/sql/optimizer/SynthType.cpp | 162 + core/sql/optimizer/ValueDesc.cpp | 40 + core/sql/optimizer/ValueDesc.h | 16 +- core/sql/parser/ParKeyWords.cpp | 2 + core/sql/parser/sqlparser.y | 73 + core/sql/regress/compGeneral/EXPECTED006.SB | 508 + core/sql/regress/compGeneral/EXPECTED023 | 88 +- core/sql/regress/compGeneral/TEST006 | 157 +- core/sql/regress/compGeneral/TEST023 | 25 +- core/sql/sqlcomp/nadefaults.cpp | 6 +- .../java/org/trafodion/sql/HTableClient.java | 107 +- core/sql/ustat/hs_cli.cpp | 43 +- core/sql/ustat/hs_const.h | 1 + 49 files changed, 20620 insertions(+), 6908 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d9644b22/core/sql/parser/sqlparser.y ----------------------------------------------------------------------
