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 2015/10/06 21:26:36 UTC
[29/31] incubator-trafodion git commit: Merge remote branch
'origin/master'
Merge remote branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/09f19da1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/09f19da1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/09f19da1
Branch: refs/heads/master
Commit: 09f19da1f648e3595dcac65b7e1e74fadf9b96ac
Parents: 69f1887 deb0130
Author: Sandhya Sundaresan <sa...@esgyn.com>
Authored: Fri Oct 2 18:50:59 2015 +0000
Committer: Sandhya Sundaresan <sa...@esgyn.com>
Committed: Fri Oct 2 18:50:59 2015 +0000
----------------------------------------------------------------------
.gitignore | 1 +
Makefile | 30 +
core/Makefile | 47 +-
core/conn/Makefile | 6 +-
.../unixcli/package/trafodbclnx_install.sh | 5 -
core/macros.gmk | 1 +
core/rest/Makefile | 6 +-
core/rest/genvers | 22 +-
core/rest/src/saveVersion.sh | 11 +-
core/sqf/Makefile | 21 +-
core/sqf/sqenvcom.sh | 2 +-
core/sqf/sql/scripts/dcscheck | 108 +-
core/sqf/sql/scripts/install_local_hadoop | 273 +--
core/sqf/sql/scripts/install_traf_components | 401 +++++
core/sqf/sql/scripts/sqcheck | 2 +-
core/sqf/sql/scripts/sqconfig | 24 -
core/sqf/src/seatrans/hbase-trx/Makefile | 2 +-
core/sql/cli/Cli.cpp | 5 +-
core/sql/cli/Cli.h | 3 +-
core/sql/cli/CliExtern.cpp | 5 +-
core/sql/cli/memorymonitor.cpp | 46 +-
core/sql/comexe/ComTdbExeUtil.h | 8 +-
core/sql/common/ComMisc.cpp | 58 +
core/sql/common/ComMisc.h | 5 +
core/sql/executor/ByteArrayList.java | 54 -
core/sql/executor/ExExeUtil.h | 4 +-
core/sql/executor/ExExeUtilGet.cpp | 7 +-
core/sql/executor/ExExeUtilLoad.cpp | 134 +-
core/sql/executor/HBaseClient.java | 1596 ------------------
core/sql/executor/HBaseClient_JNI.cpp | 30 +-
core/sql/executor/HBaseClient_JNI.h | 2 +-
core/sql/executor/HBulkLoadClient.java | 533 ------
core/sql/executor/HTableClient.h | 65 -
core/sql/executor/HTableClient.java | 1334 ---------------
core/sql/executor/HiveClient.java | 301 ----
core/sql/executor/OrcFileReader.cpp | 4 +-
core/sql/executor/OrcFileReader.java | 518 ------
core/sql/executor/ResultIterator.java | 133 --
core/sql/executor/ResultKeyValueList.java | 100 --
core/sql/executor/RowToInsert.java | 44 -
core/sql/executor/RowsToInsert.java | 57 -
core/sql/executor/SequenceFileReader.cpp | 4 +-
core/sql/executor/SequenceFileReader.java | 448 -----
core/sql/executor/SequenceFileWriter.java | 467 -----
core/sql/executor/StringArrayList.java | 47 -
.../executor/org_trafodion_sql_HTableClient.h | 43 +
core/sql/exp/ExpLOB.cpp | 42 +-
core/sql/exp/ExpLOB.h | 13 +-
core/sql/exp/ExpLOBaccess.cpp | 1235 ++++++++------
core/sql/exp/ExpLOBaccess.h | 51 +-
core/sql/exp/ExpLOBenums.h | 9 +
core/sql/exp/ExpLOBexternal.h | 3 +-
core/sql/exp/ExpLOBinterface.cpp | 42 +-
core/sql/exp/ExpLOBinterface.h | 25 +-
core/sql/export/NABasicObject.h | 2 +-
core/sql/generator/GenItemFunc.cpp | 2 +
core/sql/generator/GenRelExeUtil.cpp | 6 +-
core/sql/nskgmake/Makerules.build | 13 -
core/sql/nskgmake/Makerules.linux | 13 -
core/sql/nskgmake/Makerules.mk | 73 +-
core/sql/nskgmake/executor/Makefile | 54 -
core/sql/nskgmake/ustat/Makefile | 13 -
core/sql/optimizer/BindRelExpr.cpp | 18 +-
core/sql/optimizer/ItemFunc.h | 11 +-
core/sql/optimizer/NATable.cpp | 6 +-
core/sql/optimizer/NodeMap.cpp | 129 ++
core/sql/optimizer/NodeMap.h | 1 +
core/sql/optimizer/OptPhysRelExpr.cpp | 1 +
core/sql/optimizer/RelExeUtil.h | 4 +-
core/sql/parser/sqlparser.y | 41 +-
core/sql/pom.xml | 49 +
core/sql/qmscommon/QRLogger.cpp | 18 +-
core/sql/regress/compGeneral/EXPECTED042 | 100 +-
core/sql/regress/executor/EXPECTED130 | 433 ++++-
core/sql/regress/executor/TEST130 | 314 +++-
core/sql/regress/executor/anoush.jpg | Bin 0 -> 230150 bytes
core/sql/regress/executor/deep.jpg | Bin 0 -> 159018 bytes
core/sql/regress/executor/lob_input_a1.txt | 1 +
core/sql/regress/executor/lob_input_b1.txt | 1 +
core/sql/regress/executor/lob_input_c1.txt | 1 +
core/sql/regress/executor/lob_input_d1.txt | 4 +
core/sql/regress/executor/lob_input_e1.txt | 4 +
core/sql/regress/hive/EXPECTED009 | 54 +-
core/sql/regress/hive/EXPECTED015 | 90 +-
core/sql/regress/hive/TEST009 | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 12 +-
core/sql/sqlcomp/DefaultConstants.h | 5 +-
core/sql/sqlcomp/nadefaults.cpp | 18 +-
.../java/org/trafodion/sql/ByteArrayList.java | 54 +
.../java/org/trafodion/sql/HBaseClient.java | 1596 ++++++++++++++++++
.../java/org/trafodion/sql/HBulkLoadClient.java | 533 ++++++
.../java/org/trafodion/sql/HTableClient.java | 1337 +++++++++++++++
.../main/java/org/trafodion/sql/HiveClient.java | 301 ++++
.../java/org/trafodion/sql/OrcFileReader.java | 500 ++++++
.../java/org/trafodion/sql/ResultIterator.java | 133 ++
.../org/trafodion/sql/ResultKeyValueList.java | 100 ++
.../java/org/trafodion/sql/RowToInsert.java | 44 +
.../java/org/trafodion/sql/RowsToInsert.java | 57 +
.../org/trafodion/sql/SequenceFileReader.java | 448 +++++
.../org/trafodion/sql/SequenceFileWriter.java | 467 +++++
.../java/org/trafodion/sql/StringArrayList.java | 47 +
.../org/trafodion/sql/ustat/ChgAutoList.java | 426 +++++
.../java/org/trafodion/sql/ustat/UstatUtil.java | 442 +++++
core/sql/ustat/ChgAutoList.java | 426 -----
core/sql/ustat/UstatUtil.java | 442 -----
core/sql/ustat/hs_cli.cpp | 2 +-
core/sql/ustat/hs_globals.cpp | 30 +-
core/sql/ustat/hs_globals.h | 6 +-
dcs/.gitignore | 1 +
dcs/Makefile | 52 +
dcs/genvers | 24 +
dcs/src/saveVersion.sh | 15 +-
env.sh | 24 +
wms/src/saveVersion.sh | 7 +-
115 files changed, 9444 insertions(+), 8002 deletions(-)
----------------------------------------------------------------------