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:01:04 UTC
[2/3] incubator-trafodion git commit: Resolve merge conflict in
EXPECTED023
Resolve merge conflict in EXPECTED023
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/dcc32dd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/dcc32dd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/dcc32dd9
Branch: refs/heads/master
Commit: dcc32dd97b703232dce181b1442f8e8665c5d7ca
Parents: f47c261 bfd4de2
Author: Suresh Subbiah <su...@apache.org>
Authored: Mon Jul 3 00:20:24 2017 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Mon Jul 3 00:20:24 2017 +0000
----------------------------------------------------------------------
core/.gitignore | 2 +-
core/Makefile | 2 +-
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/install_local_hadoop | 8 -
core/sqf/sql/scripts/sqgen | 84 +-
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/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/ExpError.cpp | 8 +-
core/sql/exp/ExpError.h | 3 +-
core/sql/exp/ExpHbaseInterface.cpp | 19 +
core/sql/exp/ExpHbaseInterface.h | 3 +-
core/sql/exp/exp_conv.cpp | 6 +-
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/OptPhysRelExpr.cpp | 14 +-
core/sql/optimizer/RelExeUtil.cpp | 1 -
core/sql/optimizer/RelExpr.cpp | 5 -
core/sql/optimizer/RelMisc.h | 9 -
core/sql/regress/compGeneral/FILTER023 | 4 +
core/sql/regress/privs1/EXPECTED125 | 1329 ++++++++++++++++++
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 | 4 +-
core/sql/sqlcomp/PrivMgr.cpp | 6 +-
core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp | 7 +
core/sql/sqlcomp/nadefaults.cpp | 3 +-
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 | 42 +-
core/sql/ustat/hs_globals.h | 2 +-
core/trafodion.spec | 4 +-
.../src/asciidoc/_chapters/ambari_install.adoc | 29 +-
.../src/asciidoc/_chapters/requirements.adoc | 18 -
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 +-
.../python-installer/scripts/traf_sqconfig.py | 8 +
88 files changed, 3484 insertions(+), 1016 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcc32dd9/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcc32dd9/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcc32dd9/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------