You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/07/18 16:20:29 UTC
[04/16] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into wrkbrnch
Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2b111fdb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2b111fdb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2b111fdb
Branch: refs/heads/master
Commit: 2b111fdb1d867261a5305461f908d904b68f0be0
Parents: afa1daa 9572321
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Fri Jun 17 17:14:52 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Fri Jun 17 17:14:52 2016 +0000
----------------------------------------------------------------------
.gitattributes | 6 -
.gitignore | 1 +
.rat-excludes | 4 +-
Makefile | 1 +
RAT_README | 16 +-
README | 4 +-
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 +-
.../main/java/org/trafodion/jdbc/t4/Bytes.java | 5 +
.../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 | 52 +-
.../trafodion/jdbc/t4/InterfaceStatement.java | 173 ++-
.../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 | 120 +-
.../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 | 34 +-
.../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 +-
.../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp | 65 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 63 +-
core/conn/trafci/install/Installer.java | 7 +-
.../odbc/odbcclient/unixcli/makefile.lnx | 8 +-
.../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/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/sqenvcom.sh | 1 -
core/sqf/sql/scripts/dcscheck | 20 +-
core/sqf/sql/scripts/install_traf_components | 53 +-
core/sqf/sql/scripts/sqcheck | 57 +-
core/sqf/sqvers | 2 +-
core/sqf/src/seabed/test/t284.h | 52 +-
core/sqf/src/seabed/test/t284cli.cpp | 5 +
core/sqf/src/seabed/test/t284cli.java | 75 +-
core/sqf/src/seabed/test/t284clicom.h | 58 +
core/sqf/src/seabed/test/t284lib.cpp | 79 +
core/sqf/src/seabed/test/t284srv.cpp | 250 ++++
.../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/TrxRegionEndpoint.java.tmpl | 40 +-
.../transactional/TrxRegionObserver.java.tmpl | 4 +-
.../hbase/regionserver/transactional/IdTm.java | 82 +-
.../transactional/IdTmException.java | 14 +
core/sqf/src/seatrans/tm/hbasetmlib2/idtm.cpp | 85 +-
.../src/seatrans/tm/hbasetmlib2/idtmclicom.h | 70 +-
core/sqf/src/seatrans/tm/hbasetmlib2/idtmjni.h | 14 +
.../trafodion/dtm/HBaseAuditControlPoint.java | 4 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 7 +-
.../java/org/trafodion/dtm/TmAuditTlog.java | 101 +-
core/sqf/src/tm/idtmsrv.cpp | 350 ++++-
core/sqf/src/tm/idtmsrv.h | 52 +-
core/sqf/src/tm/tmlib.cpp | 5 +-
core/sqf/src/tm/tmtx.cpp | 6 +-
core/sql/arkcmp/CmpStatement.cpp | 42 +-
core/sql/bin/SqlciErrors.txt | 8 +-
core/sql/cli/Cli.cpp | 49 +-
core/sql/cli/CliExpExchange.cpp | 29 +-
core/sql/cli/CliExtern.cpp | 1 -
core/sql/cli/Context.cpp | 116 +-
core/sql/cli/Context.h | 2 +
core/sql/cli/Descriptor.cpp | 8 +-
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 | 6 +
core/sql/comexe/ComTdb.cpp | 51 -
core/sql/comexe/ComTdb.h | 24 +-
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/BaseTypes.cpp | 60 +-
core/sql/common/CharType.cpp | 4 +
core/sql/common/CharType.h | 1 +
core/sql/common/ComSmallDefs.h | 13 +
core/sql/common/NAType.cpp | 10 +-
core/sql/common/NumericType.cpp | 153 +-
core/sql/common/NumericType.h | 195 ++-
core/sql/common/OperTypeEnum.h | 1 +
core/sql/common/SQLTypeDefs.h | 5 +
core/sql/common/dfs2rec.h | 8 +-
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/ExHbaseIUD.cpp | 6 +-
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/exp/ExpPCodeClauseGen.cpp | 2 -
core/sql/exp/exp_arith.cpp | 99 +-
core/sql/exp/exp_attrs.cpp | 4 +-
core/sql/exp/exp_clause_derived.h | 18 +-
core/sql/exp/exp_comp.cpp | 80 +-
core/sql/exp/exp_conv.cpp | 529 +++++--
core/sql/exp/exp_fixup.cpp | 44 +-
core/sql/exp/exp_function.cpp | 165 +-
core/sql/exp/exp_math_func.cpp | 107 +-
core/sql/generator/GenFastTransport.cpp | 67 +-
core/sql/generator/GenPreCode.cpp | 119 +-
core/sql/generator/GenRelExeUtil.cpp | 20 +-
core/sql/generator/GenRelScan.cpp | 89 +-
core/sql/generator/Generator.cpp | 3 +-
core/sql/langman/LmJavaType.cpp | 21 +-
core/sql/langman/LmJavaType.h | 1 +
core/sql/langman/LmResultSetJava.cpp | 56 +-
core/sql/langman/LmRoutineCSql.cpp | 27 +
core/sql/lib_mgmt/pom.xml | 2 +-
core/sql/nskgmake/openssl_client/Makefile | 80 -
core/sql/optimizer/BindRelExpr.cpp | 279 ++--
core/sql/optimizer/BindWA.h | 1 +
core/sql/optimizer/EncodedValue.cpp | 10 +-
core/sql/optimizer/HDFSHook.cpp | 6 +
core/sql/optimizer/HDFSHook.h | 11 +
core/sql/optimizer/ItemExpr.cpp | 10 +-
core/sql/optimizer/ItemFunc.h | 41 +-
core/sql/optimizer/NAColumn.cpp | 50 +-
core/sql/optimizer/NAColumn.h | 2 +-
core/sql/optimizer/NATable.cpp | 140 +-
core/sql/optimizer/NormRelExpr.cpp | 4 +-
core/sql/optimizer/OptRange.cpp | 2 -
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/ValueDesc.cpp | 66 +-
core/sql/optimizer/hiveHook.h | 25 +-
core/sql/parser/ElemDDLCol.cpp | 2 +-
core/sql/parser/ElemDDLLikeOptions.cpp | 25 +
core/sql/parser/ElemDDLLikeOptions.h | 34 +
core/sql/parser/ElemDDLNode.cpp | 32 +
core/sql/parser/ElemDDLNode.h | 2 +
core/sql/parser/ElemDDLSaltOptions.h | 2 +
core/sql/parser/ParDDLLikeOpts.cpp | 45 +
core/sql/parser/ParDDLLikeOptsCreateTable.h | 8 +
core/sql/parser/ParKeyWords.cpp | 3 -
core/sql/parser/SqlParserGlobalsCmn.h | 52 +-
core/sql/parser/sqlparser.y | 134 +-
core/sql/regress/compGeneral/EXPECTED015.SB | 469 +++---
core/sql/regress/core/EXPECTED162 | 22 +-
core/sql/regress/executor/EXPECTED013.SB | 42 +-
core/sql/regress/executor/EXPECTED020 | 5 +
core/sql/regress/executor/EXPECTED022.SB | 246 +--
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/TEST022 | 54 +-
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_bad.data | 2 +-
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/seabase/EXPECTED003 | 425 ++++++
core/sql/regress/seabase/EXPECTED040 | 275 ++++
core/sql/regress/seabase/TEST003 | 138 ++
core/sql/regress/seabase/TEST040 | 115 ++
core/sql/regress/tools/runallsb | 2 +-
core/sql/regress/tools/runregr_executor.ksh | 2 +-
core/sql/regress/tools/runregr_hive.ksh | 39 +-
core/sql/regress/udr/EXPECTED100.SB | 53 +-
core/sql/regress/udr/TEST100 | 13 +
core/sql/regress/udr/t100.java | 4 +
core/sql/sqlci/Formatter.cpp | 14 +-
core/sql/sqlci/Param.cpp | 4 +-
core/sql/sqlci/SqlciEnv.cpp | 28 +-
core/sql/sqlci/SqlciEnv.h | 2 +-
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 108 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 141 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 2 +
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 25 +-
core/sql/sqlcomp/DefaultConstants.h | 37 +-
core/sql/sqlcomp/NADefaults.h | 4 +-
core/sql/sqlcomp/QCache.cpp | 4 +-
core/sql/sqlcomp/nadefaults.cpp | 139 +-
core/sql/sqludr/sqludr.cpp | 6 +
.../java/org/trafodion/sql/ByteArrayList.java | 54 -
.../java/org/trafodion/sql/HBaseClient.java | 93 +-
.../java/org/trafodion/sql/HBulkLoadClient.java | 43 +-
.../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 -
.../java/org/trafodion/sql/udr/ColumnInfo.java | 6 +
core/sql/ustat/hs_cli.cpp | 42 +-
core/sql/ustat/hs_const.h | 1 +
core/sql/ustat/hs_faststats.cpp | 6 +
core/sql/ustat/hs_globals.cpp | 266 ++--
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/parser_msgs.adoc | 13 +
.../src/asciidoc/_chapters/sqlstate.adoc | 1 +
.../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 | 46 +-
docs/src/site/markdown/documentation.md | 8 +-
docs/src/site/markdown/download.md | 159 +-
docs/src/site/markdown/index.md | 16 +-
docs/src/site/markdown/release-notes-2-0-0.md | 152 ++
docs/src/site/markdown/release-notes-2-0-1.md | 40 +
docs/src/site/markdown/release-notes.md | 4 +-
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 | 153 +-
install/traf_tools_setup.sh | 1 +
licenses/Makefile | 15 +-
licenses/lic-clients-bin | 136 +-
licenses/lic-dcs-bin | 652 --------
licenses/lic-dcs-src | 69 -
licenses/lic-rest-bin | 1416 ------------------
licenses/lic-server-bin | 1278 ++++++++++++++++
licenses/lic-server-src | 72 +
licenses/not-dcs-bin | 20 -
licenses/not-rest-bin | 20 -
licenses/note-server-bin | 20 +
pom.xml | 1 +
win-odbc64/odbcclient/drvr35/cconnect.cpp | 9 +-
361 files changed, 14735 insertions(+), 13040 deletions(-)
----------------------------------------------------------------------