Merge remote branch 'origin/master' into traf_lob_global_fix
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/eeeabbca Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/eeeabbca Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/eeeabbca Branch: refs/heads/master Commit: eeeabbca7e5dee3ed3ed100fc27de8d08dbda39a Parents: 0da83d5 03f705b Author: Sandhya Sundaresan <[email protected]> Authored: Thu Jan 18 18:38:01 2018 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Thu Jan 18 18:38:01 2018 +0000 ---------------------------------------------------------------------- DISCLAIMER | 12 - Makefile | 14 +- README | 10 +- README.md | 8 +- core/Makefile | 2 +- core/conn/Makefile | 7 +- core/conn/jdbcT4/pom.xml | 6 +- .../org/trafodion/jdbc/t4/TrafT4Connection.java | 9 +- .../odbc/src/odbc/Common/ODBCMXTraceMsgs.cpp | 6 +- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 2 +- .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 14 +- core/conn/trafci/Makefile | 6 +- .../java/org/trafodion/ci/DatabaseQuery.java | 1 + .../unixcli/DrvrManager/drvrmanager.cpp | 2 + .../odbc/odbcclient/unixcli/cli/ctosqlconv.cpp | 6 +- .../odbc/odbcclient/unixcli/cli/sqltocconv.cpp | 3 + core/seamonster/src/Makefile | 1 - core/sqf/.gitignore | 2 - core/sqf/Makefile | 12 +- core/sqf/build-scripts/build.branch | 2 +- .../export/include/common/evl_sqlog_eventnum.h | 26 + .../run_full_trafodion_backup.sh | 9 + .../backuprestore/TrafExportSnapshot.java | 15 +- core/sqf/monitor/linux/cluster.cxx | 967 +++++++------- core/sqf/monitor/linux/cluster.h | 6 +- core/sqf/monitor/linux/cmsh.cxx | 146 +- core/sqf/monitor/linux/cmsh.h | 2 + core/sqf/monitor/linux/commaccept.cxx | 37 +- core/sqf/monitor/linux/commaccept.h | 3 +- core/sqf/monitor/linux/internal.h | 2 +- core/sqf/monitor/linux/macros.gmk | 4 +- core/sqf/monitor/linux/montest_run.virtual | 10 +- core/sqf/monitor/linux/pnode.cxx | 8 +- core/sqf/monitor/linux/pnodeconfig.cxx | 33 +- core/sqf/monitor/linux/pnodeconfig.h | 2 + core/sqf/monitor/linux/process.cxx | 161 ++- core/sqf/monitor/linux/redirector.cxx | 11 +- core/sqf/monitor/linux/redirector.h | 2 +- core/sqf/monitor/linux/reqexit.cxx | 7 +- core/sqf/monitor/linux/reqnewproc.cxx | 30 +- core/sqf/monitor/linux/reqopen.cxx | 8 +- core/sqf/monitor/linux/reqqueue.cxx | 5 + core/sqf/monitor/linux/shell.cxx | 101 +- core/sqf/monitor/linux/tcdbsqlite.cxx | 8 - core/sqf/monitor/linux/tmsync.cxx | 46 +- core/sqf/monitor/linux/zclient.cxx | 6 +- core/sqf/sql/scripts/analyzeMessageGuide.py | 12 +- core/sqf/sql/scripts/install_apache_hadoop | 4 +- core/sqf/sql/scripts/install_local_hadoop | 2 +- core/sqf/sql/scripts/sqnodestatus | 23 +- core/sqf/src/seabed/src/msmon.cpp | 2 +- core/sqf/src/seabed/src/sqstatepi.cpp | 25 +- core/sql/arkcmp/CmpContext.cpp | 10 +- core/sql/arkcmp/CmpContext.h | 8 - core/sql/arkcmp/CmpStatement.cpp | 27 +- core/sql/arkcmp/CmpStatement.h | 6 + core/sql/bin/SqlciErrors.txt | 287 ++-- core/sql/bin/ex_sscp_main.cpp | 4 - core/sql/bin/ex_ssmp_main.cpp | 4 - core/sql/cli/Cli.cpp | 4 - core/sql/cli/Context.cpp | 1 - core/sql/cli/Globals.cpp | 68 +- core/sql/cli/Globals.h | 81 +- core/sql/cli/NoWaitOp.cpp | 264 ---- core/sql/cli/NoWaitOp.h | 89 -- core/sql/cli/QuasiFileManager.cpp | 577 -------- core/sql/cli/QuasiFileManager.h | 159 --- core/sql/cli/Statement.cpp | 3 - core/sql/common/BaseTypes.cpp | 3 - core/sql/common/CmpCommon.h | 2 +- core/sql/common/NAAssert.h | 7 - core/sql/common/NAMemory.cpp | 335 +---- core/sql/common/NAMemory.h | 146 +- core/sql/executor/ExSimpleSqlBuffer.cpp | 3 - core/sql/executor/ex_ex.cpp | 8 - core/sql/executor/ex_ex.h | 7 - core/sql/executor/ex_globals.cpp | 1 - core/sql/executor/ex_globals.h | 10 - core/sql/executor/ex_mj.cpp | 3 +- core/sql/executor/ex_root.cpp | 122 -- core/sql/executor/ex_sort.cpp | 16 - core/sql/exp/exp_conv.cpp | 2 +- core/sql/generator/GenRelMisc.cpp | 11 +- core/sql/generator/GenRelUpdate.cpp | 6 +- core/sql/langman/Measure.cpp | 2 +- core/sql/nskgmake/executor/Makefile | 3 - core/sql/nskgmake/tdm_sqlmxevents/Makefile | 1 - core/sql/optimizer/BindItemExpr.cpp | 9 +- core/sql/optimizer/BindRelExpr.cpp | 1 - core/sql/optimizer/MJVIndexBuilder.cpp | 4 +- core/sql/optimizer/OptimizerSimulator.cpp | 36 +- core/sql/optimizer/RelExpr.h | 1 + core/sql/regress/charsets/DIFF312.KNOWN.SB.OS | 12 +- .../sql/regress/compGeneral/DIFF005.KNOWN.SB.OS | 4 +- core/sql/regress/core/DIFF024.KNOWN.SB.OS | 4 +- core/sql/regress/hive/EXPECTED005 | 4 + core/sql/regress/hive/EXPECTED007 | 10 +- core/sql/regress/hive/EXPECTED009 | 12 +- core/sql/regress/privs1/EXPECTED136 | 6 +- core/sql/regress/seabase/EXPECTED025 | 14 +- core/sql/regress/seabase/EXPECTED027 | 2 +- core/sql/regress/seabase/EXPECTED031 | 6 +- core/sql/regress/seabase/EXPECTED032 | 4 +- core/sql/runtimestats/SqlStats.cpp | 5 +- core/sql/runtimestats/SqlStats.h | 1 - core/sql/sort/Qsort.cpp | 1 - core/sql/sort/Record.cpp | 2 - core/sql/sort/TourTree.cpp | 1 - core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 213 ++- core/sql/sqlcomp/CmpDescribe.cpp | 10 +- core/sql/sqlcomp/QCache.cpp | 1 - core/sql/sqlcomp/parser.cpp | 1 - .../org/trafodion/sql/udr/predef/JDBCUDR.java | 10 +- core/sql/udrserv/UdrResultSet.cpp | 22 +- core/sql/udrserv/spinfo.cpp | 14 +- core/sql/udrserv/udrserv.cpp | 12 +- core/trafodion.spec | 2 +- .../org/trafodion/dcs/master/ServerManager.java | 82 +- .../trafodion/jdbc_test/TestGetIndexInfo.java | 2 +- doap.rdf | 14 +- docs/client_install/pom.xml | 26 +- .../src/asciidoc/_chapters/introduction.adoc | 2 +- .../src/asciidoc/_chapters/jdbct4.adoc | 2 +- .../src/asciidoc/_chapters/preparation.adoc | 11 +- .../src/asciidoc/_chapters/sample_prog.adoc | 6 +- docs/command_interface/pom.xml | 22 +- docs/cqd_reference/pom.xml | 22 +- docs/jdbct4ref_guide/pom.xml | 22 +- docs/load_transform/pom.xml | 22 +- docs/lob_guide/pom.xml | 22 +- .../lob_guide/src/asciidoc/_chapters/about.adoc | 4 +- .../asciidoc/_chapters/working_with_lob.adoc | 8 +- docs/messages_guide/pom.xml | 22 +- .../src/asciidoc/_chapters/compiler_msgs.adoc | 6 +- .../src/asciidoc/_chapters/ddl_msgs.adoc | 1254 ++++++++++++++++-- .../src/asciidoc/_chapters/parser_msgs.adoc | 12 +- docs/odb_user/pom.xml | 22 +- docs/provisioning_guide/pom.xml | 26 +- .../src/asciidoc/_chapters/about.adoc | 2 +- .../src/asciidoc/_chapters/enable_security.adoc | 4 +- .../src/asciidoc/_chapters/introduction.adoc | 4 +- .../src/asciidoc/_chapters/quickstart.adoc | 22 +- .../src/asciidoc/_chapters/requirements.adoc | 37 +- .../src/asciidoc/_chapters/script_install.adoc | 6 +- .../src/asciidoc/_chapters/script_remove.adoc | 2 +- .../src/asciidoc/_chapters/script_upgrade.adoc | 6 +- docs/shared/license.txt | 5 - docs/spj_guide/pom.xml | 22 +- .../src/asciidoc/_chapters/deploy_spjs.adoc | 2 +- .../src/resources/source/Inventory.java | 6 +- .../spj_guide/src/resources/source/Payroll.java | 8 +- docs/spj_guide/src/resources/source/Sales.java | 12 +- .../src/resources/source/adjustSalary.java | 2 +- .../src/resources/source/employeeJob.java | 2 +- .../src/resources/source/lowerPrice.java | 2 +- .../src/resources/source/numDailyOrders.java | 2 +- .../src/resources/source/numMonthlyOrders.java | 2 +- .../src/resources/source/orderSummary.java | 2 +- .../src/resources/source/partData.java | 2 +- .../src/resources/source/partLocations.java | 2 +- .../src/resources/source/projectTeam.java | 2 +- .../src/resources/source/supplierInfo.java | 2 +- .../src/resources/source/supplyQuantities.java | 2 +- .../src/resources/source/topSalesReps.java | 2 +- .../src/resources/source/totalPrice.java | 2 +- docs/sql_reference/pom.xml | 22 +- .../sql_functions_and_expressions.adoc | 12 +- .../src/asciidoc/_chapters/sql_statements.adoc | 120 +- .../src/asciidoc/_chapters/sql_utilities.adoc | 524 ++++++++ docs/src/site/markdown/download.md | 2 +- .../site/markdown/enable-secure-trafodion.md | 2 +- docs/src/site/markdown/index.md | 10 +- docs/src/site/markdown/ldapcheck.md | 2 +- docs/src/site/markdown/ldapconfigcheck.md | 2 +- docs/src/site/markdown/quickstart.md | 6 +- docs/src/site/markdown/release-notes-1-0-1.md | 2 +- docs/src/site/site.xml | 11 +- install/.gitignore | 1 - install/Makefile | 7 +- install/ambari-installer/Makefile | 6 +- install/ambari-installer/traf_ambari.spec | 2 +- licenses/Makefile | 5 +- licenses/lic-server-src | 32 +- licenses/lic-test-src | 6 +- pom.xml | 52 +- tools/docker/Dockerfile | 4 +- tools/docker/start-compile-docker.sh | 6 +- win-odbc64/odbcclient/drvr35/cdesc.cpp | 3 +- win-odbc64/odbcclient/drvr35/ctosqlconv.cpp | 6 +- win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 112 +- 190 files changed, 3763 insertions(+), 3519 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/eeeabbca/core/sql/cli/Cli.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/eeeabbca/core/sql/cli/Statement.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/eeeabbca/core/sql/executor/ex_globals.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/eeeabbca/core/sql/executor/ex_globals.h ----------------------------------------------------------------------
