From 864223166668ab9eeeff5cb83712f0cd48a004f5 Mon Sep 17 00:00:00 2001 From: "david.hall" Date: Thu, 17 Nov 2022 11:29:21 -0600 Subject: [PATCH] Changes to compile local --- CMakeLists.txt | 2 +- utils/rowgroup/rowstorage.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9911b520..b85bae3e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -187,7 +187,7 @@ ENDIF() IF (NOT INSTALL_LAYOUT) MY_CHECK_AND_SET_COMPILER_FLAG("-g -O3 -fno-omit-frame-pointer -fno-strict-aliasing -Wall -fno-tree-vectorize -D_GLIBCXX_ASSERTIONS -DDBUG_OFF -DHAVE_CONFIG_H" RELEASE RELWITHDEBINFO MINSIZEREL) MY_CHECK_AND_SET_COMPILER_FLAG("-ggdb3 -fno-omit-frame-pointer -fno-tree-vectorize -D_GLIBCXX_ASSERTIONS -DSAFE_MUTEX -DSAFEMALLOC -DENABLED_DEBUG_SYNC -O0 -Wall -D_DEBUG -DHAVE_CONFIG_H" DEBUG) - MY_CHECK_AND_SET_COMPILER_FLAG("-msse4.2" RELEASE RELWITHDEBINFO MINSIZEREL DEBUG) + MY_CHECK_AND_SET_COMPILER_FLAG("-msse4.2 -DBOOST_BIND_GLOBAL_PLACEHOLDERS" RELEASE RELWITHDEBINFO MINSIZEREL DEBUG) # enable security hardening features, like most distributions do # in our benchmarks that costs about ~1% of performance, depending on the load diff --git a/utils/rowgroup/rowstorage.cpp b/utils/rowgroup/rowstorage.cpp index ad0144b36..4690f6cf5 100644 --- a/utils/rowgroup/rowstorage.cpp +++ b/utils/rowgroup/rowstorage.cpp @@ -789,7 +789,6 @@ class RowGroupStorage void putKeyRow(uint64_t idx, Row& row) { uint64_t rgid = idx / fMaxRows; - uint64_t rid = idx % fMaxRows; while (rgid >= fRGDatas.size()) { @@ -819,7 +818,7 @@ class RowGroupStorage fLRU->add(rgid); - assert(rid == fRowGroupOut->getRowCount()); + assert(idx % fMaxRows == fRowGroupOut->getRowCount()); fRowGroupOut->getRow(fRowGroupOut->getRowCount(), &row); fRowGroupOut->incRowCount(); }