Skip to content

Commit 3eecc51

Browse files
Merge branch 'stable-23.10' into MCOL-5758-BLOOM-FILTER-PRE-JOIN-GSOC-2025-REDESIGNED
2 parents 3383a46 + a7e5115 commit 3eecc51

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
COLUMNSTORE_VERSION_MAJOR=23
22
COLUMNSTORE_VERSION_MINOR=10
3-
COLUMNSTORE_VERSION_PATCH=5
3+
COLUMNSTORE_VERSION_PATCH=6
44
COLUMNSTORE_VERSION_RELEASE=1

datatypes/unordered.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#if (_LIBCPP_VERSION)
44
#include <unordered_set>
55
#include <unordered_map>
6-
#pragma message("libcpp do not support tr1, so we are using std::unordered_[set|map] instead")
6+
// #pragma message("libcpp do not support tr1, so we are using std::unordered_[set|map] instead")
77
namespace std
88
{
99
namespace tr1
@@ -16,7 +16,7 @@ using std::unordered_set;
1616
} // namespace tr1
1717
} // namespace std
1818
#else
19-
#pragma message("Using std::tr1::unordered_[set|map]")
19+
// #pragma message("Using std::tr1::unordered_[set|map]")
2020

2121
#include <tr1/unordered_set>
2222
#include <tr1/unordered_map>

writeengine/server/we_dataloader.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,13 @@ bool WEDataLoader::setupCpimport() // fork the cpimport
254254
}
255255

256256
Cmds.push_back(0); // null terminate
257-
// updatePrgmPath(Cmds);
257+
// updatePrgmPath(Cmds);
258258

259-
// NOTE: for debugging
259+
// // NOTE: for debugging
260260
int aSize = Cmds.size();
261261

262-
for (int aIdx = 0; aIdx < aSize; ++aIdx)
262+
// Do not address last terminating 0
263+
for (int aIdx = 0; aIdx < aSize - 1; ++aIdx)
263264
{
264265
cout << "Args " << Cmds[aIdx] << endl;
265266
}

0 commit comments

Comments
 (0)