Merge remote branch 'origin/pr/507/head' into merge_507
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/492f23f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/492f23f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/492f23f6 Branch: refs/heads/master Commit: 492f23f6f27a172247b0ce0cd7f75cd4e7b48d95 Parents: c39d3ab 276fcdb Author: Sandhya Sundaresan <[email protected]> Authored: Wed Jun 1 04:21:53 2016 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Wed Jun 1 04:21:53 2016 +0000 ---------------------------------------------------------------------- core/sql/bin/SqlciErrors.txt | 1 + core/sql/cli/Cli.cpp | 49 +++- core/sql/comexe/ComTdbExeUtil.cpp | 23 ++ core/sql/comexe/ComTdbExeUtil.h | 34 +-- core/sql/common/CharType.cpp | 4 + core/sql/common/CharType.h | 1 + core/sql/executor/ExExeUtil.h | 6 +- core/sql/executor/ExExeUtilCli.cpp | 5 +- core/sql/executor/ExExeUtilGet.cpp | 153 ++++++++----- core/sql/executor/ExHdfsScan.cpp | 1 + core/sql/exp/ExpLOB.cpp | 35 +-- core/sql/exp/ExpLOB.h | 14 +- core/sql/exp/ExpLOBaccess.cpp | 136 +++++++---- core/sql/exp/ExpLOBenums.h | 3 +- core/sql/exp/ExpLOBinterface.cpp | 8 +- core/sql/generator/GenPreCode.cpp | 35 ++- core/sql/generator/GenRelExeUtil.cpp | 15 +- core/sql/optimizer/BindRelExpr.cpp | 2 +- core/sql/optimizer/ItemFunc.h | 5 + core/sql/optimizer/NAColumn.h | 2 +- core/sql/parser/ElemDDLCol.cpp | 2 +- core/sql/parser/sqlparser.y | 33 ++- core/sql/regress/executor/EXPECTED130 | 293 +++++++++++++++++++++--- core/sql/regress/executor/TEST130 | 50 +++- core/sql/regress/executor/TEST130_argfile2 | 3 + core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 9 +- 26 files changed, 707 insertions(+), 215 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/492f23f6/core/sql/bin/SqlciErrors.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/492f23f6/core/sql/comexe/ComTdbExeUtil.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/492f23f6/core/sql/comexe/ComTdbExeUtil.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/492f23f6/core/sql/executor/ExExeUtil.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/492f23f6/core/sql/executor/ExHdfsScan.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/492f23f6/core/sql/exp/ExpLOBaccess.cpp ---------------------------------------------------------------------- diff --cc core/sql/exp/ExpLOBaccess.cpp index ad127ea,81a8ce7..46f5d1a --- a/core/sql/exp/ExpLOBaccess.cpp +++ b/core/sql/exp/ExpLOBaccess.cpp @@@ -2175,11 -2119,10 +2216,12 @@@ Ex_Lob_Error ExLobsOper if (globPtr == NULL) { - if (operation == Lob_Init) + if ((operation == Lob_Init) || + (operation == Lob_Empty_Directory) || + (operation == Lob_Data_Mod_Check)) { - globPtr = (void *) new ExLobGlobals(); + + globPtr = new ExLobGlobals(); if (globPtr == NULL) return LOB_INIT_ERROR; @@@ -2428,24 -2376,10 +2477,25 @@@ err = lobPtr->emptyDirectory(); break; + case Lob_Data_Mod_Check: + { + lobPtr->initialize(NULL, EX_LOB_RW, + NULL, storage, hdfsServer, hdfsPort, NULL, + bufferSize, replication, blockSize, lobMaxSize, + lobGlobals); + + Int64 inputModTS = *(Int64*)blackBox; + Int32 inputNumOfPartLevels = + *(Lng32*)&((char*)blackBox)[sizeof(inputModTS)]; + err = lobPtr->dataModCheck(dir, inputModTS, inputNumOfPartLevels, + lobGlobals); + } + break; + case Lob_Cleanup: - delete lobGlobals; - break; + delete lobGlobals; + break; + case Lob_PerformGC: err = lobPtr->compactLobDataFile((ExLobInMemoryDescChunksEntry *)source,sourceLen); if (err != LOB_OPER_OK) http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/492f23f6/core/sql/exp/ExpLOBenums.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/492f23f6/core/sql/exp/ExpLOBinterface.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/492f23f6/core/sql/generator/GenRelExeUtil.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/492f23f6/core/sql/optimizer/BindRelExpr.cpp ----------------------------------------------------------------------
