You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2017/09/13 23:23:25 UTC
[07/15] incubator-trafodion git commit: Merge branch 'master' of
git://git.apache.org/incubator-trafodion into bmo_memory_quota
Merge branch 'master' of git://git.apache.org/incubator-trafodion into bmo_memory_quota
Conflicts:
core/sql/cli/Globals.cpp
core/sql/executor/cluster.cpp
core/sql/regress/hive/EXPECTED009
core/sql/regress/seabase/EXPECTED010
core/sql/regress/seabase/EXPECTED011
core/sql/regress/seabase/EXPECTED016
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/175402bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/175402bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/175402bf
Branch: refs/heads/master
Commit: 175402bfcec383049f85d11bc237c3d1d6b80e03
Parents: 00e3b87 b62e577
Author: selvaganesang <se...@esgyn.com>
Authored: Thu Sep 7 04:35:59 2017 +0000
Committer: selvaganesang <se...@esgyn.com>
Committed: Thu Sep 7 04:35:59 2017 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 6 +
.../odbc/src/odbc/nsksrvrcore/SQLWrapper.cpp | 5 +-
core/sql/SqlCompilerDebugger/QueryData.cpp | 4 -
core/sql/arkcmp/CmpConnection.cpp | 18 +-
core/sql/arkcmp/CmpContext.cpp | 15 +-
core/sql/arkcmp/CmpContext.h | 8 -
core/sql/arkcmp/CmpSqlSession.cpp | 4 +-
core/sql/arkcmp/CmpStatement.cpp | 121 +-
core/sql/arkcmp/CmpStatement.h | 12 -
core/sql/arkcmp/CmpStoredProc.cpp | 5 -
core/sql/arkcmp/ProcessEnv.cpp | 2 -
core/sql/arkcmp/ProcessEnv.h | 5 -
core/sql/bin/SqlciErrors.txt | 1 -
core/sql/bin/SqlciMain.cpp | 14 +-
core/sql/bin/arkcmp.cpp | 9 +-
core/sql/bin/ex_esp_main.cpp | 24 +-
core/sql/bin/vproceid.cpp | 2 +-
core/sql/cli/Cli.cpp | 940 +---------
core/sql/cli/Cli.h | 20 +-
core/sql/cli/CliDefs.h | 3 -
core/sql/cli/CliDll.cpp | 44 -
core/sql/cli/CliExpExchange.cpp | 15 +-
core/sql/cli/CliExtern.cpp | 962 +---------
core/sql/cli/CliStubsStaticBuild.cpp | 41 -
core/sql/cli/Context.cpp | 1278 +-------------
core/sql/cli/Context.h | 31 +-
core/sql/cli/Descriptor.cpp | 30 -
core/sql/cli/Descriptor.h | 4 +-
core/sql/cli/ExSqlComp.cpp | 274 +--
core/sql/cli/ExSqlComp.h | 1 -
core/sql/cli/Globals.cpp | 50 +-
core/sql/cli/Globals.h | 28 -
core/sql/cli/GlobalsDef.cpp | 2 +-
core/sql/cli/Module.cpp | 48 +-
core/sql/cli/Module.h | 5 -
core/sql/cli/NoWaitOp.cpp | 13 +-
core/sql/cli/SQLCLIdev.h | 673 +------
core/sql/cli/SessionDefaults.cpp | 4 -
core/sql/cli/Statement.cpp | 270 +--
core/sql/cli/Statement.h | 31 +-
core/sql/cli/StoredProcInterface.cpp | 9 -
core/sql/cli/StoredProcInterface.h | 9 -
core/sql/cli/VicKeyValuePair.h | 14 -
core/sql/cli/cli_stdh.h | 1 -
core/sql/cli/globalsrlversion.cpp | 2 +-
core/sql/cli/globalstubs.cpp | 17 -
core/sql/cli/memorymonitor.cpp | 2 -
core/sql/cli/memorymonitor.h | 3 -
core/sql/cli/muse.cpp | 6 -
core/sql/cli/privsrlversion.cpp | 2 +-
core/sql/cli/rtdu.cpp | 61 -
core/sql/cli/rtdu.h | 897 +---------
core/sql/cli/rtdu2.cpp | 254 ---
core/sql/cli/rtdu2.h | 118 +-
core/sql/cli/sql_id.cpp | 12 -
core/sql/cli/sql_id.h | 18 -
core/sql/cli/sqlciSRLStubs.cpp | 2 +
core/sql/cli/sqlcli.h | 318 ++--
core/sql/cli/test.cpp | 99 --
core/sql/clitest/blobtest.cpp | 12 +-
core/sql/comexe/CmpMessage.cpp | 34 +-
core/sql/comexe/CmpMessage.h | 26 +-
core/sql/comexe/ComKeyMDAM.h | 116 +-
core/sql/comexe/ComKeyRange.cpp | 2 +-
core/sql/comexe/ComKeyRange.h | 38 +-
core/sql/comexe/ComKeySingleSubset.h | 30 +-
core/sql/comexe/ComQueue.cpp | 4 -
core/sql/comexe/ComQueue.h | 60 +-
core/sql/comexe/ComTdb.cpp | 51 +-
core/sql/comexe/ComTdb.h | 179 +-
core/sql/comexe/ComTdbAll.h | 8 -
core/sql/comexe/ComTdbBlockingHdfsScan.cpp | 10 -
core/sql/comexe/ComTdbBlockingHdfsScan.h | 8 -
core/sql/comexe/ComTdbCompoundStmt.h | 18 -
core/sql/comexe/ComTdbExeUtil.h | 59 +-
core/sql/comexe/ComTdbExplain.h | 2 +-
core/sql/comexe/ComTdbFastTransport.h | 35 +-
core/sql/comexe/ComTdbFirstN.h | 6 +-
core/sql/comexe/ComTdbHashGrby.h | 48 +-
core/sql/comexe/ComTdbHashj.h | 2 +-
core/sql/comexe/ComTdbHbaseAccess.h | 2 +-
core/sql/comexe/ComTdbMj.h | 2 +-
core/sql/comexe/ComTdbOnlj.h | 2 +-
core/sql/comexe/ComTdbPackRows.h | 13 -
core/sql/comexe/ComTdbRoot.h | 2 +-
core/sql/comexe/ComTdbSample.h | 18 -
core/sql/comexe/ComTdbSequence.h | 20 +-
core/sql/comexe/ComTdbSort.h | 4 +-
core/sql/comexe/ComTdbSortGrby.cpp | 2 +-
core/sql/comexe/ComTdbSortGrby.h | 18 -
core/sql/comexe/ComTdbSplitTop.h | 2 +-
core/sql/comexe/ComTdbTranspose.h | 20 +-
core/sql/comexe/ComTdbTuple.h | 32 +-
core/sql/comexe/ComTdbTupleFlow.cpp | 2 +-
core/sql/comexe/ComTdbTupleFlow.h | 2 +-
core/sql/comexe/ComTdbUdr.h | 2 +-
core/sql/comexe/ComTdbUnPackRows.h | 24 +-
core/sql/comexe/ComTdbUnion.cpp | 2 +-
core/sql/comexe/ComTdbUnion.h | 6 +-
core/sql/comexe/HashBufferHeader.h | 8 -
core/sql/comexe/HashRow.h | 14 -
core/sql/comexe/LateBindInfo.cpp | 244 +--
core/sql/comexe/LateBindInfo.h | 57 +-
core/sql/comexe/PartInputDataDesc.cpp | 3 +-
core/sql/comexe/QueueIndex.h | 5 -
core/sql/comexe/SqlTableOpenInfo.h | 15 -
core/sql/common/BaseTypes.cpp | 4 -
core/sql/common/BaseTypes.h | 8 +-
core/sql/common/BigNumHelper.h | 19 -
core/sql/common/Collections.cpp | 15 -
core/sql/common/Collections.h | 80 +-
core/sql/common/ComASSERT.h | 4 +-
core/sql/common/ComAnsiNamePart.h | 3 +-
core/sql/common/ComCextMisc.cpp | 10 -
core/sql/common/ComDistribution.h | 14 +-
core/sql/common/ComMPLoc.h | 8 +-
core/sql/common/ComObjectName.cpp | 30 -
core/sql/common/ComRtUtils.cpp | 7 +-
core/sql/common/ComRtUtils.h | 7 +-
core/sql/common/ComSafePrinter.cpp | 2 +-
core/sql/common/ComSchemaName.cpp | 23 -
core/sql/common/ComSmallDefs.cpp | 9 -
core/sql/common/ComSpace.cpp | 77 +-
core/sql/common/ComSpace.h | 52 +-
core/sql/common/ComSqlId.h | 19 +-
core/sql/common/ComSysUtils.cpp | 1 -
core/sql/common/ComSysUtils.h | 17 +-
core/sql/common/ComVersionDefs.h | 2 +-
core/sql/common/DgBaseType.h | 169 +-
core/sql/common/DllExportDefines.h | 21 -
core/sql/common/Int64.h | 28 +-
core/sql/common/IntervalType.cpp | 10 -
core/sql/common/IntervalType.h | 10 +-
core/sql/common/Ipc.cpp | 39 +-
core/sql/common/Ipc.h | 84 +-
core/sql/common/IpcGuardian.cpp | 280 +--
core/sql/common/IpcMessageType.h | 44 -
core/sql/common/IpcSockets.cpp | 20 -
core/sql/common/NAAssert.h | 10 +-
core/sql/common/NAError.h | 58 +-
core/sql/common/NAHeap.h | 10 +-
core/sql/common/NAIpc.cpp | 2 +-
core/sql/common/NAIpc.h | 2 +-
core/sql/common/NAMemory.cpp | 305 +---
core/sql/common/NAMemory.h | 399 ++---
core/sql/common/NAStdlib.h | 9 -
core/sql/common/NAString.cpp | 2 +-
core/sql/common/NAString2.cpp | 16 +-
core/sql/common/NAStringDefGlobals.h | 5 +-
core/sql/common/NAWinNT.h | 54 +-
core/sql/common/NLSConversion.h | 20 -
core/sql/common/NumericType.cpp | 17 -
core/sql/common/OperTypeEnum.h | 4 -
core/sql/common/Platform.h | 27 +-
core/sql/common/SMConnection.cpp | 13 -
core/sql/common/SqlEventsDllDefines.h | 8 +-
core/sql/common/SqlExpDllDefines.h | 27 -
core/sql/common/SqlExportDllDefines.h | 24 -
core/sql/common/SqlLmDllDefines.h | 20 +-
core/sql/common/arkcmp_proc.cpp | 2 -
core/sql/common/charinfo.cpp | 10 +-
core/sql/common/conversionLocale.cpp | 3 +-
core/sql/common/conversionSJIS.cpp | 7 +-
core/sql/common/csconvert.h | 15 -
core/sql/common/dfs2rec.h | 36 +-
core/sql/common/from_GB18030.c | 8 -
core/sql/common/from_GBK.c | 3 -
core/sql/common/from_SJIS.c | 2 -
core/sql/common/from_ksc5601.c | 2 -
core/sql/common/iconv_gen.c | 15 -
core/sql/common/ipcmsg.cpp | 2 +-
core/sql/common/mb_lconv.c | 38 +-
core/sql/common/memtest.cpp | 1 -
core/sql/common/multi-byte.h | 5 -
core/sql/common/nawstring.cpp | 4 -
core/sql/common/nawstring.h | 18 +-
core/sql/common/nchar_mp.h | 33 +-
core/sql/common/str.cpp | 18 -
core/sql/common/str.h | 46 +-
core/sql/common/stringBuf.h | 31 +-
core/sql/common/swscanf.cpp | 5 -
core/sql/common/swsprintf.cpp | 2 -
core/sql/common/unicode_char_set.cpp | 6 -
core/sql/common/unicode_char_set.h | 18 -
core/sql/common/wc_scanf_sprintf.h | 20 +-
core/sql/common/wstr.h | 5 +-
core/sql/executor/ExBitMapTable.cpp | 6 -
core/sql/executor/ExBitMapTable.h | 16 -
core/sql/executor/ExCancel.h | 6 +-
core/sql/executor/ExComTdb.cpp | 26 +-
core/sql/executor/ExCompoundStmt.h | 38 +-
core/sql/executor/ExExeUtil.h | 222 +--
core/sql/executor/ExExeUtilCommon.cpp | 10 +-
core/sql/executor/ExExeUtilGetStats.cpp | 7 +-
core/sql/executor/ExExeUtilLoad.cpp | 255 +--
core/sql/executor/ExExplain.cpp | 9 -
core/sql/executor/ExExplain.h | 6 +-
core/sql/executor/ExFastTransport.cpp | 7 -
core/sql/executor/ExFastTransport.h | 11 +-
core/sql/executor/ExFirstN.h | 34 +-
core/sql/executor/ExHbaseAccess.h | 12 +-
core/sql/executor/ExHdfsScan.h | 12 +-
core/sql/executor/ExMeas.cpp | 141 --
core/sql/executor/ExMeas.h | 267 ---
core/sql/executor/ExPack.h | 31 +-
core/sql/executor/ExPackedRows.h | 27 +-
core/sql/executor/ExProbeCache.h | 8 +-
core/sql/executor/ExRLE.h | 10 -
core/sql/executor/ExRsInfo.cpp | 24 +-
core/sql/executor/ExRsInfo.h | 2 +-
core/sql/executor/ExSample.h | 50 +-
core/sql/executor/ExScheduler.cpp | 97 +-
core/sql/executor/ExScheduler.h | 26 +-
core/sql/executor/ExSequence.cpp | 2 -
core/sql/executor/ExSimpleSample.h | 20 +-
core/sql/executor/ExSimpleSqlBuffer.h | 12 -
core/sql/executor/ExStats.cpp | 64 +-
core/sql/executor/ExStats.h | 812 +--------
core/sql/executor/ExTranspose.h | 29 +-
core/sql/executor/ExUdr.h | 6 +-
core/sql/executor/ExUdrServer.cpp | 29 +-
core/sql/executor/ExVPJoin.cpp | 16 -
core/sql/executor/ExVPJoin.h | 33 +-
core/sql/executor/Ex_esp_msg.h | 6 -
core/sql/executor/FixedSizeHeapElement.h | 18 +-
core/sql/executor/FixedSizeHeapManager.h | 30 +-
core/sql/executor/MdamEndPoint.h | 32 +-
core/sql/executor/MdamInterval.h | 44 +-
core/sql/executor/MdamIntervalIterator.h | 6 +-
core/sql/executor/MdamIntervalList.h | 30 +-
core/sql/executor/MdamIntervalListIterator.h | 8 +-
core/sql/executor/MdamIntervalListMerger.h | 10 +-
core/sql/executor/MdamPoint.h | 24 +-
core/sql/executor/MdamRefList.h | 32 +-
core/sql/executor/MdamRefListEntry.h | 18 +-
core/sql/executor/MdamRefListIterator.h | 6 +-
core/sql/executor/UdrExeIpc.h | 6 +-
core/sql/executor/cluster.cpp | 76 +-
core/sql/executor/cluster.h | 157 +-
core/sql/executor/dfs2fe.h | 1 -
core/sql/executor/dmeasql.h | 67 -
core/sql/executor/ex_control.cpp | 338 ++--
core/sql/executor/ex_control.h | 6 +-
core/sql/executor/ex_ddl.cpp | 265 ++-
core/sql/executor/ex_ddl.h | 30 +-
core/sql/executor/ex_error.h | 4 -
core/sql/executor/ex_esp_frag_dir.cpp | 2 -
core/sql/executor/ex_ex.cpp | 52 -
core/sql/executor/ex_ex.h | 18 +-
core/sql/executor/ex_exe_stmt_globals.cpp | 21 +-
core/sql/executor/ex_exe_stmt_globals.h | 38 +-
core/sql/executor/ex_frag_rt.cpp | 11 +-
core/sql/executor/ex_globals.cpp | 4 -
core/sql/executor/ex_globals.h | 70 +-
core/sql/executor/ex_god.h | 2 -
core/sql/executor/ex_hash_grby.cpp | 64 +-
core/sql/executor/ex_hash_grby.h | 37 +-
core/sql/executor/ex_hashj.cpp | 30 +-
core/sql/executor/ex_hashj.h | 10 +-
core/sql/executor/ex_io_control.h | 22 +-
core/sql/executor/ex_key_object.h | 1 -
core/sql/executor/ex_mdam.h | 70 +-
core/sql/executor/ex_mj.h | 8 +-
core/sql/executor/ex_onlj.cpp | 27 +-
core/sql/executor/ex_onlj.h | 6 +-
core/sql/executor/ex_queue.cpp | 10 -
core/sql/executor/ex_queue.h | 111 +-
core/sql/executor/ex_root.cpp | 17 +-
core/sql/executor/ex_root.h | 8 +-
core/sql/executor/ex_send_bottom.cpp | 4 +-
core/sql/executor/ex_send_bottom.h | 8 +-
core/sql/executor/ex_send_top.cpp | 2 -
core/sql/executor/ex_send_top.h | 8 +-
core/sql/executor/ex_sort.cpp | 13 +-
core/sql/executor/ex_sort.h | 10 +-
core/sql/executor/ex_sort_grby.h | 13 +-
core/sql/executor/ex_split_bottom.cpp | 7 +-
core/sql/executor/ex_split_bottom.h | 8 +-
core/sql/executor/ex_split_top.h | 8 +-
core/sql/executor/ex_stored_proc.h | 6 +-
core/sql/executor/ex_tcb.h | 95 +-
core/sql/executor/ex_tcb_private.h | 5 -
core/sql/executor/ex_timeout.h | 6 +-
core/sql/executor/ex_transaction.cpp | 8 -
core/sql/executor/ex_transaction.h | 6 +-
core/sql/executor/ex_tuple.cpp | 4 +-
core/sql/executor/ex_tuple.h | 36 +-
core/sql/executor/ex_tuple_flow.cpp | 3 -
core/sql/executor/ex_tuple_flow.h | 6 +-
core/sql/executor/ex_union.h | 59 +-
core/sql/executor/hash_table.cpp | 12 -
core/sql/executor/hash_table.h | 34 -
core/sql/executor/key_range.h | 26 +-
core/sql/executor/key_single_subset.h | 28 +-
core/sql/executor/rcb.h | 50 -
core/sql/executor/sql_buffer.cpp | 116 +-
core/sql/executor/sql_buffer.h | 17 +-
core/sql/executor/sql_buffer_size.h | 3 -
core/sql/executor/stubs.cpp | 384 ----
core/sql/executor/stubs2.cpp | 81 -
core/sql/executor/tempfile.cpp | 71 +-
core/sql/executor/tempfile.h | 67 -
core/sql/exp/ExpAtp.cpp | 6 -
core/sql/exp/ExpAtp.h | 29 +-
core/sql/exp/ExpBitMuxFunction.h | 22 +-
core/sql/exp/ExpCriDesc.cpp | 6 +-
core/sql/exp/ExpCriDesc.h | 21 +-
core/sql/exp/ExpDll.cpp | 3 +-
core/sql/exp/ExpError.cpp | 19 -
core/sql/exp/ExpError.h | 18 -
core/sql/exp/ExpErrorEnums.h | 11 -
core/sql/exp/ExpLOB.cpp | 42 -
core/sql/exp/ExpLOB.h | 70 +-
core/sql/exp/ExpLOBaccess.cpp | 135 +-
core/sql/exp/ExpLOBaccess.h | 4 +-
core/sql/exp/ExpLOBenums.h | 4 +-
core/sql/exp/ExpLOBinterface.cpp | 57 +-
core/sql/exp/ExpLOBinterface.h | 13 +
core/sql/exp/ExpPCode.cpp | 53 +-
core/sql/exp/ExpPCode.h | 27 +-
core/sql/exp/ExpPCodeClauseGen.cpp | 156 +-
core/sql/exp/ExpPCodeExpGen.cpp | 37 +-
core/sql/exp/ExpPCodeInstruction.h | 138 +-
core/sql/exp/ExpPCodeList.h | 30 +-
core/sql/exp/ExpPCodeOptimizations.cpp | 191 +-
core/sql/exp/ExpPCodeOptimizations.h | 24 +-
core/sql/exp/ExpPCodeOptsNativeExpr.cpp | 7 -
core/sql/exp/ExpPCodeOptsPeeling.cpp | 15 +-
core/sql/exp/ExpPCodeOptsRuntime.cpp | 16 +-
core/sql/exp/ExpPackDefs.cpp | 221 ++-
core/sql/exp/ExpSequenceFunction.cpp | 13 -
core/sql/exp/ExpSequenceFunction.h | 48 +-
core/sql/exp/ExpSqlTupp.h | 66 +-
core/sql/exp/exp_arith.cpp | 12 -
core/sql/exp/exp_attrs.cpp | 45 +-
core/sql/exp/exp_attrs.h | 8 +-
core/sql/exp/exp_bignum.cpp | 12 -
core/sql/exp/exp_bignum.h | 47 +-
core/sql/exp/exp_clause.cpp | 77 +-
core/sql/exp/exp_clause.h | 141 +-
core/sql/exp/exp_clause_derived.h | 660 ++++---
core/sql/exp/exp_conv.cpp | 82 +-
core/sql/exp/exp_datetime.cpp | 15 -
core/sql/exp/exp_datetime.h | 33 +-
core/sql/exp/exp_dp2_expr.cpp | 1 +
core/sql/exp/exp_dp2_expr.h | 33 +-
core/sql/exp/exp_eval.cpp | 23 +-
core/sql/exp/exp_expr.cpp | 36 +-
core/sql/exp/exp_expr.h | 361 ++--
core/sql/exp/exp_fixup.cpp | 43 -
core/sql/exp/exp_function.cpp | 158 +-
core/sql/exp/exp_function.h | 1663 ++++++++----------
core/sql/exp/exp_interval.h | 6 +-
core/sql/exp/exp_like.h | 59 +-
core/sql/exp/exp_math_func.cpp | 2 -
core/sql/exp/exp_math_func.h | 42 +-
core/sql/exp/exp_space.cpp | 49 -
core/sql/exp/exp_stdh.h | 4 +-
core/sql/exp/exp_tuple_desc.cpp | 3 +-
core/sql/exp/exp_tuple_desc.h | 4 +-
core/sql/export/ComDiags.cpp | 53 +-
core/sql/export/ComDiags.h | 343 +---
core/sql/export/ComMemoryDiags.h | 4 +-
core/sql/export/ExportDll.cpp | 3 +-
core/sql/export/HeapID.h | 18 +-
core/sql/export/HeapLog.h | 3 +-
core/sql/export/IpcMessageObj.cpp | 18 -
core/sql/export/IpcMessageObj.h | 85 +-
core/sql/export/NAAbort.cpp | 13 +-
core/sql/export/NABasicObject.cpp | 27 +-
core/sql/export/NABasicObject.h | 52 +-
core/sql/export/NAInternalError.h | 4 +-
core/sql/export/NAStringDef.cpp | 11 -
core/sql/export/NAStringDef.h | 83 +-
core/sql/export/NAVersionedObject.cpp | 22 +-
core/sql/export/NAVersionedObject.h | 815 ++++-----
core/sql/generator/GenAll.cpp | 1 -
core/sql/generator/GenExpGenerator.cpp | 150 +-
core/sql/generator/GenExpGenerator.h | 17 +-
core/sql/generator/GenExplain.cpp | 6 -
core/sql/generator/GenItemFunc.cpp | 219 ---
core/sql/generator/GenPreCode.cpp | 1 -
core/sql/generator/GenRelDCL.cpp | 6 -
core/sql/generator/GenRelExeUtil.cpp | 2 +-
core/sql/generator/GenRelGrby.cpp | 2 +
core/sql/generator/GenRelMisc.cpp | 35 +-
core/sql/generator/Generator.cpp | 8 +-
core/sql/langman/LmComQueue.h | 3 -
core/sql/langman/LmCommon.h | 26 +-
core/sql/langman/LmDebug.h | 2 +-
core/sql/nskgmake/arkcmplib/Makefile | 2 -
core/sql/nskgmake/tdm_sqlcli/Makefile | 1 -
core/sql/optimizer/BindItemExpr.cpp | 37 -
core/sql/optimizer/BindRelExpr.cpp | 41 +-
core/sql/optimizer/ColStatDesc.cpp | 5 -
core/sql/optimizer/ControlDB.cpp | 7 +-
core/sql/optimizer/EncodedKeyValue.cpp | 2 +-
core/sql/optimizer/ItemConstr.h | 2 +-
core/sql/optimizer/ItemExpr.cpp | 112 --
core/sql/optimizer/ItemFunc.h | 92 +-
core/sql/optimizer/NATable.cpp | 14 +-
core/sql/optimizer/NATable.h | 4 +-
core/sql/optimizer/ObjectNames.cpp | 15 +-
core/sql/optimizer/ObjectNames.h | 19 -
core/sql/optimizer/RelCache.cpp | 10 +-
core/sql/optimizer/SchemaDB.cpp | 13 +-
core/sql/optimizer/SchemaDB.h | 13 +-
core/sql/optimizer/SynthType.cpp | 71 -
core/sql/optimizer/TableDesc.h | 5 -
core/sql/optimizer/VEGTable.h | 2 +-
core/sql/optimizer/costmethod.cpp | 2 +-
core/sql/optimizer/opt.cpp | 4 +-
core/sql/parser/HvRoles.h | 3 +-
core/sql/parser/ParKeyWords.cpp | 2 -
core/sql/parser/SqlParserAux.cpp | 5 +-
core/sql/parser/sqlparser.y | 146 --
core/sql/qms/QmmMain.cpp | 19 -
core/sql/qms/QmmQmm.cpp | 486 -----
core/sql/qms/QmmQmm.h | 38 -
core/sql/qms/QmsMain.cpp | 17 -
core/sql/qms/QmsRequest.cpp | 26 -
core/sql/qmscommon/QRDescriptor.cpp | 4 -
core/sql/qmscommon/QRQueries.cpp | 290 ++-
core/sql/regress/charsets/TEST014 | 5 +
core/sql/regress/compGeneral/EXPECTED006.SB | 10 -
core/sql/regress/compGeneral/TEST006 | 4 -
core/sql/regress/executor/EXPECTED020 | 4 -
core/sql/regress/executor/EXPECTED130 | 78 +-
core/sql/regress/hive/EXPECTED009 | 24 +-
core/sql/regress/hive/EXPECTED018 | 585 +++---
core/sql/regress/seabase/EXPECTED010 | 460 ++---
core/sql/regress/seabase/EXPECTED011 | 13 +-
core/sql/regress/seabase/EXPECTED016 | 119 +-
core/sql/runtimestats/SqlStats.cpp | 99 +-
core/sql/runtimestats/SqlStats.h | 14 -
core/sql/runtimestats/rts_msg.h | 2 -
core/sql/runtimestats/sscpipc.cpp | 2 -
core/sql/runtimestats/ssmpipc.cpp | 9 -
core/sql/runtimestats/ssmpipc.h | 7 -
core/sql/sort/CommonStructs.h | 3 -
core/sql/sort/Statistics.h | 3 -
core/sql/sqlcat/ReadTableDef.cpp | 56 -
core/sql/sqlcat/ReadTableDef.h | 54 -
core/sql/sqlcat/TrafDDLdesc.cpp | 65 +
core/sql/sqlcat/enum.h | 42 -
core/sql/sqlcat/readRealArk.cpp | 89 -
core/sql/sqlcat/readRealArk.h | 8 -
core/sql/sqlcat/vers_libsqlcat.cpp | 3 -
core/sql/sqlci/SqlCmd.cpp | 8 +-
core/sql/sqlci/SqlciDefs.h | 4 -
core/sql/sqlci/SqlciEnv.h | 2 +-
core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 1 -
core/sql/sqlcomp/CmpDescribe.cpp | 3 +-
core/sql/sqlcomp/CmpMain.cpp | 35 +-
core/sql/sqlcomp/DefaultConstants.h | 27 -
core/sql/sqlcomp/QCache.cpp | 24 +-
core/sql/sqlcomp/QCache.h | 11 -
core/sql/sqlcomp/nadefaults.cpp | 26 +-
core/sql/sqlmsg/ErrorMessage.h | 1 -
core/sql/sqlmsg/GetErrorMessage.cpp | 2 -
core/sql/sqlmsg/GetErrorMessage.h | 22 +-
core/sql/udrserv/UdrStreams.cpp | 2 +-
core/sql/udrserv/spinfo.cpp | 6 +-
core/sql/udrserv/udrglobals.cpp | 7 +-
core/sql/udrserv/udrload.cpp | 4 +-
core/sql/udrserv/udrserv.cpp | 16 +-
core/sql/udrserv/udrunload.cpp | 4 +-
core/sql/udrserv/udrutil.cpp | 4 +-
core/sql/udrserv/udrutil.h | 4 +-
core/sql/ustat/hs_cli.cpp | 19 +-
core/sql/ustat/hs_globals.cpp | 2 -
core/sql/ustat/hs_read.cpp | 2 -
core/sql/ustat/hs_update.cpp | 1 -
473 files changed, 5536 insertions(+), 21199 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/cli/Context.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/cli/Context.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/cli/Globals.cpp
----------------------------------------------------------------------
diff --cc core/sql/cli/Globals.cpp
index 6f97513,cb9c836..ed4cbeb
--- a/core/sql/cli/Globals.cpp
+++ b/core/sql/cli/Globals.cpp
@@@ -118,10 -112,7 +112,8 @@@ CliGlobals::CliGlobals(NABoolean espPro
defaultContext_(NULL),
langManC_(NULL),
langManJava_(NULL)
- #ifdef SQ_PHANDLE_VERIFIER
, myVerifier_(-1)
- #endif
+ , espProcess_(espProcess)
{
globalsAreInitialized_ = FALSE;
executorMemory_.setThreadSafe();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/cli/Globals.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/cli/Statement.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/comexe/ComTdbRoot.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/executor/ExStats.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/executor/cluster.cpp
----------------------------------------------------------------------
diff --cc core/sql/executor/cluster.cpp
index 00492bb,a17d014..327c59c
--- a/core/sql/executor/cluster.cpp
+++ b/core/sql/executor/cluster.cpp
@@@ -637,9 -610,9 +610,9 @@@ void ClusterDB::yieldUnusedMemoryQuota(
sprintf(msg, "%s YIELDED %d MB (%u). %s needed %u MB, unused pool %u",
extraBuffers == 1 ? "HJ" : "HGB", memToYieldMB,
- 0, // NA_64BIT, use instance id later
+ 0,
msg1, memNeededMB,
- stmtGlobals_->unusedMemoryQuota());
+ GetCliGlobals()->unusedMemoryQuota());
// log an EMS event and continue
SQLMXLoggingArea::logExecRtInfo(NULL, 0, msg, explainNodeId_);
@@@ -721,9 -691,9 +691,9 @@@ NABoolean ClusterDB::enoughMemory(ULng3
if ( doLog_ && memNeededMB > 1 ) { // LOG -- only for more than a buffer
sprintf(msg,
"GRABBED %u MB (%u). Memory used %u, now allowed %u MB, request size %u, unused pool %u",
- memNeededMB, 0, // NA_64BIT, use instance id later
+ memNeededMB, 0,
memoryUsed_,
- memoryQuotaMB_, reqSize,stmtGlobals_->unusedMemoryQuota() );
+ memoryQuotaMB_, reqSize,GetCliGlobals()->unusedMemoryQuota() );
// log an EMS event and continue
SQLMXLoggingArea::logExecRtInfo(NULL, 0, msg, explainNodeId_);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/executor/ex_frag_rt.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/executor/ex_sort.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/executor/ex_split_bottom.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/generator/GenExplain.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/generator/GenRelGrby.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/generator/GenRelMisc.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/regress/hive/EXPECTED009
----------------------------------------------------------------------
diff --cc core/sql/regress/hive/EXPECTED009
index 79eaf00,90250a7..60607af
--- a/core/sql/regress/hive/EXPECTED009
+++ b/core/sql/regress/hive/EXPECTED009
@@@ -635,9 -633,9 +635,8 @@@ DESCRIPTIO
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ...... ###
affinity_value ....... ###
max_max_cardinality ###
- total_overflow_size ###
xn_access_mode ......... read_only
xn_autoabort_interval ###
auto_query_retry ....... enabled
@@@ -1089,9 -1079,9 +1088,8 @@@ DESCRIPTIO
fragment_id ............ 0
parent_frag ............ (none)
fragment_type .......... master
- statement_index ...... ###
affinity_value ....... ###
max_max_cardinality ###
- total_overflow_size ###
xn_access_mode ......... read_only
xn_autoabort_interval ###
auto_query_retry ....... enabled
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/regress/seabase/EXPECTED010
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/regress/seabase/EXPECTED011
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/regress/seabase/EXPECTED016
----------------------------------------------------------------------
diff --cc core/sql/regress/seabase/EXPECTED016
index 1919aa7,440832a..4be8bfc
--- a/core/sql/regress/seabase/EXPECTED016
+++ b/core/sql/regress/seabase/EXPECTED016
@@@ -192,9 -192,8 +192,9 @@@ ROOT ==================================
REQUESTS_IN .............. 1
ROWS_OUT ................. 1
EST_OPER_COST ............ 0
- EST_TOTAL_COST ......... 479.46
+ EST_TOTAL_COST ......... 553.72
DESCRIPTION
+ est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
max_card_est ........... 1
fragment_id ............ 0
parent_frag ............ (none)
@@@ -341,9 -337,8 +340,9 @@@ ROOT ==================================
REQUESTS_IN .............. 1
ROWS_OUT ................. 1
EST_OPER_COST ............ 0
- EST_TOTAL_COST ......... 493.55
+ EST_TOTAL_COST ......... 568.72
DESCRIPTION
+ est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
max_card_est ........... 1
fragment_id ............ 0
parent_frag ............ (none)
@@@ -490,9 -482,8 +488,9 @@@ ROOT ==================================
REQUESTS_IN .............. 1
ROWS_OUT ................. 1
EST_OPER_COST ............ 0
- EST_TOTAL_COST ......... 479.46
+ EST_TOTAL_COST ......... 553.66
DESCRIPTION
+ est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
max_card_est ........... 1
fragment_id ............ 0
parent_frag ............ (none)
@@@ -639,9 -627,8 +636,9 @@@ ROOT ==================================
REQUESTS_IN .............. 1
ROWS_OUT ................. 1
EST_OPER_COST ............ 0
- EST_TOTAL_COST ......... 451.99
+ EST_TOTAL_COST ......... 524.1
DESCRIPTION
+ est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
max_card_est ........... 1
fragment_id ............ 0
parent_frag ............ (none)
@@@ -788,9 -772,8 +784,9 @@@ ROOT ==================================
REQUESTS_IN .............. 1
ROWS_OUT ................. 1
EST_OPER_COST ............ 0
- EST_TOTAL_COST ......... 451.99
+ EST_TOTAL_COST ......... 524.16
DESCRIPTION
+ est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
max_card_est ........... 1
fragment_id ............ 0
parent_frag ............ (none)
@@@ -937,9 -917,8 +932,9 @@@ ROOT ==================================
REQUESTS_IN .............. 1
ROWS_OUT ................. 1
EST_OPER_COST ............ 0
- EST_TOTAL_COST ......... 465.32
+ EST_TOTAL_COST ......... 538.55
DESCRIPTION
+ est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
max_card_est ........... 1
fragment_id ............ 0
parent_frag ............ (none)
@@@ -1086,9 -1062,8 +1080,9 @@@ ROOT ==================================
REQUESTS_IN .............. 1
ROWS_OUT ................. 1
EST_OPER_COST ............ 0
- EST_TOTAL_COST ......... 479.46
+ EST_TOTAL_COST ......... 553.72
DESCRIPTION
+ est_memory_per_node .... 10240.00(Limit), 0.00(BMOs), 0.00(nBMOs) MB
max_card_est ........... 1
fragment_id ............ 0
parent_frag ............ (none)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/175402bf/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------