You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/05/02 17:24:15 UTC
[5/7] incubator-trafodion git commit: Merge remote branch
'origin/master' into lob_inssel_work
Merge remote branch 'origin/master' into lob_inssel_work
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fe262aa2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fe262aa2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fe262aa2
Branch: refs/heads/master
Commit: fe262aa2ec613c53b26f55ef37afa82349cf30be
Parents: 7e10b5a b36003c
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Fri Apr 28 15:42:32 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Fri Apr 28 15:42:32 2017 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvr/SrvrMain.cpp | 16 +++++-
core/sqf/conf/log4cxx.trafodion.lob.config | 49 -----------------
core/sqf/conf/log4cxx.trafodion.sql.config | 51 ++++++++++++++++++
core/sqf/conf/log4cxx.trafodion.udr.config | 50 -----------------
core/sqf/conf/log4j.hdfs.config | 56 --------------------
core/sqf/conf/log4j.sql.config | 51 ++++++++++++++++++
core/sqf/tools/sqtools.sh | 2 +-
core/sql/bin/SqlciMain.cpp | 5 +-
core/sql/bin/arkcmp.cpp | 12 +----
core/sql/bin/ex_esp_main.cpp | 9 +---
core/sql/cli/CliExtern.cpp | 2 +-
core/sql/executor/HBaseClient_JNI.cpp | 3 +-
core/sql/exp/ExpLOBaccess.cpp | 2 +-
core/sql/exp/ExpLOBprocess.cpp | 8 +--
core/sql/qmscommon/QRLogger.cpp | 53 +++++++++---------
core/sql/qmscommon/QRLogger.h | 2 +
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 1 +
.../java/org/trafodion/sql/HBaseClient.java | 30 +++++++----
.../main/java/org/trafodion/sql/HiveClient.java | 7 ++-
core/sql/udrserv/udrserv.cpp | 8 +--
20 files changed, 184 insertions(+), 233 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fe262aa2/core/sql/exp/ExpLOBaccess.cpp
----------------------------------------------------------------------