trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [2/3] incubator-trafodion git commit: Merge remote branch 'origin/master' into lic1829
Date Tue, 05 Apr 2016 16:25:18 GMT
Merge remote branch 'origin/master' into lic1829


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d5726d66
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d5726d66
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d5726d66

Branch: refs/heads/master
Commit: d5726d66693ed7dc2e15ab9cb6f58c722aaad633
Parents: dd2f416 a837667
Author: Steve Varnau <svarnau@apache.org>
Authored: Fri Apr 1 00:46:07 2016 +0000
Committer: Steve Varnau <svarnau@apache.org>
Committed: Fri Apr 1 00:46:07 2016 +0000

----------------------------------------------------------------------
 core/sqf/conf/install_features                  |    7 +-
 core/sqf/hbase_utilities/pom.xml                |   12 +-
 .../backuprestore/TrafExportSnapshot.java       |   85 +-
 core/sqf/sqenvcom.sh                            |  140 +-
 core/sqf/sql/scripts/install_local_hadoop       |   75 +-
 core/sqf/sql/scripts/sqgen                      |    1 +
 core/sqf/src/seatrans/.gitignore                |   10 +
 core/sqf/src/seatrans/hbase-trx/Makefile        |   22 +-
 core/sqf/src/seatrans/hbase-trx/pom.xml.apache  |   45 +-
 core/sqf/src/seatrans/hbase-trx/pom.xml.cdh     |    8 +-
 core/sqf/src/seatrans/hbase-trx/pom.xml.hdp     |   15 +-
 core/sqf/src/seatrans/hbase-trx/pp.awk          |  138 +
 core/sqf/src/seatrans/hbase-trx/reinstate_orig  |   30 +
 .../hbase/client/PatchClientScanner.java.tmpl   |  237 +
 .../CommitUnsuccessfulException.java            |    0
 .../HBaseBackedTransactionLogger.java           |    0
 .../client/transactional/JtaXAResource.java     |    0
 .../transactional/LocalTransactionLogger.java   |    0
 .../hbase/client/transactional/RMInterface.java |    8 +-
 .../client/transactional/RegionHelper.java      |    0
 .../transactional/SsccTransactionalScanner.java |  289 -
 .../SsccTransactionalScanner.java.tmpl          |  297 +
 .../transactional/SsccTransactionalTable.java   |    8 +-
 .../hbase/client/transactional/TmDDL.java       |    0
 .../client/transactional/TransactionLogger.java |    0
 .../transactional/TransactionManager.java       |   48 +-
 .../TransactionRegionLocation.java              |   12 +
 .../transactional/TransactionalReturn.java      |    0
 .../transactional/TransactionalScanner.java     |  319 -
 .../TransactionalScanner.java.tmpl              |  325 +
 .../transactional/TransactionalTable.java       |    7 +-
 .../transactional/TransactionalTableClient.java |    8 +-
 .../UnknownTransactionException.java            |    0
 .../transactional/SplitBalanceHelper.java       |  666 +-
 .../transactional/SsccRegionEndpoint.java       | 4167 ------------
 .../transactional/SsccRegionEndpoint.java.tmpl  | 4127 ++++++++++++
 .../transactional/TrxRegionEndpoint.java        | 5885 ----------------
 .../transactional/TrxRegionEndpoint.java.tmpl   | 6271 ++++++++++++++++++
 .../transactional/TrxRegionObserver.java        |  920 ---
 .../transactional/TrxRegionObserver.java.tmpl   |  975 +++
 .../transactional/TrxTableClient2.java          |    0
 .../generated/TrxRegionProtos.java              | 5635 ++++++++++++++--
 .../CleanOldTransactionsChore.java              |   71 -
 .../CleanOldTransactionsChore.java.tmpl         |   81 +
 .../transactional/KeyValueListScanner.java      |  173 -
 .../transactional/KeyValueListScanner.java.tmpl |  167 +
 .../transactional/MemoryUsageChore.java         |   64 -
 .../transactional/MemoryUsageChore.java.tmpl    |   75 +
 .../SingleVersionDeleteNotSupported.java        |    0
 .../transactional/SsccTransactionState.java     |    4 +-
 .../transactional/TransactionState.java         |   35 +-
 .../transactional/TransactionalRegion.java      |    7 +-
 .../TransactionalRegionScannerHolder.java       |    0
 .../transactional/TrxTransactionState.java      | 1039 ---
 .../transactional/TrxTransactionState.java.tmpl | 1004 +++
 .../hbase-trx/src/main/protobuf/TrxRegion.proto |   45 +-
 .../sqf/src/seatrans/hbase-trx/uncomment_string |   36 +
 core/sqf/src/seatrans/tm/hbasetmlib2/Makefile   |    3 +
 core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml    |    9 +-
 .../src/seatrans/tm/hbasetmlib2/pom.xml.apache  |  115 +
 .../sqf/src/seatrans/tm/hbasetmlib2/pom.xml.hdp |   88 +
 core/sql/arkcmp/CmpStatement.cpp                |    2 -
 core/sql/cli/CliExtern.cpp                      |   36 -
 core/sql/cli/SQLCLIdev.h                        |    2 -
 core/sql/cli/SessionDefaults.cpp                |    2 +
 core/sql/generator/GenRelUpdate.cpp             |    6 +-
 core/sql/nskgmake/Makerules.mk                  |   16 +-
 core/sql/optimizer/BindRelExpr.cpp              |   48 +-
 core/sql/pom.xml                                |   12 +-
 core/sql/pom.xml.apache                         |  131 +
 core/sql/pom.xml.hdp                            |  111 +
 core/sql/regress/core/DIFF116.KNOWN.SB          |   21 -
 core/sql/regress/seabase/EXPECTED020            |  374 +-
 core/sql/regress/seabase/TEST020                |   99 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |    3 -
 core/sql/sqlcomp/CmpSeabaseDDLschema.cpp        |   57 +-
 core/sql/sqlcomp/DefaultConstants.h             |    9 +-
 core/sql/sqlcomp/nadefaults.cpp                 |   10 +-
 .../java/org/trafodion/sql/HBaseClient.java     |   21 +-
 .../src/asciidoc/_chapters/odbc_windows.adoc    |    1 -
 install/installer/traf_config_check             |    7 +-
 81 files changed, 20627 insertions(+), 14149 deletions(-)
----------------------------------------------------------------------



Mime
View raw message