You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/27 16:41:03 UTC
[08/15] incubator-trafodion git commit: Merge branch 'master' into
wrkbrnch-2.1
Merge branch 'master' into wrkbrnch-2.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9fb1bdde
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9fb1bdde
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9fb1bdde
Branch: refs/heads/master
Commit: 9fb1bdde5007b2e38198cc1139742798af78936b
Parents: 9623bf1 d02fe47
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Tue May 24 15:45:29 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Tue May 24 15:45:29 2016 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/SrvrCommon.cpp | 4 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 4 +-
.../hbase/client/transactional/RMInterface.java | 43 +-
.../RetryTransactionException.java | 54 ++
.../RollbackUnsuccessfulException.java | 62 ++
.../transactional/SsccTransactionalTable.java | 34 +-
.../hbase/client/transactional/TmDDL.java | 24 +-
.../transactional/TransactionManager.java | 626 ++++++++-----------
.../TransactionalScanner.java.tmpl | 97 ++-
.../transactional/TransactionalTable.java | 46 +-
.../transactional/IdTmException.java | 14 +
.../java/org/trafodion/dtm/HBaseTxClient.java | 7 +-
core/sql/cli/Context.cpp | 26 +-
core/sql/cli/Context.h | 1 +
core/sql/cli/ExSqlComp.cpp | 5 +-
core/sql/cli/ExSqlComp.h | 2 +
core/sql/cli/SessionDefaults.cpp | 9 +
core/sql/cli/SessionDefaults.h | 12 +-
core/sql/cli/Statement.cpp | 2 +-
core/sql/executor/ex_control.cpp | 12 +
core/sql/optimizer/BindRelExpr.cpp | 44 +-
core/sql/optimizer/RelFastTransport.cpp | 4 +-
core/sql/optimizer/RelFastTransport.h | 14 +-
core/sql/regress/executor/EXPECTED020 | 1 +
core/sql/regress/hive/EXPECTED003 | 26 +
core/sql/regress/hive/TEST003 | 11 +
core/sql/sqlcomp/DefaultConstants.h | 1 +
core/sql/sqlcomp/nadefaults.cpp | 2 +
.../java/org/trafodion/sql/ByteArrayList.java | 54 --
.../java/org/trafodion/sql/HBaseClient.java | 76 +--
.../java/org/trafodion/sql/HBulkLoadClient.java | 42 +-
.../java/org/trafodion/sql/HTableClient.java | 18 +-
.../main/java/org/trafodion/sql/HiveClient.java | 59 +-
.../java/org/trafodion/sql/ResultIterator.java | 133 ----
.../org/trafodion/sql/ResultKeyValueList.java | 100 ---
.../java/org/trafodion/sql/RowToInsert.java | 44 --
.../java/org/trafodion/sql/RowsToInsert.java | 57 --
.../org/trafodion/sql/SequenceFileWriter.java | 129 +---
.../java/org/trafodion/sql/StringArrayList.java | 47 --
39 files changed, 673 insertions(+), 1273 deletions(-)
----------------------------------------------------------------------