You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2017/07/03 17:09:26 UTC
[5/7] incubator-trafodion git commit: Merge remote branch
'origin/master' into traf2663
Merge remote branch 'origin/master' into traf2663
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c55b2fd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c55b2fd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c55b2fd8
Branch: refs/heads/master
Commit: c55b2fd89ff4a692ff8d3d647d45d4c66faaf35d
Parents: d1e3cec 20c459c
Author: Steve Varnau <st...@esgyn.com>
Authored: Wed Jun 28 20:55:47 2017 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Wed Jun 28 20:55:47 2017 +0000
----------------------------------------------------------------------
core/.gitignore | 2 +-
core/Makefile | 2 +-
.../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 36 +-
core/conn/odb/build.bat | 4 +-
core/conn/odb/installer.iss | 4 +-
core/conn/odb/odb/odb.rc | Bin 5120 -> 5336 bytes
core/conn/odb/src/odb.c | 8 +
core/dbsecurity/auth/src/authEvents.cpp | 2 +-
core/sqf/commonLogger/CommonLogger.cpp | 17 +-
core/sqf/conf/log4j.sql.config | 6 +-
core/sqf/conf/trafodion-site.xml | 38 +
core/sqf/conf/trafodion.udr.config | 2 +-
core/sqf/sqenvcom.sh | 1 +
core/sqf/sql/scripts/genms | 3 +
core/sqf/sql/scripts/gensq.pl | 28 -
core/sqf/sql/scripts/install_local_hadoop | 8 -
core/sqf/sql/scripts/rmscheck | 19 +-
core/sqf/sql/scripts/sqgen | 84 +-
core/sqf/sql/scripts/sqgenrmscheck | 118 +
core/sqf/sql/scripts/trafodion-site.xml | 38 -
.../transactional/TrxRegionEndpoint.java.tmpl | 45 +-
.../transactional/TrxTransactionState.java.tmpl | 1 -
.../seatrans/tm/hbasetmlib2/TMInterface.java | 6 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 8 +-
.../main/java/org/trafodion/dtm/TrafInfo.java | 2 +-
core/sqf/sysinstall/home/trafodion/.bashrc | 2 +-
core/sql/arkcmp/CmpContext.cpp | 2 +
core/sql/arkcmp/CmpContext.h | 7 +
core/sql/cli/Context.h | 3 +
core/sql/common/Ipc.h | 2 +-
core/sql/executor/ExExeUtil.h | 5 +
core/sql/executor/ExExeUtilGet.cpp | 186 +-
core/sql/executor/HBaseClient_JNI.cpp | 38 +-
core/sql/executor/HBaseClient_JNI.h | 4 +
core/sql/executor/JavaObjectInterface.cpp | 282 ++-
core/sql/executor/JavaObjectInterface.h | 19 +-
core/sql/executor/OrcFileReader.cpp | 1 -
core/sql/executor/SequenceFileReader.cpp | 3 -
core/sql/executor/ex_frag_rt.cpp | 7 +-
core/sql/exp/ExpHbaseInterface.cpp | 19 +
core/sql/exp/ExpHbaseInterface.h | 3 +-
core/sql/export/NAStringDef.cpp | 14 +
core/sql/export/NAStringDef.h | 8 +-
core/sql/langman/LmJavaOptions.cpp | 11 +
core/sql/langman/LmJavaOptions.h | 3 +
core/sql/lib_mgmt/Makefile | 4 -
core/sql/lib_mgmt/README.rst | 36 +-
core/sql/lib_mgmt/pom.xml | 27 +-
.../java/org/trafodion/libmgmt/FileMgmt.java | 487 ++--
.../java/org/trafodion/libmgmt/SyncLibUDF.java | 171 ++
.../lib_mgmt/src/main/resources/init_libmgmt.sh | 206 --
core/sql/optimizer/BindRelExpr.cpp | 7 -
core/sql/optimizer/HDFSHook.cpp | 58 +-
core/sql/optimizer/HDFSHook.h | 78 +-
core/sql/optimizer/NAClusterInfo.cpp | 265 +-
core/sql/optimizer/NAClusterInfo.h | 12 +-
core/sql/optimizer/NodeMap.cpp | 12 +-
core/sql/optimizer/ObjectNames.cpp | 17 +
core/sql/optimizer/ObjectNames.h | 3 +
core/sql/optimizer/OptPhysRelExpr.cpp | 16 +-
core/sql/optimizer/OptimizerSimulator.cpp | 2322 +++++++++++++-----
core/sql/optimizer/OptimizerSimulator.h | 257 +-
core/sql/optimizer/RelExeUtil.cpp | 1 -
core/sql/optimizer/RelExpr.cpp | 5 -
core/sql/optimizer/RelMisc.h | 9 -
core/sql/optimizer/ScanOptimizer.cpp | 22 +-
core/sql/optimizer/ScmCostMethod.cpp | 2 +-
core/sql/regress/compGeneral/EXPECTED023 | 51 +-
core/sql/regress/compGeneral/FILTER023 | 10 +-
core/sql/regress/privs1/EXPECTED125 | 1333 ++++++++++
core/sql/regress/privs1/TEST125 | 243 ++
core/sql/regress/privs1/TestHive.java | 91 +
core/sql/regress/privs1/Utils.java | 279 +++
core/sql/regress/privs2/EXPECTED144 | Bin 59453 -> 59453 bytes
core/sql/regress/udr/EXPECTED001 | 43 +-
core/sql/regress/udr/EXPECTED002 | 6 +-
core/sql/regress/udr/EXPECTED102 | 49 +-
core/sql/regress/udr/TEST001 | 18 +-
core/sql/regress/udr/TEST002 | 6 +-
core/sql/regress/udr/TEST102 | 27 +-
core/sql/sort/scratchfile_sq.cpp | 1 -
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 4 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 11 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.h | 77 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 25 +-
core/sql/sqlcomp/DefaultConstants.h | 3 +
core/sql/sqlcomp/PrivMgr.cpp | 6 +-
core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp | 7 +
core/sql/sqlcomp/nadefaults.cpp | 23 +-
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 42 +-
.../java/org/trafodion/sql/HBaseClient.java | 29 +-
.../main/java/org/trafodion/sql/HiveClient.java | 2 +-
.../java/org/trafodion/sql/OrcFileReader.java | 25 +-
.../org/trafodion/sql/SequenceFileReader.java | 23 +-
.../org/trafodion/sql/SequenceFileWriter.java | 3 +-
.../org/trafodion/sql/TrafConfiguration.java | 61 +-
.../java/org/trafodion/sql/TrafRegionStats.java | 12 +-
core/sql/udrserv/UdrCfgParser.cpp | 4 +-
core/sql/udrserv/udrglobals.cpp | 85 +-
core/sql/udrserv/udrserv.cpp | 37 +-
core/sql/ustat/hs_globals.cpp | 55 +-
core/sql/ustat/hs_globals.h | 7 +-
core/trafodion.spec | 4 +-
.../src/asciidoc/_chapters/ambari_install.adoc | 29 +-
.../src/asciidoc/_chapters/introduction.adoc | 7 -
.../src/asciidoc/_chapters/requirements.adoc | 18 -
.../_chapters/sql_language_elements.adoc | 65 +-
.../src/asciidoc/_chapters/sql_utilities.adoc | 47 +-
install/Makefile | 19 +-
install/README.md | 7 +-
install/ambari-installer/mpack.json | 3 +
.../TRAFODION/2.1/configuration/dcs-env.xml | 1 +
.../TRAFODION/2.1/package/scripts/params.py | 1 +
.../2.1/package/scripts/trafodionmaster.py | 2 +-
install/installer/acceptKeys | 61 -
install/installer/addNode_packages | 89 -
install/installer/addNode_reservePorts | 81 -
install/installer/addNode_step1 | 273 --
install/installer/addNode_step2 | 429 ----
install/installer/bashrc_default | 87 -
install/installer/checkHBase | 37 -
install/installer/checkJava.py | 66 -
install/installer/cloud_cli_setup | 89 -
install/installer/dcs_installer | 219 --
install/installer/getNodes.py | 47 -
install/installer/parseHBaseSite.py | 61 -
install/installer/rest_installer | 115 -
install/installer/setup_known_hosts.exp | 35 -
install/installer/setup_ssh_key | 27 -
install/installer/sqconfig_persist.txt | 87 -
install/installer/tools/ambari_setup | 119 -
install/installer/tools/clouderaMoveDB.sh | 191 --
install/installer/tools/cloudera_setup | 198 --
install/installer/tools/cloudera_uninstall | 155 --
install/installer/tools/hortonworks_uninstall | 154 --
install/installer/tools/mapr_uninstall | 131 -
install/installer/tools/traf_cloudera_uninstall | 148 --
.../tools/traf_cloudera_uninstall_suse | 149 --
.../installer/tools/traf_hortonworks_uninstall | 233 --
.../tools/traf_hortonworks_uninstall_suse | 232 --
install/installer/tools/traf_mapr_uninstall | 49 -
install/installer/tools/trafodion_scanner | 525 ----
install/installer/tools/trafodion_scanner.cfg | 194 --
install/installer/traf_add_kerberos | 204 --
install/installer/traf_add_ldap | 98 -
install/installer/traf_add_sudoAccess | 85 -
install/installer/traf_add_user | 217 --
install/installer/traf_apache_mods | 259 --
.../installer/traf_authentication_conf_default | 71 -
install/installer/traf_cloudera_mods | 428 ----
install/installer/traf_config | 207 --
install/installer/traf_config_check | 1158 ---------
install/installer/traf_config_setup | 816 ------
install/installer/traf_createPasswordLessSSH | 63 -
install/installer/traf_getHadoopNodes | 252 --
install/installer/traf_getMultiHadoopNodes | 145 --
install/installer/traf_hortonworks_mods | 625 -----
install/installer/traf_package_setup | 202 --
install/installer/traf_secure | 60 -
install/installer/traf_secure_setup | 345 ---
install/installer/traf_setup | 134 -
install/installer/traf_sqconfig | 84 -
install/installer/traf_sqgen | 75 -
install/installer/traf_start | 75 -
install/installer/traf_user_prompt | 28 -
install/installer/traf_user_prompt_check | 27 -
install/installer/trafodion_config_default | 191 --
install/installer/trafodion_install | 833 -------
install/installer/trafodion_license | 205 --
install/installer/trafodion_secure_install | 129 -
install/installer/trafodion_uninstaller | 154 --
.../python-installer/scripts/traf_sqconfig.py | 8 +
.../Install/win64_installer/installer.iss | 8 +-
.../odbcclient/DSNConverter/DSNConverter.def | 2 +-
win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc | 10 +-
.../TranslationDll/TranslationDll.def | 2 +-
.../odbcclient/TranslationDll/TranslationDll.rc | 10 +-
win-odbc64/odbcclient/build_os.bat | 4 +-
win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC | 10 +-
win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC | 10 +-
win-odbc64/odbcclient/drvr35/cdatasource.cpp | 38 +-
win-odbc64/odbcclient/drvr35/drvr35.rc | 10 +-
win-odbc64/odbcclient/drvr35adm/drvr35adm.h | 42 +-
win-odbc64/odbcclient/drvr35adm/drvr35adm.rc | 10 +-
win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc | 10 +-
win-odbc64/odbcclient/update_version.pl | 1 +
186 files changed, 5879 insertions(+), 13766 deletions(-)
----------------------------------------------------------------------