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/05/31 18:47:30 UTC

[29/50] [abbrv] incubator-trafodion git commit: Merge remote branch 'origin/master' into TRAFODION-2001

Merge remote branch 'origin/master' into TRAFODION-2001


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

Branch: refs/heads/master
Commit: cd7862cab0ad243cd0e8f485d37376f2c23c3c57
Parents: 79dccc2 833f8a9
Author: Zalo Correa <za...@esgyn.com>
Authored: Wed Nov 30 15:27:48 2016 -0800
Committer: Zalo Correa <za...@esgyn.com>
Committed: Wed Nov 30 15:27:48 2016 -0800

----------------------------------------------------------------------
 core/conn/jdbcT4/pom.xml                        |  79 +-
 core/conn/odbc/src/odbc/nsksrvrcore/Makefile    |   2 +-
 core/dbsecurity/auth/Makefile                   |   1 +
 core/sqf/.gitignore                             |   1 +
 core/sqf/Makefile                               |   4 +-
 core/sqf/build-scripts/build.branch             |   8 +-
 core/sqf/build-scripts/build.id                 |   2 +-
 core/sqf/build-scripts/genverhdr.ksh            |  15 +-
 core/sqf/export/include/dtm/tm.h                |  16 +-
 core/sqf/export/include/dtm/tmtransaction.h     |  13 +-
 .../hbase/client/transactional/RMInterface.java |  40 +-
 .../sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp |  34 +-
 core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h  |  14 +-
 core/sqf/src/tm/tmddlrequests.cpp               | 292 ++++---
 core/sqf/src/tm/tmddlrequests.h                 |   8 +-
 core/sqf/src/tm/tmlib.cpp                       |  26 +-
 core/sqf/src/tm/tmlibmsg.h                      |   3 +
 core/sqf/src/tm/tmrmhbase.cpp                   |  23 +-
 core/sqf/src/tm/tmtransaction.cpp               |  52 +-
 core/sql/bin/SqlciErrors.txt                    |   8 +-
 core/sql/comexe/ComTdbExeUtil.cpp               |  26 +-
 core/sql/comexe/ComTdbExeUtil.h                 | 112 ++-
 core/sql/common/ComSmallDefs.h                  |   8 +
 core/sql/common/NAType.cpp                      | 201 +++++
 core/sql/common/NAType.h                        |   2 +
 core/sql/common/OperTypeEnum.h                  |   8 +-
 core/sql/executor/ExExeUtil.h                   |   8 +-
 core/sql/executor/ExExeUtilGet.cpp              | 365 ++++-----
 core/sql/executor/ExExeUtilLoad.cpp             |  46 +-
 core/sql/executor/ExHbaseAccess.cpp             |  30 +
 core/sql/executor/ExHbaseAccess.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/hiveHook.cpp                  | 168 +++-
 core/sql/exp/ExpHbaseDefs.h                     |   6 +
 core/sql/exp/ExpHbaseInterface.cpp              |  45 ++
 core/sql/exp/ExpHbaseInterface.h                |  12 +-
 core/sql/exp/ExpLOBaccess.cpp                   |   2 -
 core/sql/exp/ExpPackDefs.cpp                    |  10 +
 core/sql/exp/exp_clause.cpp                     |  35 +-
 core/sql/exp/exp_clause.h                       |   4 +-
 core/sql/exp/exp_clause_derived.h               | 169 ++++
 core/sql/exp/exp_function.cpp                   | 204 ++++-
 core/sql/exp/exp_function.h                     |  35 +-
 core/sql/exp/exp_like.cpp                       |  80 ++
 core/sql/generator/GenItemFunc.cpp              |  42 +-
 core/sql/generator/GenRelExeUtil.cpp            |  77 +-
 core/sql/optimizer/BindItemExpr.cpp             |  24 +-
 core/sql/optimizer/BindRelExpr.cpp              |  17 +-
 core/sql/optimizer/ImplRule.cpp                 |   2 +-
 core/sql/optimizer/ItemCache.cpp                |   4 +-
 core/sql/optimizer/ItemExpr.cpp                 |  45 +-
 core/sql/optimizer/ItemFunc.h                   | 104 ++-
 core/sql/optimizer/NATable.cpp                  | 186 +----
 core/sql/optimizer/NormItemExpr.cpp             |   2 +-
 core/sql/optimizer/RelRoutine.cpp               |   9 +-
 core/sql/optimizer/RelRoutine.h                 |  14 +-
 core/sql/optimizer/SynthType.cpp                |  67 +-
 core/sql/optimizer/hiveHook.h                   | 116 +--
 core/sql/parser/ParKeyWords.cpp                 |   2 +
 core/sql/parser/sqlparser.y                     | 123 ++-
 core/sql/regress/compGeneral/EXPECTED006.SB     | 150 ++++
 core/sql/regress/compGeneral/TEST006            |  40 +
 core/sql/regress/executor/EXPECTED002.SB        |  99 ++-
 core/sql/regress/executor/TEST002               |  29 +-
 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/sqlcomp/CmpDDLCatErrorCodes.h          |   4 +-
 core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp         |  19 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |  60 +-
 .../java/org/trafodion/sql/HBaseClient.java     |  40 +
 .../java/org/trafodion/sql/HBulkLoadClient.java |   2 -
 .../org/trafodion/sql/SequenceFileWriter.java   |  70 +-
 core/sql/ustat/hs_globals.cpp                   |  14 +
 core/sql/ustat/hs_util.h                        |   3 +-
 .../src/asciidoc/_chapters/ddl_msgs.adoc        |  84 +-
 .../sql_functions_and_expressions.adoc          | 249 +++++-
 .../_chapters/sql_language_elements.adoc        |   3 +-
 .../src/asciidoc/_chapters/sql_statements.adoc  | 243 +++---
 85 files changed, 3697 insertions(+), 1785 deletions(-)
----------------------------------------------------------------------