Misc cleanup items Added a debugging method to print information for the list of all Trafodion IPC connections in a process - that method can be called from the debugger.
Removed unneeded code in preCodeGen - ValueIdSets for predicates imply an AND, so no AND operators must be found in them. Removed unnecessary flags in a makefile. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/855759f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/855759f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/855759f3 Branch: refs/heads/master Commit: 855759f387e7ab0fc677f6138ac5e580b2eeca39 Parents: a4caa9a Author: Hans Zeller <[email protected]> Authored: Tue May 10 01:56:35 2016 +0000 Committer: Hans Zeller <[email protected]> Committed: Tue May 10 01:56:35 2016 +0000 ---------------------------------------------------------------------- core/sql/common/Ipc.cpp | 12 ++++++++++++ core/sql/common/Ipc.h | 1 + core/sql/generator/GenPreCode.cpp | 13 ------------- core/sql/nskgmake/udr_predef/Makefile | 2 -- 4 files changed, 13 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/855759f3/core/sql/common/Ipc.cpp ---------------------------------------------------------------------- diff --git a/core/sql/common/Ipc.cpp b/core/sql/common/Ipc.cpp index 72cc1d6..a2bac4b 100644 --- a/core/sql/common/Ipc.cpp +++ b/core/sql/common/Ipc.cpp @@ -1310,6 +1310,18 @@ void IpcAllConnections::fillInListOfPendingPhandles(GuaProcessHandle *phandles, } // Methods for connection tracing +void IpcAllConnections::print() +{ + char buf[10000]; + Int32 lineno = 0; + + while (printConnTrace(lineno, buf)) + { + printf("%s", buf); + lineno++; + } +} + const char *ConnTraceDesc = "All IpcConnections and their states"; void IpcAllConnections::registTraceInfo(IpcEnvironment *env, ExeTraceInfo *ti) http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/855759f3/core/sql/common/Ipc.h ---------------------------------------------------------------------- diff --git a/core/sql/common/Ipc.h b/core/sql/common/Ipc.h index 7a70c3f..657d086 100644 --- a/core/sql/common/Ipc.h +++ b/core/sql/common/Ipc.h @@ -3162,6 +3162,7 @@ public: #endif // methods used for Ipc Connection tracing + void print(); // can be called from the debugger void registTraceInfo(IpcEnvironment *env, ExeTraceInfo *ti); Int32 printConnTrace(Int32 lineno, char *buf); static Int32 getAnEntry(void * mine, Int32 lineno, char * buf) http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/855759f3/core/sql/generator/GenPreCode.cpp ---------------------------------------------------------------------- diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp index 0ba9383..811c0ed 100644 --- a/core/sql/generator/GenPreCode.cpp +++ b/core/sql/generator/GenPreCode.cpp @@ -11343,19 +11343,6 @@ short HbaseAccess::extractHbaseFilterPreds(Generator * generator, preds.advance(vid)) { ItemExpr * ie = vid.getItemExpr(); - - // if it is AND operation, recurse through left and right children - if (ie->getOperatorType() == ITM_AND) - { - ValueIdSet leftPreds; - ValueIdSet rightPreds; - leftPreds += ie->child(0)->castToItemExpr()->getValueId(); - rightPreds += ie->child(1)->castToItemExpr()->getValueId(); - extractHbaseFilterPreds(generator, leftPreds, newExePreds); - extractHbaseFilterPreds(generator, rightPreds, newExePreds); - continue; - } - ValueId colVID; ValueId valueVID; NABoolean removeFromOrigList = FALSE; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/855759f3/core/sql/nskgmake/udr_predef/Makefile ---------------------------------------------------------------------- diff --git a/core/sql/nskgmake/udr_predef/Makefile b/core/sql/nskgmake/udr_predef/Makefile index 9cf949d..ac6b588 100755 --- a/core/sql/nskgmake/udr_predef/Makefile +++ b/core/sql/nskgmake/udr_predef/Makefile @@ -27,8 +27,6 @@ CPPSRC := SqlUdrPredefLogReader.cpp \ SqlUdrPredefTimeSeries.cpp \ vers_libudr_predef.cpp -DEFS += -DTRAF_SOFTWARE_VERS_MAJOR=$(TRAFODION_VER_MAJOR) -DTRAF_SOFTWARE_VERS_MINOR=$(TRAFODION_VER_MINOR) -DTRAF_SOFTWARE_VERS_UPDATE=$(TRAFODION_VER_UPDATE) - # Define the correct compilation and linking flags depending on whether # this is a debug or release build.
