From 006b92bba2393abfb900d07d91c20a45ba90940c Mon Sep 17 00:00:00 2001 From: Gagan Goel Date: Thu, 2 Feb 2023 08:07:18 -0500 Subject: [PATCH] Revert "This commit fixes an incorrect predicate in the if condition (#2608)" This reverts commit f4e3022fbdecc25a22ae6eaf072e462aa6695f35. The commit apparently caused MCOL-5318 and MCOL-5319 which involve the internal ColumnStore batch insert mechanism passing through the SQL layer. The code block involved in this change is a predicate checking for the HWM extent in WriteEngineServer at the end of the batch insert. This is done in WE_DMLCommandProc::processBatchInsertHwm(). The original predicate check in this function for the HWM extent is restored until further investigation. --- writeengine/server/we_dmlcommandproc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/writeengine/server/we_dmlcommandproc.cpp b/writeengine/server/we_dmlcommandproc.cpp index 173c6adfd..328711802 100644 --- a/writeengine/server/we_dmlcommandproc.cpp +++ b/writeengine/server/we_dmlcommandproc.cpp @@ -2424,7 +2424,7 @@ uint8_t WE_DMLCommandProc::processBatchInsertHwm(messageqcpp::ByteStream& bs, st if ((aIt->partNum > aExtentInfo.fPartition) || ((aIt->partNum == aExtentInfo.fPartition) && (aIt->segNum > aExtentInfo.fSegment)) || ((aIt->partNum == aExtentInfo.fPartition) && (aIt->segNum == aExtentInfo.fSegment) && - (aIt->hwm > aExtentInfo.fLocalHwm))) + (aIt->segNum > aExtentInfo.fLocalHwm))) { aExtentInfo.fPartition = aIt->partNum; aExtentInfo.fDbRoot = aIt->dbRoot;