Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 17535200B11 for ; Mon, 13 Jun 2016 21:17:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 15E65160A5B; Mon, 13 Jun 2016 19:17:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E4EC6160A1A for ; Mon, 13 Jun 2016 21:17:47 +0200 (CEST) Received: (qmail 55493 invoked by uid 500); 13 Jun 2016 19:17:47 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 55484 invoked by uid 99); 13 Jun 2016 19:17:47 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jun 2016 19:17:47 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id B42671800B6 for ; Mon, 13 Jun 2016 19:17:46 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.146 X-Spam-Level: X-Spam-Status: No, score=-4.146 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426, URI_NOVOWEL=0.5] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id ko5QSJqagT_e for ; Mon, 13 Jun 2016 19:17:44 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id CB5E15F341 for ; Mon, 13 Jun 2016 19:17:42 +0000 (UTC) Received: (qmail 55199 invoked by uid 99); 13 Jun 2016 19:17:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jun 2016 19:17:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8903BE03A9; Mon, 13 Jun 2016 19:17:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbirdsall@apache.org To: commits@trafodion.incubator.apache.org Date: Mon, 13 Jun 2016 19:17:42 -0000 Message-Id: <9714450bed0d4e74bd2eb295f75e7912@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/5] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf archived-at: Mon, 13 Jun 2016 19:17:49 -0000 Merge branch 'master' of github.com:apache/incubator-trafodion into sean_traf Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/69fe570b Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/69fe570b Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/69fe570b Branch: refs/heads/master Commit: 69fe570bc743765446a873792be810638a191bdc Parents: 8007949 4c3bb2b Author: Sean Broeder Authored: Tue Jun 7 21:41:56 2016 +0000 Committer: Sean Broeder Committed: Tue Jun 7 21:41:56 2016 +0000 ---------------------------------------------------------------------- .gitattributes | 6 - .gitignore | 1 + .rat-excludes | 2 +- Makefile | 1 + core/Makefile | 14 +- core/conn/Makefile | 5 +- core/conn/jdbcT4/Makefile | 1 + core/conn/jdbcT4/pom.xml | 7 +- .../jdbcT4/src/main/java/T4Messages.properties | 10 +- .../java/org/trafodion/jdbc/t4/Address.java | 2 +- .../jdbc/t4/HPT4ConnectionPoolDataSource.java | 346 ---- .../t4/HPT4ConnectionPoolDataSourceFactory.java | 68 - .../org/trafodion/jdbc/t4/HPT4DataSource.java | 366 ---- .../jdbc/t4/HPT4DataSourceFactory.java | 62 - .../java/org/trafodion/jdbc/t4/HPT4Desc.java | 542 ------ .../org/trafodion/jdbc/t4/HPT4Exception.java | 38 - .../java/org/trafodion/jdbc/t4/HPT4Handle.java | 84 - .../org/trafodion/jdbc/t4/HPT4Messages.java | 324 ---- .../jdbc/t4/HPT4ParameterMetaData.java | 243 --- .../trafodion/jdbc/t4/HPT4PooledConnection.java | 238 --- .../jdbc/t4/HPT4PooledConnectionManager.java | 385 ---- .../jdbc/t4/HPT4ResultSetMetaData.java | 309 --- .../jdbc/t4/InitializeDialogueReply.java | 6 +- .../java/org/trafodion/jdbc/t4/InputOutput.java | 50 +- .../trafodion/jdbc/t4/InterfaceConnection.java | 52 +- .../trafodion/jdbc/t4/InterfaceResultSet.java | 34 +- .../trafodion/jdbc/t4/InterfaceStatement.java | 148 +- .../java/org/trafodion/jdbc/t4/NCSAddress.java | 22 +- .../jdbc/t4/PreparedStatementManager.java | 2 +- .../java/org/trafodion/jdbc/t4/T4Address.java | 24 +- .../org/trafodion/jdbc/t4/T4Connection.java | 36 +- .../org/trafodion/jdbc/t4/T4DSProperties.java | 6 +- .../trafodion/jdbc/t4/T4DatabaseMetaData.java | 132 +- .../java/org/trafodion/jdbc/t4/T4Driver.java | 14 +- .../org/trafodion/jdbc/t4/T4Properties.java | 20 +- .../java/org/trafodion/jdbc/t4/T4ResultSet.java | 12 +- .../java/org/trafodion/jdbc/t4/T4Statement.java | 20 +- .../org/trafodion/jdbc/t4/T4_Dcs_Cancel.java | 2 +- .../org/trafodion/jdbc/t4/T4_Dcs_Connect.java | 10 +- .../jdbc/t4/TrafT4CallableStatement.java | 58 +- .../org/trafodion/jdbc/t4/TrafT4Connection.java | 108 +- .../jdbc/t4/TrafT4ConnectionPoolDataSource.java | 346 ++++ .../TrafT4ConnectionPoolDataSourceFactory.java | 68 + .../org/trafodion/jdbc/t4/TrafT4DataSource.java | 366 ++++ .../jdbc/t4/TrafT4DataSourceFactory.java | 62 + .../java/org/trafodion/jdbc/t4/TrafT4Desc.java | 542 ++++++ .../org/trafodion/jdbc/t4/TrafT4Exception.java | 38 + .../org/trafodion/jdbc/t4/TrafT4Handle.java | 84 + .../org/trafodion/jdbc/t4/TrafT4Messages.java | 324 ++++ .../jdbc/t4/TrafT4ParameterMetaData.java | 243 +++ .../jdbc/t4/TrafT4PooledConnection.java | 238 +++ .../jdbc/t4/TrafT4PooledConnectionManager.java | 385 ++++ .../jdbc/t4/TrafT4PreparedStatement.java | 118 +- .../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 296 +-- .../jdbc/t4/TrafT4ResultSetMetaData.java | 309 +++ .../org/trafodion/jdbc/t4/TrafT4Statement.java | 70 +- .../java/org/trafodion/jdbc/t4/Utility.java | 24 +- .../jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java | 16 +- .../jdbc/t4/odbc_Dcs_StopSrvr_exc_.java | 8 +- .../jdbc/t4/odbc_SQLSvc_Close_exc_.java | 8 +- .../t4/odbc_SQLSvc_EndTransaction_exc_.java | 8 +- .../jdbc/t4/odbc_SQLSvc_Execute_exc_.java | 10 +- .../jdbc/t4/odbc_SQLSvc_Fetch_exc_.java | 10 +- .../t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java | 6 +- .../t4/odbc_SQLSvc_InitializeDialogue_exc_.java | 6 +- .../jdbc/t4/odbc_SQLSvc_Prepare_exc_.java | 10 +- .../odbc_SQLSvc_SetConnectionOption_exc_.java | 12 +- .../t4/odbc_SQLSvc_TerminateDialogue_exc_.java | 8 +- .../java/org/trafodion/jdbc/t4/RunAllTests.java | 2 + core/conn/jdbc_type2/Makefile | 2 +- core/conn/jdbc_type2/build.xml | 11 +- core/conn/jdbc_type2/native/SQLMXDriver.cpp | 38 +- core/conn/jdbc_type2/native/SrvrCommon.cpp | 4 +- core/conn/odb/build.bat | 56 + core/conn/odb/odb/odb.vcxproj | 2 + core/conn/odbc/src/odbc/Makefile | 8 +- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 39 +- .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 4 +- core/conn/trafci/install/Installer.java | 7 +- .../src/org/trafodion/ci/InterfaceQuery.java | 46 +- .../src/org/trafodion/ci/ParseArguments.java | 4 +- .../trafci/src/org/trafodion/ci/Session.java | 39 +- .../src/org/trafodion/ci/SessionDefaults.java | 1 + .../src/org/trafodion/ci/UserInterface.java | 2 +- core/conn/trafci/utils/trafci | 8 + .../odbc/odbcclient/unixcli/makefile.lnx | 6 +- .../odbc/odbcclient/unixcli/package/TRAFDSN | 2 +- .../odbc/odbcclient/unixcli/package/mklnxpkg.sh | 2 + .../unixcli/package/runconnect_test.sh | 26 + core/dbsecurity/scripts/sqcertgen | 5 - core/dbsecurity/scripts/update_auth | 9 +- core/rest/Makefile | 16 +- core/rest/bin/rest-daemon.sh | 3 - core/rest/conf/log4j.properties | 2 +- core/rest/pom.xml | 40 +- core/rest/src/assembly/all.xml | 11 +- .../org/trafodion/rest/util/JdbcT4Util.java | 6 +- core/sqf/.gitignore | 4 + core/sqf/Makefile | 22 +- core/sqf/samples/.gitignore | 4 + core/sqf/sql/scripts/dcscheck | 20 +- core/sqf/sql/scripts/genms | 3 + core/sqf/sql/scripts/install_traf_components | 53 +- core/sqf/sql/scripts/sqcheck | 57 +- core/sqf/sqvers | 2 +- .../client/TrafParallelClientScanner.java.tmpl | 7 +- .../hbase/client/transactional/RMInterface.java | 43 +- .../RetryTransactionException.java | 54 + .../RollbackUnsuccessfulException.java | 62 + .../transactional/SsccTransactionalTable.java | 34 +- .../hbase/client/transactional/TmDDL.java | 24 +- .../transactional/TransactionManager.java | 626 +++--- .../TransactionalScanner.java.tmpl | 99 +- .../transactional/TransactionalTable.java | 46 +- .../transactional/SplitBalanceHelper.java | 51 +- .../transactional/TrxRegionObserver.java.tmpl | 4 +- .../transactional/IdTmException.java | 14 + .../java/org/trafodion/dtm/HBaseTxClient.java | 7 +- core/sql/arkcmp/CmpStatement.cpp | 42 +- core/sql/bin/SqlciErrors.txt | 6 +- core/sql/cli/Cli.cpp | 49 +- core/sql/cli/CliExtern.cpp | 1 - core/sql/cli/Context.cpp | 116 +- core/sql/cli/Context.h | 2 + core/sql/cli/ExSqlComp.cpp | 22 +- core/sql/cli/ExSqlComp.h | 2 + core/sql/cli/SessionDefaults.cpp | 18 +- core/sql/cli/SessionDefaults.h | 23 +- core/sql/cli/Statement.cpp | 2 +- core/sql/cli/sqlcli.h | 2 + core/sql/comexe/ComTdbExeUtil.cpp | 29 +- core/sql/comexe/ComTdbExeUtil.h | 46 +- core/sql/comexe/ComTdbFastTransport.cpp | 6 +- core/sql/comexe/ComTdbFastTransport.h | 7 +- core/sql/comexe/ComTdbHdfsScan.cpp | 62 +- core/sql/comexe/ComTdbHdfsScan.h | 75 +- core/sql/common/CharType.cpp | 4 + core/sql/common/CharType.h | 1 + core/sql/common/ComSmallDefs.h | 3 + core/sql/executor/ExExeUtil.h | 15 +- core/sql/executor/ExExeUtilCli.cpp | 5 +- core/sql/executor/ExExeUtilGet.cpp | 226 ++- core/sql/executor/ExExeUtilLoad.cpp | 2 +- core/sql/executor/ExExeUtilMisc.cpp | 129 +- core/sql/executor/ExFastTransport.cpp | 117 +- core/sql/executor/ExFastTransport.h | 5 + core/sql/executor/ExHdfsScan.cpp | 120 +- core/sql/executor/ExHdfsScan.h | 13 +- core/sql/executor/ex_control.cpp | 12 + core/sql/executor/hiveHook.cpp | 27 +- core/sql/exp/ExpErrorEnums.h | 1 + core/sql/exp/ExpLOB.cpp | 35 +- core/sql/exp/ExpLOB.h | 14 +- core/sql/exp/ExpLOBaccess.cpp | 294 ++- core/sql/exp/ExpLOBaccess.h | 81 +- core/sql/exp/ExpLOBenums.h | 6 +- core/sql/exp/ExpLOBinterface.cpp | 54 +- core/sql/exp/ExpLOBinterface.h | 10 + core/sql/generator/GenFastTransport.cpp | 67 +- core/sql/generator/GenPreCode.cpp | 42 +- core/sql/generator/GenRelExeUtil.cpp | 20 +- core/sql/generator/GenRelScan.cpp | 89 +- core/sql/generator/Generator.cpp | 3 +- core/sql/lib_mgmt/pom.xml | 2 +- core/sql/optimizer/BindRelExpr.cpp | 190 +- core/sql/optimizer/BindWA.h | 1 + core/sql/optimizer/HDFSHook.cpp | 6 + core/sql/optimizer/HDFSHook.h | 11 + core/sql/optimizer/ItemFunc.h | 5 + core/sql/optimizer/NAColumn.h | 2 +- core/sql/optimizer/NATable.cpp | 83 +- core/sql/optimizer/NormRelExpr.cpp | 4 +- core/sql/optimizer/RelExeUtil.cpp | 39 +- core/sql/optimizer/RelExeUtil.h | 9 +- core/sql/optimizer/RelExpr.cpp | 2 +- core/sql/optimizer/RelFastTransport.cpp | 6 +- core/sql/optimizer/RelFastTransport.h | 32 +- core/sql/optimizer/RelUpdate.h | 5 + core/sql/optimizer/ScanOptimizer.cpp | 6 + core/sql/optimizer/hiveHook.h | 25 +- core/sql/parser/ElemDDLCol.cpp | 2 +- core/sql/parser/SqlParserGlobalsCmn.h | 52 +- core/sql/parser/sqlparser.y | 33 +- core/sql/regress/core/EXPECTED162 | 22 +- core/sql/regress/executor/EXPECTED013.SB | 42 +- core/sql/regress/executor/EXPECTED020 | 5 + core/sql/regress/executor/EXPECTED130 | 293 ++- core/sql/regress/executor/EXPECTED140 | 317 ++- core/sql/regress/executor/FILTER140 | 4 + core/sql/regress/executor/TEST013 | 4 - core/sql/regress/executor/TEST130 | 50 +- core/sql/regress/executor/TEST130_argfile2 | 3 + core/sql/regress/executor/TEST140 | 94 +- core/sql/regress/hive/EXPECTED001 | 22 +- core/sql/regress/hive/EXPECTED003 | 320 +-- core/sql/regress/hive/EXPECTED004 | 240 +-- core/sql/regress/hive/EXPECTED005 | 212 +- core/sql/regress/hive/EXPECTED006 | 19 +- core/sql/regress/hive/EXPECTED015 | 71 +- core/sql/regress/hive/EXPECTED018 | 633 +++--- core/sql/regress/hive/TEST003 | 23 +- core/sql/regress/hive/TEST005 | 48 +- core/sql/regress/hive/TEST005_a.hive.sql | 8 +- core/sql/regress/hive/TEST006 | 1 - core/sql/regress/hive/TEST015 | 3 +- core/sql/regress/hive/TEST018 | 58 +- .../hive/TEST018_create_hive_tables.hive | 16 +- core/sql/regress/hive/tbl_type.data | 2 +- core/sql/regress/privs1/EXPECTED133 | Bin 26383 -> 26390 bytes core/sql/regress/privs1/TEST133 | 2 +- core/sql/regress/tools/runallsb | 2 +- core/sql/regress/tools/runregr_executor.ksh | 2 +- core/sql/regress/tools/runregr_hive.ksh | 39 +- core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 2 +- core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 108 +- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 141 +- core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 2 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 9 +- core/sql/sqlcomp/DefaultConstants.h | 15 +- core/sql/sqlcomp/NADefaults.h | 4 +- core/sql/sqlcomp/nadefaults.cpp | 127 +- core/sql/sqludr/SqlUdrPredefLogReader.cpp | 20 +- .../java/org/trafodion/sql/ByteArrayList.java | 54 - .../java/org/trafodion/sql/HBaseClient.java | 76 +- .../java/org/trafodion/sql/HBulkLoadClient.java | 42 +- .../java/org/trafodion/sql/HTableClient.java | 23 +- .../main/java/org/trafodion/sql/HiveClient.java | 59 +- .../java/org/trafodion/sql/ResultIterator.java | 133 -- .../org/trafodion/sql/ResultKeyValueList.java | 100 - .../java/org/trafodion/sql/RowToInsert.java | 44 - .../java/org/trafodion/sql/RowsToInsert.java | 57 - .../org/trafodion/sql/SequenceFileWriter.java | 129 +- .../java/org/trafodion/sql/StringArrayList.java | 47 - core/sql/ustat/hs_const.h | 1 + core/sql/ustat/hs_globals.cpp | 255 ++- core/sql/ustat/hs_globals.h | 4 + core/sql/ustat/hs_la.cpp | 36 +- core/sql/ustat/hs_la.h | 23 +- core/sql/ustat/hs_parser.cpp | 13 + dcs/Makefile | 17 +- dcs/pom.xml | 46 +- dcs/src/assembly/all.xml | 8 +- .../java/org/trafodion/dcs/util/JdbcT4Util.java | 24 +- .../src/asciidoc/_chapters/jdbct4.adoc | 9 +- .../src/asciidoc/_chapters/odbc_windows.adoc | 6 +- .../src/asciidoc/_chapters/commands.adoc | 4 +- .../src/asciidoc/_chapters/activate.adoc | 2 +- .../src/asciidoc/_chapters/enable_security.adoc | 12 +- .../src/asciidoc/_chapters/introduction.adoc | 26 +- .../src/asciidoc/_chapters/prepare.adoc | 12 +- .../src/asciidoc/_chapters/requirements.adoc | 6 +- .../src/asciidoc/_chapters/script_install.adoc | 38 +- .../src/asciidoc/_chapters/script_remove.adoc | 8 +- .../src/asciidoc/_chapters/script_upgrade.adoc | 26 +- .../src/asciidoc/_chapters/sql_statements.adoc | 9 +- docs/src/site/markdown/documentation.md | 2 + docs/src/site/markdown/download.md | 6 +- docs/src/site/markdown/index.md | 16 +- docs/src/site/resources/css/site.css | 2 +- docs/src/site/site.xml | 3 +- install/Makefile | 18 +- install/installer/dcs_installer | 19 +- install/installer/rest_installer | 21 +- .../installer/traf_apache_hadoop_config_setup | 842 -------- install/installer/traf_cloudera_mods | 3 +- install/installer/traf_config | 62 +- install/installer/traf_config_check | 44 +- install/installer/traf_config_setup | 69 +- install/installer/traf_hortonworks_mods | 4 +- install/installer/traf_package_setup | 4 +- .../installer/trafodion_apache_hadoop_install | 763 -------- install/installer/trafodion_config_default | 14 +- install/installer/trafodion_install | 154 +- install/traf_tools_setup.sh | 1 + licenses/Makefile | 15 +- licenses/lic-dcs-bin | 652 ------- licenses/lic-dcs-src | 69 - licenses/lic-rest-bin | 1416 -------------- licenses/lic-server-bin | 1834 ++++++++++++++++++ licenses/lic-server-src | 69 + licenses/not-dcs-bin | 20 - licenses/not-rest-bin | 20 - licenses/note-server-bin | 20 + pom.xml | 1 + 284 files changed, 10889 insertions(+), 11088 deletions(-) ----------------------------------------------------------------------