Merge remote branch 'origin/master'
Conflicts:
core/sql/regress/executor/EXPECTED130
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/db3ebf5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/db3ebf5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/db3ebf5d
Branch: refs/heads/master
Commit: db3ebf5d70156aa2d987656dc7231b0ebf9904d3
Parents: 5a3f202 7862d94
Author: Sandhya Sundaresan <[email protected]>
Authored: Fri May 27 06:45:37 2016 +0000
Committer: Sandhya Sundaresan <[email protected]>
Committed: Fri May 27 06:45:37 2016 +0000
----------------------------------------------------------------------
.gitattributes | 6 -
.gitignore | 1 +
.rat-excludes | 2 +-
core/Makefile | 2 +-
core/conn/Makefile | 5 +-
core/conn/jdbcT4/Makefile | 1 +
.../jdbcT4/src/main/java/T4Messages.properties | 6 +-
.../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/native/SrvrCommon.cpp | 4 +-
core/conn/odb/build.bat | 56 +
core/conn/odb/odb/odb.vcxproj | 2 +
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 39 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 4 +-
.../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 +
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 | 20 +-
core/sqf/monitor/linux/shell.cxx | 30 +-
core/sqf/sql/scripts/genms | 3 +
core/sqf/sql/scripts/install_traf_components | 50 +-
.../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/sqf/src/tm/tmlib.cpp | 5 +-
core/sqf/src/tm/tmtx.cpp | 6 +-
core/sql/bin/SqlciErrors.txt | 2 +
core/sql/cli/Context.cpp | 26 +-
core/sql/cli/Context.h | 1 +
core/sql/cli/ExSqlComp.cpp | 5 +-
core/sql/cli/ExSqlComp.h | 2 +
core/sql/cli/SessionDefaults.cpp | 9 +
core/sql/cli/SessionDefaults.h | 12 +-
core/sql/cli/Statement.cpp | 2 +-
core/sql/executor/ExExeUtilLoad.cpp | 2 +-
core/sql/executor/ExFastTransport.cpp | 8 +-
core/sql/executor/ExHbaseIUD.cpp | 3 +-
core/sql/executor/HBaseClient_JNI.cpp | 223 +--
core/sql/executor/HBaseClient_JNI.h | 70 +-
core/sql/executor/ex_control.cpp | 12 +
core/sql/exp/ExpLOB.cpp | 10 +
core/sql/generator/GenPreCode.cpp | 15 +-
core/sql/optimizer/BindRelExpr.cpp | 44 +-
core/sql/optimizer/RelFastTransport.cpp | 4 +-
core/sql/optimizer/RelFastTransport.h | 14 +-
core/sql/regress/executor/EXPECTED013.SB | 42 +-
core/sql/regress/executor/EXPECTED020 | 1 +
core/sql/regress/executor/EXPECTED130 | 95 +-
core/sql/regress/executor/TEST013 | 4 -
core/sql/regress/executor/TEST130 | 6 +-
core/sql/regress/hive/EXPECTED003 | 26 +
core/sql/regress/hive/EXPECTED018 | 191 +-
core/sql/regress/hive/TEST003 | 11 +
core/sql/regress/hive/TEST018 | 6 +
core/sql/regress/tools/runregr_executor.ksh | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 3 +-
core/sql/sqlcomp/DefaultConstants.h | 1 +
core/sql/sqlcomp/NADefaults.h | 6 +
core/sql/sqlcomp/nadefaults.cpp | 45 +-
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 | 120 +-
core/sql/ustat/hs_globals.h | 4 +
core/sql/ustat/hs_parser.cpp | 13 +
dcs/Makefile | 17 +-
dcs/pom.xml | 38 +-
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/installer/dcs_installer | 19 +-
install/installer/rest_installer | 21 +-
.../installer/traf_apache_hadoop_config_setup | 842 --------
install/installer/traf_cloudera_mods | 2 +-
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 | 2 +
.../installer/trafodion_apache_hadoop_install | 763 --------
install/installer/trafodion_config_default | 14 +-
install/installer/trafodion_install | 148 +-
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 +
197 files changed, 7209 insertions(+), 9867 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db3ebf5d/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db3ebf5d/core/sql/exp/ExpLOB.cpp
----------------------------------------------------------------------
diff --cc core/sql/exp/ExpLOB.cpp
index e4f024c,1d28e76..217b2ce
--- a/core/sql/exp/ExpLOB.cpp
+++ b/core/sql/exp/ExpLOB.cpp
@@@ -1027,7 -1029,11 +1036,8 @@@ ex_expr::exp_return_type ExpLOBinsert::
err = insertDesc(op_data, h, diagsArea);
if (err == ex_expr::EXPR_ERROR)
return err;
+
- if (fromExternal())
- return err;
-
#ifndef __EID
char * handle = op_data[0];
Lng32 handleLen = getOperand(0)->getLength();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db3ebf5d/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db3ebf5d/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------
