summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/framework/DynamicExtension.h2
-rw-r--r--include/shard/MemISAM.h2
-rw-r--r--include/shard/PGM.h2
-rw-r--r--include/shard/TrieSpline.h2
-rw-r--r--include/shard/WIRS.h2
-rw-r--r--include/shard/WSS.h2
-rw-r--r--tests/memisam_tests.cpp2
-rw-r--r--tests/pgm_tests.cpp2
-rw-r--r--tests/wirs_tests.cpp2
-rw-r--r--tests/wss_tests.cpp2
10 files changed, 10 insertions, 10 deletions
diff --git a/include/framework/DynamicExtension.h b/include/framework/DynamicExtension.h
index 242db8e..bd09e1f 100644
--- a/include/framework/DynamicExtension.h
+++ b/include/framework/DynamicExtension.h
@@ -134,7 +134,7 @@ public:
}
// Merge the results together
- auto result = Q::merge(query_results);
+ auto result = Q::merge(query_results, parms);
for (size_t i=0; i<states.size(); i++) {
Q::delete_query_state(states[i]);
diff --git a/include/shard/MemISAM.h b/include/shard/MemISAM.h
index b73d6fa..aa31962 100644
--- a/include/shard/MemISAM.h
+++ b/include/shard/MemISAM.h
@@ -486,7 +486,7 @@ public:
return result;
}
- static std::vector<R> merge(std::vector<std::vector<R>> &results) {
+ static std::vector<R> merge(std::vector<std::vector<R>> &results, void *parms) {
std::vector<R> output;
for (size_t i=0; i<results.size(); i++) {
diff --git a/include/shard/PGM.h b/include/shard/PGM.h
index 20bdbf2..d72ad55 100644
--- a/include/shard/PGM.h
+++ b/include/shard/PGM.h
@@ -341,7 +341,7 @@ public:
return records;
}
- static std::vector<R> merge(std::vector<std::vector<R>> &results) {
+ static std::vector<R> merge(std::vector<std::vector<R>> &results, void *parms) {
size_t total = 0;
for (size_t i=0; i<results.size(); i++) {
total += results[i].size();
diff --git a/include/shard/TrieSpline.h b/include/shard/TrieSpline.h
index 0cb0180..b068313 100644
--- a/include/shard/TrieSpline.h
+++ b/include/shard/TrieSpline.h
@@ -355,7 +355,7 @@ public:
return records;
}
- static std::vector<R> merge(std::vector<std::vector<R>> &results) {
+ static std::vector<R> merge(std::vector<std::vector<R>> &results, void *parms) {
std::vector<R> output;
for (size_t i=0; i<results.size(); i++) {
diff --git a/include/shard/WIRS.h b/include/shard/WIRS.h
index fa071da..9760443 100644
--- a/include/shard/WIRS.h
+++ b/include/shard/WIRS.h
@@ -547,7 +547,7 @@ public:
return result;
}
- static std::vector<R> merge(std::vector<std::vector<R>> &results) {
+ static std::vector<R> merge(std::vector<std::vector<R>> &results, void *parms) {
std::vector<R> output;
for (size_t i=0; i<results.size(); i++) {
diff --git a/include/shard/WSS.h b/include/shard/WSS.h
index b2dbb96..94c7ad3 100644
--- a/include/shard/WSS.h
+++ b/include/shard/WSS.h
@@ -414,7 +414,7 @@ public:
return result;
}
- static std::vector<R> merge(std::vector<std::vector<R>> &results) {
+ static std::vector<R> merge(std::vector<std::vector<R>> &results, void *parms) {
std::vector<R> output;
for (size_t i=0; i<results.size(); i++) {
diff --git a/tests/memisam_tests.cpp b/tests/memisam_tests.cpp
index ef0bd8e..7f6d136 100644
--- a/tests/memisam_tests.cpp
+++ b/tests/memisam_tests.cpp
@@ -238,7 +238,7 @@ START_TEST(t_irs_query_merge)
IRSQuery<Rec>::delete_query_state(state2);
}
- auto merged = IRSQuery<Rec>::merge(results);
+ auto merged = IRSQuery<Rec>::merge(results, nullptr);
ck_assert_int_eq(merged.size(), 2*k);
for (size_t i=0; i<merged.size(); i++) {
diff --git a/tests/pgm_tests.cpp b/tests/pgm_tests.cpp
index 083b370..9622522 100644
--- a/tests/pgm_tests.cpp
+++ b/tests/pgm_tests.cpp
@@ -221,7 +221,7 @@ START_TEST(t_range_query_merge)
}
}
- auto result = PGMRangeQuery<Rec>::merge(proc_results);
+ auto result = PGMRangeQuery<Rec>::merge(proc_results, nullptr);
std::sort(result.begin(), result.end());
ck_assert_int_eq(result.size(), result_size);
diff --git a/tests/wirs_tests.cpp b/tests/wirs_tests.cpp
index ddf9764..2fe7f68 100644
--- a/tests/wirs_tests.cpp
+++ b/tests/wirs_tests.cpp
@@ -244,7 +244,7 @@ START_TEST(t_wirs_query_merge)
WIRSQuery<WRec>::delete_query_state(state2);
}
- auto merged = WIRSQuery<WRec>::merge(results);
+ auto merged = WIRSQuery<WRec>::merge(results, nullptr);
ck_assert_int_eq(merged.size(), 2*k);
for (size_t i=0; i<merged.size(); i++) {
diff --git a/tests/wss_tests.cpp b/tests/wss_tests.cpp
index 7dad5b9..d3bc5c0 100644
--- a/tests/wss_tests.cpp
+++ b/tests/wss_tests.cpp
@@ -240,7 +240,7 @@ START_TEST(t_wss_query_merge)
WSSQuery<WRec>::delete_query_state(state2);
}
- auto merged = WSSQuery<WRec>::merge(results);
+ auto merged = WSSQuery<WRec>::merge(results, nullptr);
ck_assert_int_eq(merged.size(), 2*k);
for (size_t i=0; i<merged.size(); i++) {