You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/12/06 14:50:43 UTC

[09/13] incubator-trafodion git commit: Merge pull request #1 from apache/master

Merge pull request #1 from apache/master

update from apache

Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2b3d98b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2b3d98b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2b3d98b2

Branch: refs/heads/master
Commit: 2b3d98b22fff6e2886d4b836cc8eea1406ab69fb
Parents: 575490c 7098095
Author: andyyangcn <yy...@sohu.com>
Authored: Thu Nov 24 17:59:59 2016 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Nov 24 17:59:59 2016 +0800

----------------------------------------------------------------------
 .../jdbcT4/src/main/java/T4Messages.properties  |  18 +
 .../trafodion/jdbc/t4/ExtractLobMessage.java    |  59 ++
 .../org/trafodion/jdbc/t4/ExtractLobReply.java  |  58 ++
 .../java/org/trafodion/jdbc/t4/TRANSPORT.java   |   3 +
 .../java/org/trafodion/jdbc/t4/TrafT4Blob.java  | 182 +++++
 .../java/org/trafodion/jdbc/t4/TrafT4Clob.java  | 202 +++++
 .../org/trafodion/jdbc/t4/TrafT4ResultSet.java  |  91 ++-
 .../jdbc/t4/odbc_SQLSvc_ExtractLob_exc_.java    |  78 ++
 core/conn/odb/src/odb.c                         |  12 +-
 core/conn/odbc/src/odbc/Common/TransportBase.h  |   1 +
 .../src/odbc/Krypton/generated_incs/odbc_sv.h   |  26 +
 .../nsksrvr/Interface/marshalingsrvr_srvr.cpp   | 102 +++
 .../nsksrvr/Interface/marshalingsrvr_srvr.h     |  10 +-
 .../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp   |  45 ++
 .../odbc/nsksrvr/Interface/odbcs_srvr_res.cpp   |  39 +
 .../src/odbc/nsksrvr/Interface/odbcs_srvr_res.h |   9 +-
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp |  29 +-
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h   |   8 +
 .../conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h |  10 +
 .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp    | 129 +++
 .../export/include/common/evl_sqlog_eventnum.h  |   1 +
 core/sqf/monitor/linux/cluster.cxx              |  52 +-
 core/sqf/monitor/linux/zclient.cxx              |  32 +-
 core/sqf/monitor/linux/zclient.h                |   3 +-
 .../transactional/TransactionalTable.java       |   8 +-
 .../transactional/TrxTransactionState.java.tmpl |  13 +-
 core/sqf/src/tm/tmddlrequests.cpp               |   8 +-
 core/sql/cli/Statement.cpp                      |   2 +-
 core/sql/comexe/ComTdbExeUtil.cpp               |  26 +-
 core/sql/comexe/ComTdbExeUtil.h                 | 112 ++-
 core/sql/comexe/ComTdbSort.h                    |   4 +-
 core/sql/common/ComSmallDefs.h                  |   8 +
 core/sql/common/NAType.cpp                      | 201 +++++
 core/sql/common/NAType.h                        |   2 +
 core/sql/executor/ExExeUtil.h                   |   8 +-
 core/sql/executor/ExExeUtilGet.cpp              | 365 ++++-----
 core/sql/executor/ExExeUtilLoad.cpp             |  46 +-
 core/sql/executor/ExExeUtilMisc.cpp             |   6 +-
 core/sql/executor/ExFastTransport.cpp           |   6 +-
 core/sql/executor/ExHbaseAccess.cpp             |  30 +
 core/sql/executor/ExHbaseAccess.h               |   1 +
 core/sql/executor/ExHbaseIUD.cpp                |   4 +-
 core/sql/executor/ExHdfsScan.cpp                |  24 +-
 core/sql/executor/ExHdfsScan.h                  |   1 +
 core/sql/executor/HBaseClient_JNI.cpp           | 795 +++++++------------
 core/sql/executor/HBaseClient_JNI.h             |  12 +
 core/sql/executor/JavaObjectInterface.cpp       |  14 +
 core/sql/executor/JavaObjectInterface.h         |   4 +-
 core/sql/executor/SequenceFileReader.cpp        | 127 ---
 core/sql/executor/SequenceFileReader.h          |  12 -
 core/sql/executor/ex_sort.cpp                   | 222 ++++--
 core/sql/executor/ex_sort.h                     | 130 ++-
 core/sql/executor/hiveHook.cpp                  | 168 +++-
 core/sql/exp/ExpHbaseDefs.h                     |   6 +
 core/sql/exp/ExpHbaseInterface.cpp              |  45 ++
 core/sql/exp/ExpHbaseInterface.h                |  12 +-
 core/sql/exp/ExpLOB.cpp                         |  22 +-
 core/sql/exp/ExpLOBaccess.cpp                   |  38 +-
 core/sql/exp/ExpLOBaccess.h                     |  11 +-
 core/sql/exp/ExpLOBinterface.cpp                |   5 +-
 core/sql/exp/ExpLOBinterface.h                  |   2 +-
 core/sql/exp/ExpPackDefs.cpp                    |   5 +
 core/sql/exp/ExpSqlTupp.h                       |   7 +-
 core/sql/exp/exp_clause.cpp                     |   6 +
 core/sql/exp/exp_clause.h                       |   3 +-
 core/sql/exp/exp_function.cpp                   | 122 +++
 core/sql/exp/exp_function.h                     |  29 +
 core/sql/generator/GenItemFunc.cpp              |   9 +
 core/sql/generator/GenRelExeUtil.cpp            |  77 +-
 core/sql/generator/GenRelMisc.cpp               |   2 +-
 core/sql/optimizer/BindItemExpr.cpp             |   1 +
 core/sql/optimizer/BindRelExpr.cpp              | 402 +++++++++-
 core/sql/optimizer/BindWA.cpp                   |   1 +
 core/sql/optimizer/BindWA.h                     |   5 +-
 core/sql/optimizer/HDFSHook.cpp                 |   8 +-
 core/sql/optimizer/ImplRule.cpp                 |   2 +-
 core/sql/optimizer/Inlining.cpp                 |  74 +-
 core/sql/optimizer/ItemExpr.cpp                 |   5 +-
 core/sql/optimizer/ItemFunc.h                   |   2 +
 core/sql/optimizer/NATable.cpp                  | 186 +----
 core/sql/optimizer/NormRelExpr.cpp              |   3 +
 core/sql/optimizer/OptPhysRelExpr.cpp           |  31 +-
 core/sql/optimizer/RelCache.cpp                 |  10 +
 core/sql/optimizer/RelExpr.cpp                  |   2 +
 core/sql/optimizer/RelExpr.h                    |   6 +-
 core/sql/optimizer/RelGrby.h                    |  13 +-
 core/sql/optimizer/RelRoutine.cpp               |   9 +-
 core/sql/optimizer/RelRoutine.h                 |  14 +-
 core/sql/optimizer/RelSequence.cpp              |  10 +-
 core/sql/optimizer/RelUpdate.h                  |   5 +-
 core/sql/optimizer/SynthType.cpp                |  24 +
 core/sql/optimizer/hiveHook.h                   | 116 +--
 core/sql/parser/ParKeyWords.cpp                 |   1 +
 core/sql/parser/sqlparser.y                     |  24 +-
 core/sql/regress/compGeneral/EXPECTED006.SB     | 104 +++
 core/sql/regress/compGeneral/TEST006            |  34 +
 core/sql/regress/executor/EXPECTED002.SB        | 109 ++-
 core/sql/regress/executor/EXPECTED015.SB        | 108 +++
 core/sql/regress/executor/TEST002               |  38 +-
 core/sql/regress/executor/TEST015               |  25 +
 core/sql/regress/seabase/EXPECTED002            | 266 +++++--
 core/sql/regress/seabase/EXPECTED012            |  52 +-
 core/sql/regress/seabase/TEST002                |  28 +
 core/sql/regress/seabase/TEST012                |  11 +
 core/sql/sort/SortTopN.cpp                      |   7 +-
 core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp         |  19 +-
 core/sql/sqlcomp/DefaultConstants.h             |   4 +
 core/sql/sqlcomp/nadefaults.cpp                 |   1 +
 core/sql/sqludr/sqludr.cpp                      |  22 +
 core/sql/sqludr/sqludr.h                        |   1 +
 .../java/org/trafodion/sql/HBaseClient.java     |  40 +
 .../java/org/trafodion/sql/HBulkLoadClient.java |   2 -
 .../org/trafodion/sql/SequenceFileWriter.java   |  70 +-
 core/sql/ustat/hs_cli.cpp                       | 361 +++++----
 core/sql/ustat/hs_cli.h                         |  67 +-
 core/sql/ustat/hs_globals.cpp                   | 222 +++---
 core/sql/ustat/hs_globals.h                     |  18 +-
 core/sql/ustat/hs_log.h                         |  15 +-
 core/sql/ustat/hs_read.cpp                      |   4 +-
 core/sql/ustat/hs_update.cpp                    |   1 +
 core/sql/ustat/hs_util.h                        |   3 +-
 .../java/org/trafodion/jdbc_test/TestClob.java  |  95 +++
 install/installer/traf_start                    |  13 +-
 123 files changed, 4787 insertions(+), 1866 deletions(-)
----------------------------------------------------------------------