Skip to content

Commit 17f8a7b

Browse files
committed
CONTAIN_ATTRIBUTES was missing for the cuckoo filter
1 parent d082fcd commit 17f8a7b

File tree

1 file changed

+21
-59
lines changed

1 file changed

+21
-59
lines changed

benchmarks/bulk-insert-and-query.cc

Lines changed: 21 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,7 @@ struct FilterAPI<CuckooFilter<ItemType, bits_per_item, TableType, HashFamily>> {
145145
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
146146
throw std::runtime_error("Unsupported");
147147
}
148-
149-
CONTAIN_ATTRIBUTES
150-
static bool Contain(uint64_t key, const Table * table) {
148+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
151149
return (0 == table->Contain(key));
152150
}
153151
};
@@ -164,7 +162,7 @@ struct FilterAPI<CuckooFilterStable<ItemType, bits_per_item, TableType, HashFami
164162
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
165163
throw std::runtime_error("Unsupported");
166164
}
167-
static bool Contain(uint64_t key, const Table * table) {
165+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
168166
return (0 == table->Contain(key));
169167
}
170168
};
@@ -184,9 +182,7 @@ struct FilterAPI<SimdBlockFilterFixed<HashFamily>> {
184182
static void AddAll(const vector<uint64_t> keys, const size_t start, const size_t end, Table* table) {
185183
throw std::runtime_error("Unsupported");
186184
}
187-
188-
CONTAIN_ATTRIBUTES
189-
static bool Contain(uint64_t key, const Table * table) {
185+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
190186
return table->Find(key);
191187
}
192188
};
@@ -207,9 +203,7 @@ struct FilterAPI<SimdBlockFilter<HashFamily>> {
207203
static void AddAll(const vector<uint64_t> keys, const size_t start, const size_t end, Table* table) {
208204
throw std::runtime_error("Unsupported");
209205
}
210-
211-
CONTAIN_ATTRIBUTES
212-
static bool Contain(uint64_t key, const Table * table) {
206+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
213207
return table->Find(key);
214208
}
215209
};
@@ -227,9 +221,7 @@ struct FilterAPI<SimdBlockFilterFixed64<HashFamily>> {
227221
static void AddAll(const vector<uint64_t> keys, const size_t start, const size_t end, Table* table) {
228222
throw std::runtime_error("Unsupported");
229223
}
230-
231-
CONTAIN_ATTRIBUTES
232-
static bool Contain(uint64_t key, const Table * table) {
224+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
233225
return table->Find(key);
234226
}
235227
};
@@ -248,9 +240,7 @@ struct FilterAPI<SimdBlockFilterFixed16<HashFamily>> {
248240
static void AddAll(const vector<uint64_t> keys, const size_t start, const size_t end, Table* table) {
249241
throw std::runtime_error("Unsupported");
250242
}
251-
252-
CONTAIN_ATTRIBUTES
253-
static bool Contain(uint64_t key, const Table * table) {
243+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
254244
return table->Find(key);
255245
}
256246
};
@@ -268,9 +258,7 @@ struct FilterAPI<SimdBlockFilterFixed<HashFamily>> {
268258
static void AddAll(const vector<uint64_t> keys, const size_t start, const size_t end, Table* table) {
269259
table->AddAll(keys, start, end);
270260
}
271-
272-
CONTAIN_ATTRIBUTES
273-
static bool Contain(uint64_t key, const Table * table) {
261+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
274262
return table->Find(key);
275263
}
276264
};
@@ -286,9 +274,7 @@ struct FilterAPI<XorFilter<ItemType, FingerprintType>> {
286274
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
287275
table->AddAll(keys, start, end);
288276
}
289-
290-
CONTAIN_ATTRIBUTES
291-
static bool Contain(uint64_t key, const Table * table) {
277+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
292278
return (0 == table->Contain(key));
293279
}
294280
};
@@ -307,9 +293,7 @@ struct FilterAPI<SimpleBlockFilter<blocksize,k,HashFamily>> {
307293
static void AddAll(const vector<uint64_t> keys, const size_t start, const size_t end, Table* table) {
308294
throw std::runtime_error("Unsupported");
309295
}
310-
311-
CONTAIN_ATTRIBUTES
312-
static bool Contain(uint64_t key, const Table * table) {
296+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
313297
return table->Find(key);
314298
}
315299
};
@@ -325,9 +309,7 @@ struct FilterAPI<XorFilter<ItemType, FingerprintType, HashFamily>> {
325309
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
326310
table->AddAll(keys, start, end);
327311
}
328-
329-
CONTAIN_ATTRIBUTES
330-
static bool Contain(uint64_t key, const Table * table) {
312+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
331313
return (0 == table->Contain(key));
332314
}
333315
};
@@ -342,9 +324,7 @@ struct FilterAPI<XorFilter2<ItemType, FingerprintType, FingerprintStorageType, H
342324
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
343325
table->AddAll(keys, start, end);
344326
}
345-
346-
CONTAIN_ATTRIBUTES
347-
static bool Contain(uint64_t key, const Table * table) {
327+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
348328
return (0 == table->Contain(key));
349329
}
350330
};
@@ -359,9 +339,7 @@ struct FilterAPI<XorFilter10<ItemType, HashFamily>> {
359339
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
360340
table->AddAll(keys, start, end);
361341
}
362-
363-
CONTAIN_ATTRIBUTES
364-
static bool Contain(uint64_t key, const Table * table) {
342+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
365343
return (0 == table->Contain(key));
366344
}
367345
};
@@ -376,9 +354,7 @@ struct FilterAPI<XorFilter13<ItemType, HashFamily>> {
376354
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
377355
table->AddAll(keys, start, end);
378356
}
379-
380-
CONTAIN_ATTRIBUTES
381-
static bool Contain(uint64_t key, const Table * table) {
357+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
382358
return (0 == table->Contain(key));
383359
}
384360
};
@@ -393,9 +369,7 @@ struct FilterAPI<XorFilter10_666<ItemType, HashFamily>> {
393369
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
394370
table->AddAll(keys, start, end);
395371
}
396-
397-
CONTAIN_ATTRIBUTES
398-
static bool Contain(uint64_t key, const Table * table) {
372+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
399373
return (0 == table->Contain(key));
400374
}
401375
};
@@ -410,9 +384,7 @@ struct FilterAPI<XorFilter2n<ItemType, FingerprintType, FingerprintStorageType,
410384
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
411385
table->AddAll(keys, start, end);
412386
}
413-
414-
CONTAIN_ATTRIBUTES
415-
static bool Contain(uint64_t key, const Table * table) {
387+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
416388
return (0 == table->Contain(key));
417389
}
418390
};
@@ -427,9 +399,7 @@ struct FilterAPI<XorFilterPlus<ItemType, FingerprintType, HashFamily>> {
427399
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
428400
table->AddAll(keys, start, end);
429401
}
430-
431-
CONTAIN_ATTRIBUTES
432-
static bool Contain(uint64_t key, const Table * table) {
402+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
433403
return (0 == table->Contain(key));
434404
}
435405
};
@@ -444,9 +414,7 @@ struct FilterAPI<GcsFilter<ItemType, bits_per_item, HashFamily>> {
444414
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
445415
table->AddAll(keys, start, end);
446416
}
447-
448-
CONTAIN_ATTRIBUTES
449-
static bool Contain(uint64_t key, const Table * table) {
417+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
450418
return (0 == table->Contain(key));
451419
}
452420
};
@@ -462,9 +430,7 @@ struct FilterAPI<GQFilter<ItemType, bits_per_item, HashFamily>> {
462430
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
463431
throw std::runtime_error("Unsupported");
464432
}
465-
466-
CONTAIN_ATTRIBUTES
467-
static bool Contain(uint64_t key, const Table * table) {
433+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
468434
return (0 == table->Contain(key));
469435
}
470436
};
@@ -480,9 +446,7 @@ struct FilterAPI<BloomFilter<ItemType, bits_per_item, branchless, HashFamily>> {
480446
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
481447
table->AddAll(keys, start, end);
482448
}
483-
484-
CONTAIN_ATTRIBUTES
485-
static bool Contain(uint64_t key, const Table * table) {
449+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
486450
return (0 == table->Contain(key));
487451
}
488452
};
@@ -497,8 +461,7 @@ struct FilterAPI<CountingBloomFilter<ItemType, bits_per_item, branchless, HashFa
497461
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
498462
table->AddAll(keys, start, end);
499463
}
500-
CONTAIN_ATTRIBUTES
501-
static bool Contain(uint64_t key, const Table * table) {
464+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
502465
return (0 == table->Contain(key));
503466
}
504467
};
@@ -513,8 +476,7 @@ struct FilterAPI<SuccinctCountingBloomFilter<ItemType, bits_per_item, branchless
513476
static void AddAll(const vector<ItemType> keys, const size_t start, const size_t end, Table* table) {
514477
table->AddAll(keys, start, end);
515478
}
516-
CONTAIN_ATTRIBUTES
517-
static bool Contain(uint64_t key, const Table * table) {
479+
CONTAIN_ATTRIBUTES static bool Contain(uint64_t key, const Table * table) {
518480
return (0 == table->Contain(key));
519481
}
520482
};

0 commit comments

Comments
 (0)