Merge remote branch 'origin/master' into lob_get_trace
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8b398080 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8b398080 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8b398080 Branch: refs/heads/master Commit: 8b39808010d4558534d48e1d760766e67b8fc07f Parents: bbe87c9 9ba333a Author: Sandhya Sundaresan <[email protected]> Authored: Fri Apr 15 07:33:36 2016 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Fri Apr 15 07:33:36 2016 +0000 ---------------------------------------------------------------------- core/conn/jdbc_type2/build.xml | 6 + .../java/org/trafodion/jdbc/t2/BaseRow.java | 67 - .../java/org/trafodion/jdbc/t2/InsertRow.java | 89 - .../main/java/org/trafodion/jdbc/t2/Row.java | 275 - core/conn/jdbc_type4/build.xml | 8 + .../src/org/trafodion/jdbc/t4/HPT4Desc.java | 8 +- .../trafodion/jdbc/t4/InterfaceResultSet.java | 10 + .../trafodion/jdbc/t4/InterfaceStatement.java | 8 +- .../jdbc/t4/TrafT4PreparedStatement.java | 32 +- .../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 19 +- core/conn/odbc/src/odbc/Common/DrvrSrvr.cpp | 2 + core/conn/odbc/src/odbc/Common/nskieee.cpp | 18 + core/conn/odbc/src/odbc/nsksrvr/Makefile | 2 + .../odbc/src/odbc/nsksrvrcore/csrvrstmt.cpp | 7 +- .../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp | 86 +- core/conn/odbc/src/odbc/nsksrvrcore/srvrkds.cpp | 2 + core/rest/Makefile | 5 +- core/rest/pom.xml | 159 +- core/rest/src/assembly/all.xml | 20 +- .../main/java/org/trafodion/rest/Constants.java | 8 - .../org/trafodion/rest/GetStatusResponse.java | 3 - core/sqf/conf/install_features | 7 +- core/sqf/hbase_utilities/pom.xml | 12 +- .../backuprestore/TrafExportSnapshot.java | 85 +- core/sqf/monitor/linux/cluster.cxx | 11 + core/sqf/monitor/linux/cmsh.cxx | 29 +- core/sqf/monitor/linux/config.cxx | 1 + core/sqf/monitor/linux/internal.h | 9 + core/sqf/monitor/linux/makefile | 5 +- core/sqf/monitor/linux/mlio.cxx | 6 +- core/sqf/monitor/linux/monitor.cxx | 3 + core/sqf/monitor/linux/msgdef.h | 17 + core/sqf/monitor/linux/phnode.h | 2 + core/sqf/monitor/linux/pnode.cxx | 10 + core/sqf/monitor/linux/pnode.h | 1 + core/sqf/monitor/linux/pnodeconfig.cxx | 6 + core/sqf/monitor/linux/pnodeconfig.h | 2 +- core/sqf/monitor/linux/replicate.cxx | 56 +- core/sqf/monitor/linux/replicate.h | 14 + core/sqf/monitor/linux/reqnodename.cxx | 114 + core/sqf/monitor/linux/reqqueue.cxx | 60 +- core/sqf/monitor/linux/reqqueue.h | 32 +- core/sqf/monitor/linux/shell.cxx | 177 +- core/sqf/monitor/linux/testpoint.h | 2 +- core/sqf/sqenvcom.sh | 157 +- core/sqf/sql/scripts/ilh_cleanhb | 106 + core/sqf/sql/scripts/ilh_hbase_repair | 65 + core/sqf/sql/scripts/ilh_hbcheck | 72 + core/sqf/sql/scripts/ilh_traf_restart | 117 + core/sqf/sql/scripts/ilh_trafinit | 108 + .../sql/scripts/install_hadoop_regr_test_env | 4 +- core/sqf/sql/scripts/install_local_hadoop | 80 +- core/sqf/sql/scripts/sqgen | 1 + core/sqf/sql/scripts/trafnodestatus | 105 + core/sqf/sql/scripts/trafnodestatus.awk | 76 + core/sqf/src/seabed/src/fs.cpp | 3 +- core/sqf/src/seabed/src/sautil.cpp | 5 - core/sqf/src/seabed/src/stream.cpp | 2 - 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/sqf/tools/sqtools.sh | 56 + core/sql/arkcmp/CmpContext.h | 1 + core/sql/arkcmp/CmpStatement.cpp | 2 - core/sql/bin/SqlciErrors.txt | 9 +- core/sql/cli/CliExtern.cpp | 36 - core/sql/cli/SQLCLIdev.h | 2 - core/sql/cli/SessionDefaults.cpp | 2 + core/sql/cli/Statement.cpp | 5 +- core/sql/comexe/ComTdbHbaseAccess.h | 39 +- core/sql/comexe/ComTdbHdfsScan.h | 5 +- core/sql/common/ComMisc.cpp | 14 + core/sql/common/ComMisc.h | 8 + core/sql/common/ComSmallDefs.h | 5 + core/sql/executor/ExHbaseAccess.h | 2 - core/sql/executor/ExHbaseIUD.cpp | 28 +- core/sql/executor/ExHbaseSelect.cpp | 19 +- core/sql/executor/ExHdfsScan.cpp | 27 +- core/sql/executor/ExHdfsScan.h | 99 +- core/sql/executor/HBaseClient_JNI.cpp | 85 +- core/sql/executor/HBaseClient_JNI.h | 10 +- core/sql/executor/ex_control.cpp | 12 +- core/sql/exp/ExpHbaseInterface.cpp | 25 +- core/sql/exp/ExpHbaseInterface.h | 10 +- core/sql/exp/exp_conv.cpp | 1 + core/sql/exp/exp_datetime.cpp | 14 +- core/sql/exp/exp_datetime.h | 1 + core/sql/generator/GenExpGenerator.cpp | 47 +- core/sql/generator/GenPreCode.cpp | 101 +- core/sql/generator/GenRelScan.cpp | 8 +- core/sql/generator/GenRelUpdate.cpp | 34 +- core/sql/generator/Generator.cpp | 8 +- core/sql/nskgmake/Makerules.mk | 16 +- core/sql/optimizer/BindItemExpr.cpp | 24 +- core/sql/optimizer/BindRelExpr.cpp | 99 +- core/sql/optimizer/NARoutine.cpp | 47 +- core/sql/optimizer/NARoutineDB.h | 4 +- core/sql/optimizer/NATable.cpp | 11 +- core/sql/optimizer/RelExeUtil.cpp | 8 +- core/sql/optimizer/RelExeUtil.h | 2 + core/sql/optimizer/SynthType.cpp | 15 +- core/sql/parser/ElemDDLCol.cpp | 542 +- core/sql/parser/ElemDDLColDef.h | 14 +- core/sql/parser/StmtDDLCreate.cpp | 7 +- core/sql/parser/sqlparser.y | 48 +- core/sql/pom.xml | 12 +- core/sql/pom.xml.apache | 131 + core/sql/pom.xml.hdp | 111 + core/sql/regress/charsets/EXPECTED002 | 6 +- core/sql/regress/charsets/EXPECTED310 | 198 +- core/sql/regress/charsets/EXPECTED312 | 198 +- core/sql/regress/charsets/EXPECTED313 | 286 +- .../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS | 2 +- core/sql/regress/compGeneral/EXPECTED005 | 10 +- core/sql/regress/compGeneral/EXPECTED006.SB | 22 +- core/sql/regress/compGeneral/EXPECTED042 | 8 +- core/sql/regress/core/DIFF116.KNOWN.SB | 21 - core/sql/regress/core/EXPECTED116 | 102 +- core/sql/regress/core/EXPECTED131 | 89 +- core/sql/regress/core/EXPECTEDRTS | 1436 ++-- core/sql/regress/core/FILTERRTS | 2 + core/sql/regress/core/TEST116 | 18 + core/sql/regress/core/TEST131 | 40 + core/sql/regress/core/TESTRTS | 24 +- core/sql/regress/executor/EXPECTED020 | 4 + core/sql/regress/hive/EXPECTED005 | 61 + core/sql/regress/hive/TEST005 | 17 + core/sql/regress/hive/TEST005_a.hive.sql | 18 + core/sql/regress/hive/tbl_dos.data | 10 + core/sql/regress/hive/tbl_dos_numeric.data | 10 + core/sql/regress/privs1/EXPECTED133 | Bin 22984 -> 26383 bytes core/sql/regress/privs1/TEST133 | 97 +- core/sql/regress/privs2/EXPECTED135 | 219 +- core/sql/regress/privs2/TEST135 | 50 +- core/sql/regress/seabase/EXPECTED010 | 2 +- core/sql/regress/seabase/EXPECTED020 | 389 +- core/sql/regress/seabase/EXPECTED027 | 231 +- core/sql/regress/seabase/EXPECTED030 | 65 + core/sql/regress/seabase/EXPECTED031 | 238 + core/sql/regress/seabase/TEST010 | 2 +- core/sql/regress/seabase/TEST020 | 106 +- core/sql/regress/seabase/TEST027 | 35 + core/sql/regress/seabase/TEST030 | 9 + core/sql/regress/seabase/TEST031 | 116 + core/sql/regress/tools/runregr_executor.ksh | 2 +- core/sql/regress/tools/runregr_udr.ksh | 8 +- core/sql/regress/udr/EXPECTED103 | 529 ++ core/sql/regress/udr/FILTER103 | 25 + core/sql/regress/udr/TEST103 | 246 + core/sql/regress/udr/TEST103_functions.cpp | 191 + core/sql/regress/udr/TEST103_procs.java | 224 + core/sql/regress/udr/Utils.java | 279 + core/sql/sqlcomp/CmpSeabaseDDL.h | 1 + core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 3 +- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 100 +- core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 35 +- core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 158 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 138 +- core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 22 +- core/sql/sqlcomp/DefaultConstants.h | 20 +- core/sql/sqlcomp/nadefaults.cpp | 22 +- .../java/org/trafodion/sql/HBaseClient.java | 36 +- .../java/org/trafodion/sql/HTableClient.java | 15 +- core/sql/ustat/hs_globals.cpp | 24 +- docs/.gitignore | 2 - .../src/asciidoc/_chapters/SQuirrel.adoc | 8 +- .../src/asciidoc/_chapters/about.adoc | 11 +- .../src/asciidoc/_chapters/dbviz.adoc | 17 +- .../src/asciidoc/_chapters/introduction.adoc | 130 +- .../src/asciidoc/_chapters/jdbct4.adoc | 353 +- .../src/asciidoc/_chapters/odb.adoc | 55 +- .../src/asciidoc/_chapters/odbc_linux.adoc | 82 +- .../src/asciidoc/_chapters/odbc_windows.adoc | 175 +- .../src/asciidoc/_chapters/sample_prog.adoc | 6 +- .../src/asciidoc/_chapters/trafci.adoc | 323 +- docs/client_install/src/asciidoc/index.adoc | 11 +- .../src/images/win10_edit_path.jpg | Bin 0 -> 65094 bytes .../src/images/win10_select_java.jpg | Bin 0 -> 22758 bytes .../src/asciidoc/_chapters/about.adoc | 4 +- .../src/asciidoc/_chapters/commands.adoc | 8 +- .../src/asciidoc/_chapters/install.adoc | 70 +- .../src/asciidoc/_chapters/interactive.adoc | 56 +- .../src/asciidoc/_chapters/introduction.adoc | 10 +- .../src/asciidoc/_chapters/launch.adoc | 148 +- .../src/asciidoc/_chapters/perlpython.adoc | 72 +- .../src/asciidoc/_chapters/scripts.adoc | 24 +- docs/command_interface/src/asciidoc/index.adoc | 4 + .../src/resources/source/sample.pl | 19 + .../src/resources/source/sample.py | 29 + .../src/asciidoc/_chapters/trickle_load.adoc | 2 +- docs/shared/license.txt | 11 + docs/spj_guide/pom.xml | 297 + .../spj_guide/src/asciidoc/_chapters/about.adoc | 197 + .../src/asciidoc/_chapters/create_spjs.adoc | 461 ++ .../src/asciidoc/_chapters/deploy_spjs.adoc | 262 + .../src/asciidoc/_chapters/develop_spjs.adoc | 882 +++ .../src/asciidoc/_chapters/execute_spjs.adoc | 779 +++ .../src/asciidoc/_chapters/get_started.adoc | 92 + .../asciidoc/_chapters/grant_privileges.adoc | 336 + .../src/asciidoc/_chapters/introduction.adoc | 264 + .../_chapters/performance_troubleshooting.adoc | 265 + .../src/asciidoc/_chapters/sample_database.adoc | 184 + .../src/asciidoc/_chapters/sample_spjs.adoc | 1540 +++++ docs/spj_guide/src/asciidoc/index.adoc | 74 + .../src/images/call-statement-elements.jpg | Bin 0 -> 33415 bytes .../src/resources/acknowledgements.txt | 38 + .../src/resources/source/Inventory.java | 120 + .../spj_guide/src/resources/source/Payroll.java | 151 + docs/spj_guide/src/resources/source/Sales.java | 346 + .../src/resources/source/adjustSalary.java | 41 + .../src/resources/source/employeeJob.java | 32 + .../resources/source/invent_partloc_table.sql | 56 + .../resources/source/invent_partsupp_table.sql | 128 + .../src/resources/source/invent_schema.sql | 2 + .../resources/source/invent_supplier_table.sql | 35 + .../src/resources/source/lowerPrice.java | 44 + .../src/resources/source/numDailyOrders.java | 29 + .../src/resources/source/numMonthlyOrders.java | 41 + .../src/resources/source/orderSummary.java | 76 + .../src/resources/source/partData.java | 103 + .../src/resources/source/partlocations.java | 42 + .../src/resources/source/persnl_dept_table.sql | 70 + .../resources/source/persnl_employee_table.sql | 99 + .../src/resources/source/persnl_job_table.sql | 20 + .../resources/source/persnl_project_table.sql | 45 + .../src/resources/source/persnl_schema.sql | 2 + .../src/resources/source/projectTeam.java | 25 + .../resources/source/sales_customer_table.sql | 30 + .../resources/source/sales_odetail_table.sql | 84 + .../src/resources/source/sales_orders_table.sql | 66 + .../src/resources/source/sales_parts_table.sql | 45 + .../src/resources/source/sales_schema.sql | 2 + .../src/resources/source/supplierinfo.java | 38 + .../src/resources/source/supplyquantities.java | 32 + .../src/resources/source/topSalesReps.java | 43 + .../src/resources/source/totalPrice.java | 47 + .../src/asciidoc/_chapters/sql_statements.adoc | 163 +- docs/src/site/markdown/documentation.md | 67 +- docs/src/site/markdown/download.md | 2 +- docs/src/site/markdown/index.md | 25 +- .../resources/images/logo-carousel/slide-1.png | Bin 0 -> 58887 bytes .../resources/images/logo-carousel/slide-2.png | Bin 0 -> 57783 bytes docs/src/site/site.xml | 14 +- install/installer/rest_installer | 10 +- install/installer/traf_cloudera_mods98 | 64 +- install/installer/traf_createPasswordLessSSH | 6 +- install/installer/traf_getHadoopNodes | 105 +- install/installer/traf_hortonworks_mods98 | 125 +- .../installer/trafodion_apache_hadoop_install | 12 +- install/installer/trafodion_install | 12 - install/installer/trafodion_uninstaller | 10 +- licenses/lic-rest-bin | 1415 +++- licenses/not-rest-bin | 20 + pom.xml | 1 + tests/phx/phoenix_test.py | 10 +- 307 files changed, 37413 insertions(+), 17752 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8b398080/core/sql/cli/CliExtern.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8b398080/core/sql/cli/SessionDefaults.cpp ---------------------------------------------------------------------- diff --cc core/sql/cli/SessionDefaults.cpp index 1ace070,2306e29..3596f9f --- a/core/sql/cli/SessionDefaults.cpp +++ b/core/sql/cli/SessionDefaults.cpp @@@ -840,9 -840,10 +840,11 @@@ static const AQRInfo::AQRErrorMap aqrEr // view not found AQREntry( 8598, 0, 1, 0, 1, 0, "", 0, 0), + AQREntry( 8606, 73, 3, 60, 0, 0, "", 0, 0), + AQREntry( 8606, 97, 1, 0, 5, 0, "", 0, 0), + AQREntry( 8606, 73, 3, 60, 0, 0, "", 0, 0), // privileges may have been revoked AQREntry( 8734, 0, 1, 0, 1, 0, "", 0, 0), http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8b398080/core/sql/cli/Statement.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8b398080/core/sql/optimizer/NATable.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8b398080/core/sql/optimizer/RelExeUtil.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8b398080/core/sql/optimizer/RelExeUtil.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8b398080/core/sql/parser/sqlparser.y ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8b398080/core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8b398080/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp ----------------------------------------------------------------------
