Merge remote branch 'origin/master' into ddlxns2_br
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/eded5a15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/eded5a15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/eded5a15 Branch: refs/heads/master Commit: eded5a15397aab8d118cf4c246a48e9e7d027874 Parents: 54ff291 13a4e37 Author: Cloud User <[email protected]> Authored: Wed Apr 20 00:27:41 2016 +0000 Committer: Cloud User <[email protected]> Committed: Wed Apr 20 00:27:41 2016 +0000 ---------------------------------------------------------------------- .rat-excludes | 2 + NOTICE | 2 +- core/conn/jdbc_type2/build.xml | 6 + core/conn/jdbc_type2/native/SqlInterface.cpp | 2 - core/conn/jdbc_type4/build.xml | 8 + .../src/org/trafodion/jdbc/t4/BaseRow.java | 65 --- .../src/org/trafodion/jdbc/t4/InsertRow.java | 82 ---- .../trafodion/jdbc/t4/InterfaceResultSet.java | 30 +- .../src/org/trafodion/jdbc/t4/ObjectArray.java | 86 ++++ .../src/org/trafodion/jdbc/t4/Row.java | 233 --------- .../trafodion/jdbc/t4/T4DatabaseMetaData.java | 26 +- .../jdbc/t4/TrafT4PreparedStatement.java | 2 +- .../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 435 +++------------- .../org/trafodion/jdbc/t4/TrafT4Statement.java | 2 +- core/conn/odb/odb.sln | 28 ++ core/conn/odb/odb/odb.vcxproj | 165 +++++++ core/conn/odb/odb/odb.vcxproj.filters | 36 ++ core/conn/odb/odb/odb.vcxproj.user | 4 + core/conn/odb/src/memcpy_wrapper.c | 2 + core/conn/odb/src/odb.c | 1 + core/conn/odb/src/verslib.h | 3 + core/conn/odb/src/versodb.c | 2 + .../java/org/trafodion/rest/ServerResource.java | 2 +- core/sqf/sqenvcom.sh | 16 +- core/sqf/sql/scripts/ilh_cleanhb | 4 +- core/sqf/sql/scripts/install_local_hadoop | 8 +- core/sqf/sql/scripts/sqnodestatus | 4 +- core/sqf/src/seatrans/.gitignore | 3 + .../hbase/client/ClientScanner98.java.tmpl | 490 +++++++++++++++++++ .../client/TrafParallelClientScanner.java.tmpl | 325 ++++++++++++ .../hbase/client/transactional/RMInterface.java | 4 +- .../transactional/SsccTransactionalTable.java | 8 +- .../transactional/TransactionalTable.java | 8 +- .../transactional/TransactionalTableClient.java | 3 +- .../regionserver/transactional/IdTmId.java | 10 - core/sql/comexe/ComTdbHbaseAccess.h | 4 + core/sql/executor/ExHbaseIUD.cpp | 6 +- core/sql/executor/ExHbaseSelect.cpp | 3 + core/sql/executor/HBaseClient_JNI.cpp | 5 +- core/sql/executor/HBaseClient_JNI.h | 1 + core/sql/exp/ExpHbaseInterface.cpp | 4 +- core/sql/exp/ExpHbaseInterface.h | 2 + core/sql/generator/GenExplain.cpp | 7 + core/sql/generator/GenRelScan.cpp | 1 + core/sql/generator/Generator.cpp | 3 + core/sql/generator/Generator.h | 2 +- core/sql/regress/executor/EXPECTED140 | 435 +++++++++++++++- core/sql/regress/executor/TEST140 | 28 +- core/sql/sqlcomp/DefaultConstants.h | 5 + core/sql/sqlcomp/nadefaults.cpp | 2 +- .../java/org/trafodion/sql/HTableClient.java | 7 +- install/Makefile | 2 +- install/installer/acceptKeys | 61 +++ tests/phx/phoenix_test.py | 10 +- .../odbcclient/DSNConverter/DSNConverter.def | 2 +- win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc | 2 +- .../TranslationDll/TranslationDll.def | 2 +- .../odbcclient/TranslationDll/TranslationDll.rc | 2 +- win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC | 2 +- win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC | 2 +- win-odbc64/odbcclient/drvr35/drvr35.rc | 2 +- win-odbc64/odbcclient/drvr35adm/drvr35adm.rc | 2 +- win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc | 2 +- 63 files changed, 1869 insertions(+), 844 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eded5a15/core/sql/regress/executor/EXPECTED140 ---------------------------------------------------------------------- diff --cc core/sql/regress/executor/EXPECTED140 index 7bccd88,00d157c..d31cd57 --- a/core/sql/regress/executor/EXPECTED140 +++ b/core/sql/regress/executor/EXPECTED140 @@@ -103,9 -112,10 +112,9 @@@ DESCRIPTIO HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 7577396214768470203 + ObjectUIDs ............. 2948826545036618858 select_list ............ TRAFODION.SCH.T140.A @@@ -203,9 -213,10 +212,9 @@@ DESCRIPTIO HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 7577396214768470287 + ObjectUIDs ............. 2948826545036618945 select_list ............ TRAFODION.SCH.T140B.AN @@@ -290,9 -301,10 +299,9 @@@ DESCRIPTIO HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 7577396214768470203 + ObjectUIDs ............. 2948826545036618858 select_list ............ TRAFODION.SCH.T140.AN @@@ -388,9 -400,10 +397,9 @@@ DESCRIPTIO HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 7577396214768470203 + ObjectUIDs ............. 2948826545036618858 select_list ............ TRAFODION.SCH.T140.AN input_variables ........ %(200) @@@ -484,9 -497,10 +493,9 @@@ DESCRIPTIO HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 7577396214768470203 + ObjectUIDs ............. 2948826545036618858 select_list ............ TRAFODION.SCH.T140.AN, TRAFODION.SCH.T140.A @@@ -616,9 -630,10 +625,9 @@@ DESCRIPTIO HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 7577396214768470203 + ObjectUIDs ............. 2948826545036618858 select_list ............ TRAFODION.SCH.T140.AN input_variables ........ %(201) @@@ -711,9 -726,10 +720,9 @@@ DESCRIPTIO HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 7577396214768470203 + ObjectUIDs ............. 2948826545036618858 select_list ............ TRAFODION.SCH.T140.AN, TRAFODION.SCH.T140.A @@@ -858,9 -874,10 +867,9 @@@ DESCRIPTIO HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 7577396214768470203 + ObjectUIDs ............. 2948826545036618858 select_list ............ TRAFODION.SCH.T140.AN http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eded5a15/core/sql/sqlcomp/nadefaults.cpp ----------------------------------------------------------------------
