Repository: incubator-trafodion Updated Branches: refs/heads/master dda167cb0 -> d72a59dcb
Merge pull request #5 from apache/master update head Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a6b9b2d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a6b9b2d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a6b9b2d2 Branch: refs/heads/master Commit: a6b9b2d23b543f95b90102f6097d9087e508cb63 Parents: 1f0e8a3 81a455e Author: mashengchen <[email protected]> Authored: Wed Jul 20 11:25:31 2016 +0800 Committer: GitHub <[email protected]> Committed: Wed Jul 20 11:25:31 2016 +0800 ---------------------------------------------------------------------- .gitignore | 1 + core/conn/Makefile | 5 +- core/conn/jdbc_type2/native/CoreCommon.h | 2 - core/conn/jdbc_type2/native/SQLMXConnection.cpp | 14 - core/conn/jdbc_type2/native/SrvrOthers.cpp | 9 - core/conn/odbc/src/odbc/Common/Global.h | 5 +- core/conn/odbc/src/odbc/Common/PubQueryStats.h | 11 +- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 141 +- .../odbc/nsksrvrcore/ResStatisticsSession.cpp | 95 +- .../src/odbc/nsksrvrcore/ResStatisticsSession.h | 1 + .../odbc/nsksrvrcore/ResStatisticsStatement.cpp | 3 +- core/sqf/.gitignore | 2 + core/sqf/Makefile | 10 +- core/sqf/conf/install_features | 2 + core/sqf/sqenvcom.sh | 49 +- .../sql/scripts/install_hadoop_regr_test_env | 3 - core/sqf/sql/scripts/install_local_hadoop | 15 +- core/sqf/sql/scripts/restcheck | 1 - core/sqf/src/seatrans/hbase-trx/Makefile | 87 +- core/sqf/src/seatrans/hbase-trx/pom.xml.apache | 336 --- .../sqf/src/seatrans/hbase-trx/pom.xml.apache10 | 336 +++ .../sqf/src/seatrans/hbase-trx/pom.xml.apache11 | 336 +++ core/sqf/src/seatrans/hbase-trx/pom.xml.cdh | 332 --- core/sqf/src/seatrans/hbase-trx/pom.xml.cdh54 | 332 +++ core/sqf/src/seatrans/hbase-trx/pom.xml.cdh55 | 332 +++ core/sqf/src/seatrans/hbase-trx/pp.awk | 40 +- .../hbase/client/ClientScanner98.java.tmpl | 2 +- .../hbase/client/PatchClientScanner.java.tmpl | 2 +- .../client/TrafParallelClientScanner.java.tmpl | 2 +- .../hbase/client/transactional/RMInterface.java | 24 +- .../hbase/client/transactional/TmDDL.java | 4 +- .../transactional/TransactionManager.java | 156 +- .../client/transactional/TransactionState.java | 22 +- .../transactional/SsccRegionEndpoint.java.tmpl | 4 +- .../transactional/TrxRegionEndpoint.java.tmpl | 76 +- .../transactional/TrxRegionObserver.java.tmpl | 16 +- .../generated/TrxRegionProtos.java | 2629 ++++++++++++++---- .../CleanOldTransactionsChore.java.tmpl | 6 +- .../hbase/regionserver/transactional/IdTm.java | 2 +- .../transactional/KeyValueListScanner.java.tmpl | 2 +- .../transactional/MemoryUsageChore.java.tmpl | 6 +- .../transactional/TrxTransactionState.java.tmpl | 10 +- .../hbase-trx/src/main/protobuf/TrxRegion.proto | 26 +- .../java/org/trafodion/dtm/HBaseTxClient.java | 17 +- core/sqf/src/tm/idtmsrv.cpp | 13 +- core/sql/bin/SqlciErrors.txt | 1 + core/sql/comexe/ComTdb.h | 5 +- core/sql/common/ComSmallDefs.h | 8 +- core/sql/common/swscanf.cpp | 15 +- core/sql/common/swsprintf.cpp | 16 +- core/sql/optimizer/BindRelExpr.cpp | 28 +- core/sql/optimizer/RelExeUtil.h | 7 + core/sql/optimizer/ValueDesc.cpp | 20 +- core/sql/parser/ParKeyWords.cpp | 3 +- core/sql/parser/sqlparser.y | 161 +- core/sql/regress/compGeneral/EXPECTED004.SB | 4 +- core/sql/regress/compGeneral/EXPECTED005 | 111 +- core/sql/regress/compGeneral/TEST005 | 35 +- core/sql/regress/core/EXPECTED000.SB | 2 +- core/sql/regress/core/EXPECTED037.SB | 12 - core/sql/regress/core/FILTERRTS | 11 +- core/sql/regress/core/TEST000 | 2 +- core/sql/regress/core/TEST037 | 3 - core/sql/regress/seabase/EXPECTED003 | 626 ++++- core/sql/regress/seabase/EXPECTED011 | 9 +- core/sql/regress/seabase/TEST003 | 37 +- core/sql/regress/tools/runregr_hive.ksh | 4 +- core/sql/regress/tools/runregr_seabase.ksh | 7 +- core/sql/sqlci/sqlci_lex.ll | 1 + core/sql/sqlci/sqlci_yacc.y | 2 + core/sql/sqlcomp/CmpSeabaseDDL.h | 12 +- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 79 +- core/sql/sqlcomp/CmpSeabaseDDLincludes.h | 10 +- core/sql/sqlcomp/CmpSeabaseDDLmd.h | 493 +++- core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp | 238 +- core/sql/sqlcomp/CmpSeabaseDDLrepos.h | 492 +++- core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 6 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 15 + core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp | 235 +- core/sql/sqlcomp/CmpSeabaseDDLupgrade.h | 270 +- core/sql/sqlcomp/parser.cpp | 9 + core/sql/sqlcomp/parser.h | 21 + .../java/org/trafodion/sql/HTableClient.java | 3 +- install/Makefile | 5 +- install/installer/traf_apache_mods | 6 +- install/installer/traf_config_check | 72 +- licenses/Makefile | 5 +- licenses/lic-server-src | 17 +- 88 files changed, 6884 insertions(+), 1753 deletions(-) ----------------------------------------------------------------------
