Merge branch 'master' into trafodion-2733 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/198e371a Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/198e371a Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/198e371a
Branch: refs/heads/master Commit: 198e371a249633232b505ce6d18bbbfdaa186b25 Parents: 375eeea 7acdca6 Author: Selvaganesan Govindarajan <[email protected]> Authored: Wed Dec 13 17:32:20 2017 -0800 Committer: GitHub <[email protected]> Committed: Wed Dec 13 17:32:20 2017 -0800 ---------------------------------------------------------------------- .gitattributes | 2 + .../trafodion/jdbc/t4/InterfaceConnection.java | 18 + .../org/trafodion/jdbc/t4/T4Properties.java | 14 + .../org/trafodion/jdbc/t4/TrafT4Connection.java | 20 +- .../main/samples/BatchSample/BatchSample.java | 119 + .../src/main/samples/BatchSample/README.md | 146 + .../main/samples/TransactionSample/README.md | 55 + .../TransactionSample/TransactionSample.java | 163 + .../src/main/samples/common/sampleUtils.java | 18 + .../jdbc_type2/samples/TransactionMode.java | 2 +- .../trafodion/jdbc/t2/SQLMXDataSource.java | 2 +- .../org/apache/trafodion/jdbc/t2/SQLMXDesc.java | 2 +- .../jdbc/t2/SQLMXPreparedStatement.java | 70 +- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 20 +- core/conn/trafci/utils/trafci | 24 +- core/conn/trafci/utils/trafci.sh-tmpl | 61 +- .../odbc/odbcclient/unixcli/cli/ctosqlconv.cpp | 7 + .../odbc/odbcclient/unixcli/cli/drvrglobal.cpp | 112 +- .../odbc/odbcclient/unixcli/cli/drvrglobal.h | 3 + core/sqf/sql/scripts/beheadMergeConflict.py | 112 + core/sqf/sql/scripts/sqgen | 7 + core/sqf/sql/scripts/sqstart | 6 +- core/sql/bin/SqlciErrors.txt | 6 +- core/sql/comexe/ComQueue.h | 2 +- core/sql/common/ComTransInfo.cpp | 24 +- core/sql/common/ComTransInfo.h | 212 +- core/sql/executor/ExExeUtil.h | 2 - core/sql/executor/ExExeUtilGet.cpp | 5 +- core/sql/executor/ExExeUtilGetStats.cpp | 60 +- core/sql/executor/JavaObjectInterface.cpp | 38 +- core/sql/executor/OrcFileReader.cpp | 222 +- core/sql/executor/OrcFileReader.h | 4 + core/sql/executor/SequenceFileReader.cpp | 194 +- core/sql/generator/GenExplain.cpp | 30 +- core/sql/generator/GenPreCode.cpp | 4 +- core/sql/generator/GenRelMisc.cpp | 2 +- core/sql/generator/GenRelScan.cpp | 2 +- core/sql/langman/LmSQLMXDriver.java | 10 +- core/sql/optimizer/BindRelExpr.cpp | 150 +- core/sql/optimizer/Cost.h | 6 - core/sql/optimizer/CostMethod.h | 6 +- core/sql/optimizer/IndexDesc.cpp | 31 +- core/sql/optimizer/Inlining.cpp | 6 +- core/sql/optimizer/ItemExpr.cpp | 16 +- core/sql/optimizer/NATable.cpp | 7 +- core/sql/optimizer/NormRelExpr.cpp | 9 +- core/sql/optimizer/ObjectNames.cpp | 9 + core/sql/optimizer/ObjectNames.h | 9 +- core/sql/optimizer/OptPhysRelExpr.cpp | 4 +- core/sql/optimizer/RelCache.cpp | 2 +- core/sql/optimizer/RelExpr.cpp | 16 +- core/sql/optimizer/RelMisc.h | 2 +- core/sql/optimizer/RelRoutine.cpp | 1 + core/sql/optimizer/costmethod.cpp | 4 +- core/sql/optimizer/opt.cpp | 2 +- core/sql/parser/ParKeyWords.cpp | 2 - core/sql/parser/SqlParserAux.cpp | 16 +- core/sql/parser/SqlParserAux.h | 2 +- core/sql/parser/sqlparser.y | 371 +- core/sql/parser/ulexer.cpp | 34 +- core/sql/porting_layer/PortProcessCalls.cpp | 56 +- core/sql/porting_layer/PortProcessCalls.h | 14 +- core/sql/qmscommon/QRQueries.cpp | 2 +- core/sql/regress/compGeneral/EXPECTED001.SB | 30 +- core/sql/regress/compGeneral/EXPECTED006.SB | 18 - core/sql/regress/compGeneral/EXPECTED013.SB | 12 +- core/sql/regress/compGeneral/EXPECTED045 | 92 +- core/sql/regress/compGeneral/EXPECTED071 | 31 +- core/sql/regress/compGeneral/EXPECTED072 | 1154 ++ core/sql/regress/compGeneral/EXPECTEDTOK | 46 + core/sql/regress/compGeneral/EXPECTEDTOK2 | 6 +- core/sql/regress/compGeneral/FILTER045 | 17 + core/sql/regress/compGeneral/FILTER072 | 17 + core/sql/regress/compGeneral/TEST001 | 12 +- core/sql/regress/compGeneral/TEST006 | 7 - core/sql/regress/compGeneral/TEST045 | 46 +- core/sql/regress/compGeneral/TEST071 | 10 + core/sql/regress/compGeneral/TEST072 | 261 + core/sql/regress/compGeneral/TEST072.cpp | 20 + core/sql/regress/compGeneral/TEST072.java | 32 + core/sql/regress/core/EXPECTED020.SB | 99 +- core/sql/regress/core/EXPECTED037.SB | 22 +- core/sql/regress/core/EXPECTEDRTS | 1899 +-- core/sql/regress/core/TEST020 | 8 +- core/sql/regress/core/TESTRTS | 1 + core/sql/regress/executor/EXPECTED130 | 90 +- core/sql/regress/executor/TEST130 | 4 + core/sql/regress/fullstack2/EXPECTED062 | 11 - core/sql/regress/fullstack2/EXPECTED062.RELEASE | 11 - core/sql/regress/fullstack2/TEST062 | 2 - core/sql/regress/hive/EXPECTED002 | 24 +- core/sql/regress/hive/EXPECTED030 | 621 +- core/sql/regress/hive/EXPECTED040 | 2527 +++ core/sql/regress/hive/TEST002 | 2 +- core/sql/regress/qat/eqatdml01 | 230 +- core/sql/regress/qat/eqatdml02 | 386 +- core/sql/regress/qat/eqatdml03 | 124 +- core/sql/regress/qat/eqatdml04 | 384 +- core/sql/regress/qat/eqatdml05 | 14344 ++++++++--------- core/sql/regress/qat/eqatdml06 | 1352 +- core/sql/regress/qat/eqatdml07 | 1930 +-- core/sql/regress/qat/eqatdml08 | 50 +- core/sql/regress/qat/eqatdml09 | 54 +- core/sql/regress/qat/eqatdml10 | 3026 ++-- core/sql/regress/qat/eqatdml11 | 3026 ++-- core/sql/regress/qat/eqatdml14 | 256 +- core/sql/regress/qat/qatdml01 | 34 +- core/sql/regress/qat/qatdml02 | 34 +- core/sql/regress/qat/qatdml03 | 28 +- core/sql/regress/qat/qatdml04 | 58 +- core/sql/regress/qat/qatdml05 | 78 +- core/sql/regress/qat/qatdml06 | 76 +- core/sql/regress/qat/qatdml07 | 42 +- core/sql/regress/qat/qatdml08 | 50 +- core/sql/regress/qat/qatdml09 | 50 +- core/sql/regress/qat/qatdml10 | 66 +- core/sql/regress/qat/qatdml11 | 66 +- core/sql/regress/qat/qatdml14 | 76 +- core/sql/regress/seabase/EXPECTED010 | 1107 +- core/sql/regress/seabase/EXPECTED011 | 82 +- core/sql/regress/seabase/FILTER034 | 33 + core/sql/regress/seabase/TEST025 | 1 + core/sql/regress/tools/runregr_compGeneral.ksh | 8 +- core/sql/regress/tools/runregr_privs1.ksh | 6 +- core/sql/regress/tools/runregr_privs2.ksh | 6 +- core/sql/regress/udr/EXPECTED107.SB | 6 - core/sql/regress/udr/TEST107 | 2 - core/sql/sqlcomp/CmpSeabaseDDL.h | 2 + core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 9 +- core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 2 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 3 + core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 2 +- core/sql/sqlcomp/DefaultConstants.h | 593 +- core/sql/sqlcomp/nadefaults.cpp | 629 +- core/sql/sqlcomp/parser.cpp | 29 - .../java/org/trafodion/sql/udr/LmT2Driver.java | 4 +- .../java/org/trafodion/sql/udr/LmUtility.java | 26 +- core/sql/ustat/hs_cli.cpp | 4 - core/sql/ustat/hs_globals.cpp | 11 +- core/sql/ustat/hs_update.cpp | 4 - .../main/java/org/trafodion/dcs/Constants.java | 2 +- .../trafodion/dcs/servermt/ServerConstants.java | 2 +- .../trafodion/dcs/IntegrationTestEndurance.java | 4 +- .../org/trafodion/jdbc_test/TestClientInfo.java | 146 + dcs/src/test/pytests/README.rst | 4 +- doap.rdf | 51 + .../src/asciidoc/_chapters/launch.adoc | 2 +- .../src/asciidoc/_chapters/accessing.adoc | 35 +- .../src/asciidoc/_chapters/lob_data.adoc | 2 +- .../src/asciidoc/_chapters/lob_management.adoc | 6 +- .../src/asciidoc/_chapters/messages.adoc | 18 +- .../asciidoc/_chapters/properties_detail.adoc | 6 +- .../src/resources/source/blob_example.java | 12 +- .../src/resources/source/clob_example.java | 12 +- .../src/asciidoc/_chapters/binder_msgs.adoc | 4 +- .../src/asciidoc/_chapters/execute_spjs.adoc | 2 +- .../src/asciidoc/_chapters/get_started.adoc | 2 +- .../sql_functions_and_expressions.adoc | 213 +- .../_chapters/sql_language_elements.adoc | 20 +- .../src/asciidoc/_chapters/sql_statements.adoc | 28 + docs/src/site/site.xml | 2 + win-odbc64/Install/win32_installer/LICENSE.rtf | 155 + .../Install/win32_installer/installer.iss | 221 + .../odbcclient/Drvr35Res/Drvr35Res_os.vcxproj | 99 +- win-odbc64/odbcclient/README.txt | 11 +- .../TranslationDll/TranslationDll_os.vcxproj | 129 +- win-odbc64/odbcclient/build_os_32.bat | 173 + .../drvr35/TCPIPV4/TCPIPV4_os.vcxproj | 104 +- .../drvr35/TCPIPV6/TCPIPV6_os.vcxproj | 98 +- win-odbc64/odbcclient/drvr35/cconnect.cpp | 2 +- win-odbc64/odbcclient/drvr35/ctosqlconv.cpp | 7 + win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj | 138 +- .../odbcclient/drvr35/drvr35_os.vcxproj.user | 16 + .../odbcclient/drvr35adm/Drvr35Adm_os.vcxproj | 130 +- .../drvr35adm/Drvr35Adm_os.vcxproj.user | 7 + .../odbcclient/drvr35msg/Drvr35Msg_os.vcxproj | 75 +- win-odbc64/odbcclient/odbcclient_os.sln | 40 +- 177 files changed, 23262 insertions(+), 16814 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/198e371a/core/sql/executor/ExExeUtilGetStats.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/198e371a/core/sql/generator/GenExplain.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/198e371a/core/sql/generator/GenPreCode.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/198e371a/core/sql/generator/GenRelMisc.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/198e371a/core/sql/optimizer/RelExpr.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/198e371a/core/sql/optimizer/RelRoutine.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/198e371a/core/sql/regress/hive/EXPECTED030 ---------------------------------------------------------------------- diff --cc core/sql/regress/hive/EXPECTED030 index 4ec4628,e0b1132..d40e041 --- a/core/sql/regress/hive/EXPECTED030 +++ b/core/sql/regress/hive/EXPECTED030 @@@ -795,7 -803,8 +803,7 @@@ DESCRIPTIO statement_index ........ 0 affinity_value ......... 0 max_max_cardinal 1,440,202 - esp_2_node_map ......... (\NSK:-1:-1:-1:-1) - total_overflow_size .... 0.00 KB + esp_2_node_map ......... (-1(4 times)) xn_access_mode ......... read_only xn_autoabort_interval 0 auto_query_retry ....... enabled @@@ -1272,7 -1287,8 +1285,7 @@@ DESCRIPTIO statement_index ........ 0 affinity_value ......... 0 max_max_cardinality 1,698 - esp_2_node_map ......... (\NSK:-1:-1:-1:-1) - total_overflow_size .... 0.00 KB + esp_2_node_map ......... (-1(4 times)) xn_access_mode ......... read_only xn_autoabort_interval 0 auto_query_retry ....... enabled @@@ -2346,8 -2378,9 +2372,8 @@@ DESCRIPTIO statement_index ........ 0 affinity_value ......... 0 max_max_cardinal 2,880,404 - esp_2_node_map ......... (\NSK:-1:-1:-1:-1) - esp_3_node_map ......... (\NSK:-1:-1) - total_overflow_size .... 0.00 KB + esp_2_node_map ......... (-1(4 times)) + esp_3_node_map ......... (-1(4 times)) xn_access_mode ......... read_only xn_autoabort_interval 0 auto_query_retry ....... enabled http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/198e371a/core/sql/regress/seabase/EXPECTED010 ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/198e371a/core/sql/regress/seabase/EXPECTED011 ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/198e371a/core/sql/sqlcomp/DefaultConstants.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/198e371a/core/sql/sqlcomp/nadefaults.cpp ----------------------------------------------------------------------
