trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [4/8] incubator-trafodion git commit: Merge branch 'master' of git://git.apache.org/incubator-trafodion into trafodion-2351
Date Mon, 19 Dec 2016 23:19:01 GMT
Merge branch 'master' of git://git.apache.org/incubator-trafodion into trafodion-2351

Conflicts:
	core/sql/executor/ExExeUtilLoad.cpp
	core/sql/src/main/java/org/trafodion/sql/HBaseClient.java


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

Branch: refs/heads/master
Commit: 76cb8b4bf3f4f99acdeebb4f01c722af4079f1ff
Parents: 1c35622 515ff4c
Author: selvaganesang <selva.govindarajan@esgyn.com>
Authored: Thu Dec 8 21:32:53 2016 +0000
Committer: selvaganesang <selva.govindarajan@esgyn.com>
Committed: Thu Dec 8 21:32:53 2016 +0000

----------------------------------------------------------------------
 .rat-excludes                                   |    3 +-
 core/Makefile                                   |    6 +-
 core/conn/jdbcT4/pom.xml                        |   79 +-
 .../trafodion/jdbc/t4/InterfaceUtilities.java   |    3 +-
 core/conn/odbc/src/odbc/Common/QSData.cpp       |   17 +
 core/conn/odbc/src/odbc/Common/QSData.h         |   33 +
 core/conn/odbc/src/odbc/nsksrvrcore/Makefile    |    2 +-
 core/conn/trafci/.gitignore                     |    6 +
 core/conn/trafci/Makefile                       |   37 +
 core/conn/trafci/install/Installer.java         | 3389 --------------
 core/conn/trafci/install/Installer.java-tmpl    | 3389 ++++++++++++++
 core/conn/trafci/installer_pom.xml              |  106 +
 core/conn/trafci/pom.xml                        |  114 +
 .../org/trafodion/ci/AWTExceptionHandler.java   |   36 +
 .../main/java/org/trafodion/ci/CSVDisplay.java  |   90 +
 .../src/main/java/org/trafodion/ci/Column.java  |  131 +
 .../java/org/trafodion/ci/ConditionalQuery.java |  435 ++
 .../trafodion/ci/ConditionalQueryException.java |   43 +
 .../trafodion/ci/ConditionalSyntaxError.java    |  123 +
 .../java/org/trafodion/ci/ConsoleReader.java    |  218 +
 .../java/org/trafodion/ci/ConsoleWriter.java    |  130 +
 .../java/org/trafodion/ci/DatabaseQuery.java    | 1804 ++++++++
 .../src/main/java/org/trafodion/ci/Display.java |   68 +
 .../trafodion/ci/DuplicateParamException.java   |   40 +
 .../main/java/org/trafodion/ci/ErrorObject.java |  103 +
 .../src/main/java/org/trafodion/ci/FCQuery.java |  334 ++
 .../main/java/org/trafodion/ci/FileReader.java  |  176 +
 .../main/java/org/trafodion/ci/FileWriter.java  |   80 +
 .../main/java/org/trafodion/ci/HTMLDisplay.java |   80 +
 .../main/java/org/trafodion/ci/HTMLObject.java  |  628 +++
 .../main/java/org/trafodion/ci/HelpIndexer.java |  134 +
 .../src/main/java/org/trafodion/ci/Helper.java  |  225 +
 .../main/java/org/trafodion/ci/HostQuery.java   |  289 ++
 .../main/java/org/trafodion/ci/IDisplay.java    |   28 +
 .../main/java/org/trafodion/ci/IndexStruct.java |   55 +
 .../java/org/trafodion/ci/InterfaceQuery.java   | 4378 ++++++++++++++++++
 .../trafodion/ci/InterfaceQueryException.java   |   35 +
 .../org/trafodion/ci/InterfaceSyntaxError.java  |   83 +
 .../trafodion/ci/InvalidNumberOfArguments.java  |   35 +
 .../main/java/org/trafodion/ci/JDBCVproc.java   |   38 +
 .../java/org/trafodion/ci/LFProperties.java     |  130 +
 .../java/org/trafodion/ci/MaskingThread.java    |   73 +
 .../java/org/trafodion/ci/MultiByteUtils.java   |   56 +
 .../org/trafodion/ci/NullKeyWordException.java  |   35 +
 .../org/trafodion/ci/OutputColumnAttribute.java |   47 +
 .../java/org/trafodion/ci/OutputContents.java   |  144 +
 .../main/java/org/trafodion/ci/ParallelRun.java | 1320 ++++++
 .../org/trafodion/ci/ParamStringObject.java     |  256 +
 .../java/org/trafodion/ci/ParseArguments.java   |  660 +++
 .../src/main/java/org/trafodion/ci/Parser.java  | 1195 +++++
 .../ci/ParserMissingParamException.java         |   42 +
 .../trafciDefaultLookAndFeel.properties         |   60 +
 .../main/java/org/trafodion/ci/PrunSummary.java |  119 +
 .../org/trafodion/ci/PrunUserInterruption.java  |   34 +
 .../java/org/trafodion/ci/PythonInterface.java  |  180 +
 .../src/main/java/org/trafodion/ci/Query.java   |  188 +
 .../main/java/org/trafodion/ci/QueryUtils.java  |   37 +
 .../java/org/trafodion/ci/QueryWrapper.java     |  700 +++
 .../main/java/org/trafodion/ci/RawDisplay.java  |  189 +
 .../src/main/java/org/trafodion/ci/Reader.java  |  286 ++
 .../java/org/trafodion/ci/RepObjInterface.java  |   27 +
 .../java/org/trafodion/ci/ReplacementObj.java   |   39 +
 .../org/trafodion/ci/ScriptSectionNotFound.java |   34 +
 .../java/org/trafodion/ci/ScriptsInterface.java |  153 +
 .../src/main/java/org/trafodion/ci/Session.java | 1908 ++++++++
 .../java/org/trafodion/ci/SessionDefaults.java  |  342 ++
 .../java/org/trafodion/ci/SessionError.java     |  181 +
 .../java/org/trafodion/ci/SessionInterface.java | 1487 ++++++
 .../org/trafodion/ci/SessionTimeoutTask.java    |   93 +
 .../src/main/java/org/trafodion/ci/SqlEnum.java |   83 +
 .../java/org/trafodion/ci/StatusThread.java     |  100 +
 .../org/trafodion/ci/TerminalProcessBridge.java |  246 +
 .../trafodion/ci/UnKnownInterfaceCommand.java   |   34 +
 .../java/org/trafodion/ci/UserInterface.java    |  421 ++
 .../java/org/trafodion/ci/UserInterruption.java |   36 +
 .../src/main/java/org/trafodion/ci/Utils.java   |  381 ++
 .../java/org/trafodion/ci/ValidateQuery.java    |  412 ++
 .../org/trafodion/ci/ValidationException.java   |   39 +
 .../main/java/org/trafodion/ci/Vproc.java-tmpl  |   36 +
 .../main/java/org/trafodion/ci/WCIUtils.java    |  122 +
 .../src/main/java/org/trafodion/ci/Writer.java  |  418 ++
 .../main/java/org/trafodion/ci/XMLDisplay.java  |   75 +
 .../main/java/org/trafodion/ci/XMLObject.java   |  607 +++
 .../org/trafodion/ci/help/common_common.help    |  457 ++
 .../java/org/trafodion/ci/help/help_file.idx    |   30 +
 .../java/org/trafodion/ci/help/sql_common.help  |  376 ++
 .../org/trafodion/ci/pwdencrypt/ArgMap.java     |   61 +
 .../org/trafodion/ci/pwdencrypt/ArgsDef.java    |   74 +
 .../trafodion/ci/pwdencrypt/EncryptUtil.java    |  249 +
 .../java/org/trafodion/ci/pwdencrypt/JCE.java   |  414 ++
 .../trafodion/ci/pwdencrypt/PasswordOpts.java   |  292 ++
 .../org/trafodion/ci/pwdencrypt/RefLookup.java  |  127 +
 .../org/trafodion/ci/pwdencrypt/WorkTypes.java  |   55 +
 .../trafci/src/main/resources/install_jar.xml   |   71 +
 .../trafci/src/main/resources/install_tar.xml   |   51 +
 .../trafci/src/main/resources/trafci.properties |    5 +
 .../org/trafodion/ci/AWTExceptionHandler.java   |   36 -
 .../trafci/src/org/trafodion/ci/CSVDisplay.java |   90 -
 .../trafci/src/org/trafodion/ci/Column.java     |  131 -
 .../src/org/trafodion/ci/ConditionalQuery.java  |  435 --
 .../trafodion/ci/ConditionalQueryException.java |   43 -
 .../trafodion/ci/ConditionalSyntaxError.java    |  123 -
 .../src/org/trafodion/ci/ConsoleReader.java     |  218 -
 .../src/org/trafodion/ci/ConsoleWriter.java     |  130 -
 .../src/org/trafodion/ci/DatabaseQuery.java     | 1804 --------
 .../trafci/src/org/trafodion/ci/Display.java    |   68 -
 .../trafodion/ci/DuplicateParamException.java   |   40 -
 .../src/org/trafodion/ci/ErrorObject.java       |  103 -
 .../trafci/src/org/trafodion/ci/FCQuery.java    |  334 --
 .../trafci/src/org/trafodion/ci/FileReader.java |  176 -
 .../trafci/src/org/trafodion/ci/FileWriter.java |   80 -
 .../src/org/trafodion/ci/HTMLDisplay.java       |   80 -
 .../trafci/src/org/trafodion/ci/HTMLObject.java |  628 ---
 .../src/org/trafodion/ci/HelpIndexer.java       |  134 -
 .../trafci/src/org/trafodion/ci/Helper.java     |  225 -
 .../trafci/src/org/trafodion/ci/HostQuery.java  |  289 --
 .../trafci/src/org/trafodion/ci/IDisplay.java   |   28 -
 .../src/org/trafodion/ci/IndexStruct.java       |   55 -
 .../src/org/trafodion/ci/InterfaceQuery.java    | 4378 ------------------
 .../trafodion/ci/InterfaceQueryException.java   |   35 -
 .../org/trafodion/ci/InterfaceSyntaxError.java  |   83 -
 .../trafodion/ci/InvalidNumberOfArguments.java  |   35 -
 .../trafci/src/org/trafodion/ci/JDBCVproc.java  |   38 -
 .../src/org/trafodion/ci/LFProperties.java      |  130 -
 .../src/org/trafodion/ci/MaskingThread.java     |   73 -
 .../src/org/trafodion/ci/MultiByteUtils.java    |   56 -
 .../org/trafodion/ci/NullKeyWordException.java  |   35 -
 .../org/trafodion/ci/OutputColumnAttribute.java |   47 -
 .../src/org/trafodion/ci/OutputContents.java    |  144 -
 .../src/org/trafodion/ci/ParallelRun.java       | 1320 ------
 .../src/org/trafodion/ci/ParamStringObject.java |  256 -
 .../src/org/trafodion/ci/ParseArguments.java    |  660 ---
 .../trafci/src/org/trafodion/ci/Parser.java     | 1195 -----
 .../ci/ParserMissingParamException.java         |   42 -
 .../trafciDefaultLookAndFeel.properties         |   60 -
 .../src/org/trafodion/ci/PrunSummary.java       |  119 -
 .../org/trafodion/ci/PrunUserInterruption.java  |   34 -
 .../src/org/trafodion/ci/PythonInterface.java   |  180 -
 .../conn/trafci/src/org/trafodion/ci/Query.java |  188 -
 .../trafci/src/org/trafodion/ci/QueryUtils.java |   37 -
 .../src/org/trafodion/ci/QueryWrapper.java      |  700 ---
 .../trafci/src/org/trafodion/ci/RawDisplay.java |  189 -
 .../trafci/src/org/trafodion/ci/Reader.java     |  286 --
 .../src/org/trafodion/ci/RepObjInterface.java   |   27 -
 .../src/org/trafodion/ci/ReplacementObj.java    |   39 -
 .../org/trafodion/ci/ScriptSectionNotFound.java |   34 -
 .../src/org/trafodion/ci/ScriptsInterface.java  |  153 -
 .../trafci/src/org/trafodion/ci/Session.java    | 1908 --------
 .../src/org/trafodion/ci/SessionDefaults.java   |  342 --
 .../src/org/trafodion/ci/SessionError.java      |  181 -
 .../src/org/trafodion/ci/SessionInterface.java  | 1487 ------
 .../org/trafodion/ci/SessionTimeoutTask.java    |   93 -
 .../trafci/src/org/trafodion/ci/SqlEnum.java    |   83 -
 .../src/org/trafodion/ci/StatusThread.java      |  100 -
 .../org/trafodion/ci/TerminalProcessBridge.java |  246 -
 .../trafodion/ci/UnKnownInterfaceCommand.java   |   34 -
 .../src/org/trafodion/ci/UserInterface.java     |  421 --
 .../src/org/trafodion/ci/UserInterruption.java  |   36 -
 .../conn/trafci/src/org/trafodion/ci/Utils.java |  381 --
 .../src/org/trafodion/ci/ValidateQuery.java     |  412 --
 .../org/trafodion/ci/ValidationException.java   |   39 -
 .../conn/trafci/src/org/trafodion/ci/Vproc.java |   36 -
 .../trafci/src/org/trafodion/ci/WCIUtils.java   |  122 -
 .../trafci/src/org/trafodion/ci/Writer.java     |  418 --
 .../trafci/src/org/trafodion/ci/XMLDisplay.java |   75 -
 .../trafci/src/org/trafodion/ci/XMLObject.java  |  607 ---
 .../org/trafodion/ci/help/common_common.help    |  457 --
 .../src/org/trafodion/ci/help/help_file.idx     |   30 -
 .../src/org/trafodion/ci/help/sql_common.help   |  376 --
 .../src/org/trafodion/ci/pwdencrypt/ArgMap.java |   61 -
 .../org/trafodion/ci/pwdencrypt/ArgsDef.java    |   74 -
 .../trafodion/ci/pwdencrypt/EncryptUtil.java    |  249 -
 .../src/org/trafodion/ci/pwdencrypt/JCE.java    |  414 --
 .../trafodion/ci/pwdencrypt/PasswordOpts.java   |  292 --
 .../org/trafodion/ci/pwdencrypt/RefLookup.java  |  127 -
 .../org/trafodion/ci/pwdencrypt/WorkTypes.java  |   55 -
 .../org/trafodion/ci/UserInterfaceTest.java     |  116 +
 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 +-
 core/sqf/sql/scripts/analyzeMessageGuide.py     |  656 +++
 core/sqf/src/seatrans/hbase-trx/pp.awk          |  152 +-
 .../hbase/client/transactional/RMInterface.java |   40 +-
 .../sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp |  246 +-
 core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h  |   14 +-
 .../tm/hbasetmlib2/javaobjectinterfacetm.cpp    |  103 +-
 .../tm/hbasetmlib2/javaobjectinterfacetm.h      |   11 +-
 core/sqf/src/tm/macros.gmk                      |    2 +-
 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                    |   36 +-
 core/sql/comexe/ComTdbExeUtil.cpp               |   26 +-
 core/sql/comexe/ComTdbExeUtil.h                 |  112 +-
 core/sql/common/ComJSON.cpp                     | 1175 +++++
 core/sql/common/ComJSON.h                       |  159 +
 core/sql/common/ComJSONFuncs.cpp                |  793 ++++
 core/sql/common/ComJSONStringInfo.cpp           |  297 ++
 core/sql/common/ComJSONStringInfo.h             |  176 +
 core/sql/common/ComSmallDefs.h                  |    8 +
 core/sql/common/NAString.cpp                    |    1 +
 core/sql/common/NAType.cpp                      |  201 +
 core/sql/common/NAType.h                        |    2 +
 core/sql/common/OperTypeEnum.h                  |   10 +-
 core/sql/executor/ExExeUtil.h                   |    7 +-
 core/sql/executor/ExExeUtilGet.cpp              |  365 +-
 core/sql/executor/ExExeUtilLoad.cpp             |    4 +-
 core/sql/executor/hiveHook.cpp                  |  168 +-
 core/sql/exp/ExpErrorEnums.h                    |   16 +
 core/sql/exp/ExpLOBaccess.cpp                   |    2 -
 core/sql/exp/ExpPackDefs.cpp                    |   16 +
 core/sql/exp/exp_clause.cpp                     |   44 +-
 core/sql/exp/exp_clause.h                       |    5 +-
 core/sql/exp/exp_clause_derived.h               |  169 +
 core/sql/exp/exp_function.cpp                   |  309 +-
 core/sql/exp/exp_function.h                     |   57 +-
 core/sql/exp/exp_like.cpp                       |   80 +
 core/sql/exp/exp_math_func.cpp                  |   19 +-
 core/sql/generator/GenItemFunc.cpp              |   49 +-
 core/sql/generator/GenRelExeUtil.cpp            |   77 +-
 core/sql/nskgmake/common/Makefile               |    3 +
 core/sql/optimizer/BindItemExpr.cpp             |   29 +-
 core/sql/optimizer/BindRelExpr.cpp              |   17 +-
 core/sql/optimizer/ImplRule.cpp                 |    2 +-
 core/sql/optimizer/ItemCache.cpp                |    4 +-
 core/sql/optimizer/ItemExpr.cpp                 |   59 +-
 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                |   91 +-
 core/sql/optimizer/hiveHook.h                   |  116 +-
 core/sql/parser/ParKeyWords.cpp                 |    5 +-
 core/sql/parser/sqlparser.y                     |  143 +-
 core/sql/regress/compGeneral/EXPECTED006.SB     |  196 +-
 core/sql/regress/compGeneral/TEST006            |   47 +
 core/sql/regress/executor/EXPECTED002.SB        |   99 +-
 core/sql/regress/executor/TEST002               |   29 +-
 core/sql/regress/privs2/EXPECTED129             |   16 +-
 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/regress/udr/EXPECTED100.SB             |    2 +-
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |   16 +-
 core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp         |   19 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |   60 +-
 .../java/org/trafodion/sql/HBaseClient.java     |    9 +-
 core/sql/ustat/hs_cli.cpp                       |  361 +-
 core/sql/ustat/hs_cli.h                         |   67 +-
 core/sql/ustat/hs_globals.cpp                   |  135 +-
 core/sql/ustat/hs_log.h                         |   15 +-
 core/sql/ustat/hs_read.cpp                      |    4 +-
 core/sql/ustat/hs_util.h                        |    3 +-
 .../org/trafodion/jdbc_test/TestNumeric.java    |  114 +
 dcs/src/test/odbc/README.txt                    |   47 +
 dcs/src/test/odbc/build/Makefile                |   43 +
 dcs/src/test/odbc/build/odbc.vcxproj            |  157 +
 dcs/src/test/odbc/build/odbc.vcxproj.filters    |   40 +
 dcs/src/test/odbc/src/Main.cpp                  |   57 +
 dcs/src/test/odbc/src/common/Global.cpp         |  116 +
 dcs/src/test/odbc/src/common/Global.h           |   60 +
 dcs/src/test/odbc/src/common/TestBase.cpp       |  263 ++
 dcs/src/test/odbc/src/common/TestBase.h         |   55 +
 .../src/test/varchar32k/LargeVarcharCol.cpp     | 2639 +++++++++++
 .../odbc/src/test/varchar32k/LargeVarcharCol.h  |   52 +
 .../src/asciidoc/_chapters/ddl_msgs.adoc        |  263 +-
 .../sql_functions_and_expressions.adoc          |  249 +-
 .../_chapters/sql_language_elements.adoc        |    3 +-
 .../src/asciidoc/_chapters/sql_statements.adoc  |  243 +-
 licenses/lic-server-src                         |   29 +-
 280 files changed, 40129 insertions(+), 29976 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/76cb8b4b/core/sql/executor/ExExeUtilLoad.cpp
----------------------------------------------------------------------
diff --cc core/sql/executor/ExExeUtilLoad.cpp
index 73e0d2f,9f3871d..aea946b
--- a/core/sql/executor/ExExeUtilLoad.cpp
+++ b/core/sql/executor/ExExeUtilLoad.cpp
@@@ -2065,10 -2065,9 +2065,10 @@@ short ExExeUtilHBaseBulkUnLoadTcb::getT
  short ExExeUtilHBaseBulkUnLoadTcb::work()
  {
    Lng32 cliRC = 0;
-   short retcode = 0;
+   Lng32 retcode = 0;
    short rc;
    SFW_RetCode sfwRetCode = SFW_OK;
 +  Lng32 hbcRetCode = HBC_OK;
    // if no parent request, return
    if (qparent_.down->isEmpty())
      return WORK_OK;


Mime
View raw message