Non-default types for keys

cpp/CMakeLists.txt

@@ -7,6 +7,9 @@ set(DS_DIR "ds")
 set(BUILD_DIR "bin/")
 set(RECLAIM ".debra")
 
+# Flag for key type usage
+add_definitions("-DUSE_LONG_LONG")
+
 #set(SOURCE_EXE main.cpp)
 #set(CMAKE_CXX_FLAGS "-lpthread -ldl -mrtm")
 list(APPEND CMAKE_CXX_FLAGS_LIST "-lpthread -ldl -mrtm ")

cpp/microbench/global_types.h

@@ -0,0 +1,22 @@
+#ifndef GLOBAL_TYPES_H
+#define GLOBAL_TYPES_H
+
+#ifdef REDIS
+    typedef KEY_TYPE VALUE_TYPE;
+#else
+    typedef void * VALUE_TYPE;
+#endif
+
+#ifdef USE_STRING
+    #define KEY_TYPE std::string
+#endif
+
+#ifdef USE_LONG_LONG
+    #define KEY_TYPE long long
+#endif
+
+#ifndef KEY_TYPE
+    #define KEY_TYPE long long
+#endif
+
+#endif //SETBENCH_GLOBALS_T_H

cpp/microbench/globals_extern.h

@@ -12,6 +12,7 @@
 //#define USE_TRACE
 
 #include <string>
+#include "global_types.h"
 
 #ifdef MAIN_BENCH
 

cpp/microbench/globals_t.h

@@ -1,23 +1,21 @@
 //
 // Created by Ravil Galiev on 26.07.2023.
 //
-
 #ifndef SETBENCH_GLOBALS_T_H
 #define SETBENCH_GLOBALS_T_H
 
-typedef long long test_type;
+#include "global_types.h"
 
 #ifdef REDIS
     #define VALUE_TYPE test_type
     #define KEY_TO_VALUE(key) key
     #define GET_FUNC executeContains
 #else
-    #define VALUE_TYPE void *
     #define KEY_TO_VALUE(key) &key /* note: hack to turn a key into a pointer */
     #define GET_FUNC executeGet
 #endif
 
-#define DS_ADAPTER_T ds_adapter<test_type, VALUE_TYPE, RECLAIM<>, ALLOC<>, POOL<> >
+#define DS_ADAPTER_T ds_adapter<KEY_TYPE, VALUE_TYPE, RECLAIM<>, ALLOC<>, POOL<> >
 
 struct globals_t;
 

cpp/microbench/globals_t_impl.h

@@ -5,7 +5,7 @@
 #ifndef SETBENCH_GLOBALS_T_IMPL_H
 #define SETBENCH_GLOBALS_T_IMPL_H
 
-typedef long long test_type;
+// typedef long long test_type;
 
 //#ifdef REDIS
 //    #define VALUE_TYPE test_type
@@ -32,8 +32,8 @@ struct globals_t {
     // const
 //    void *const NO_VALUE;
     VALUE_TYPE const NO_VALUE;
-    const test_type KEY_MIN; // must be smaller than any key that can be inserted/deleted
-    const test_type KEY_MAX; // must be less than std::max(), because the snap collector needs a reserved key larger than this! (and larger than any key that can be inserted/deleted)
+    const KEY_TYPE KEY_MIN; // must be smaller than any key that can be inserted/deleted
+    const KEY_TYPE KEY_MAX; // must be less than std::max(), because the snap collector needs a reserved key larger than this! (and larger than any key that can be inserted/deleted)
     const long long PREFILL_INTERVAL_MILLIS;
     PAD;
     // write once
@@ -48,7 +48,7 @@ struct globals_t {
     PAD;
     long elapsedMillisNapping;
     PAD;
-    volatile test_type garbage; // used to prevent optimizing out some code
+    volatile long long garbage; // used to prevent optimizing out some code
     PAD;
     DS_ADAPTER_T *dsAdapter; // the data structure
     PAD;
@@ -66,8 +66,10 @@ struct globals_t {
     PAD;
 
     globals_t(BenchParameters * _benchParameters)
-            : NO_VALUE(NULL), KEY_MIN(0) /*std::numeric_limits<test_type>::min()+1)*/
-            , KEY_MAX(_benchParameters->range + 1), PREFILL_INTERVAL_MILLIS(200),
+            : NO_VALUE(NULL)
+            , KEY_MIN(_benchParameters->dataMap->get_min()) /*std::numeric_limits<test_type>::min()+1)*/
+            , KEY_MAX(_benchParameters->dataMap->get_max(_benchParameters->range + 1))
+            , PREFILL_INTERVAL_MILLIS(200),
               benchParameters(_benchParameters) {
         debug_print = 0;
         srand(time(0));

cpp/microbench/json_example/creakers_and_wave_example.json

@@ -13,8 +13,8 @@
                     "argsGeneratorBuilder": {
                         "ClassName": "CreakersAndWavePrefillArgsGeneratorBuilder",
                         "creakersSize": 0.1,
-                        "dataMapBuilder": {
-                            "ClassName": "IdDataMapBuilder",
+                        "indexMapBuilder": {
+                            "ClassName": "IdIndexMapBuilder",
                             "id": 1
                         },
                         "waveSize": 0.2
@@ -53,8 +53,8 @@
                         },
                         "creakersRatio": 0.2,
                         "creakersSize": 0.1,
-                        "dataMapBuilder": {
-                            "ClassName": "IdDataMapBuilder",
+                        "indexMapBuilder": {
+                            "ClassName": "IdIndexMapBuilder",
                             "id": 1
                         },
                         "waveDistBuilder": {

cpp/microbench/json_example/example.json

@@ -12,8 +12,8 @@
                     "ClassName": "PrefillInsertThreadLoopBuilder",
                     "argsGeneratorBuilder": {
                         "ClassName": "DefaultArgsGeneratorBuilder",
-                        "dataMapBuilder": {
-                            "ClassName": "IdDataMapBuilder",
+                        "indexMapBuilder": {
+                            "ClassName": "IdIndexMapBuilder",
                             "id": 4
                         },
                         "distributionBuilder": {
@@ -26,6 +26,7 @@
         ]
     },
     "range": 2048,
+    "dataMap": "IntDataMap",
     "test": {
         "numThreads": 8,
         "stopCondition": {
@@ -40,8 +41,8 @@
                     "ClassName": "DefaultThreadLoopBuilder",
                     "argsGeneratorBuilder": {
                         "ClassName": "DefaultArgsGeneratorBuilder",
-                        "dataMapBuilder": {
-                            "ClassName": "ArrayDataMapBuilder",
+                        "indexMapBuilder": {
+                            "ClassName": "ArrayIndexMapBuilder",
                             "id": 1
                         },
                         "distributionBuilder": {

cpp/microbench/json_example/generalized_example.json

@@ -12,8 +12,8 @@
                     "ClassName": "PrefillInsertThreadLoopBuilder",
                     "argsGeneratorBuilder": {
                         "ClassName": "DefaultArgsGeneratorBuilder",
-                        "dataMapBuilder": {
-                            "ClassName": "IdDataMapBuilder",
+                        "indexMapBuilder": {
+                            "ClassName": "IdIndexMapBuilder",
                             "id": 4
                         },
                         "distributionBuilder": {
@@ -54,8 +54,8 @@
                                 "opers": ["get", "insert", "remove"], 
                                 "argsGeneratorBuilder": {
                                     "ClassName": "DefaultArgsGeneratorBuilder",
-                                    "dataMapBuilder": {
-                                        "ClassName": "ArrayDataMapBuilder",
+                                    "indexMapBuilder": {
+                                        "ClassName": "ArrayIndexMapBuilder",
                                         "id": 1
                                     },
                                     "distributionBuilder": {

cpp/microbench/json_example/json_example.cpp

@@ -21,7 +21,7 @@ typedef long long ll;
 ArgsGeneratorBuilder* getDefaultArgsGeneratorBuilder() {
     return (new DefaultArgsGeneratorBuilder())
         ->setDistributionBuilder((new ZipfianDistributionBuilder())->setAlpha(1.0))
-        ->setDataMapBuilder(new ArrayDataMapBuilder());
+        ->setIndexMapBuilder(new ArrayIndexMapBuilder());
 }
 
 ArgsGeneratorBuilder* getTemporarySkewedArgsGeneratorBuilder() {
@@ -43,7 +43,7 @@ ArgsGeneratorBuilder* getCreakersAndWaveArgsGeneratorBuilder() {
         ->setCreakersRatio(0.2)
         ->setWaveSize(0.2)
         ->setCreakersSize(0.1)
-        ->setDataMapBuilder(new IdDataMapBuilder());
+        ->setIndexMapBuilder(new IdIndexMapBuilder());
 }
 
 ArgsGeneratorBuilder* getNullArgsGeneratorBuilder() {
@@ -53,7 +53,7 @@ ArgsGeneratorBuilder* getNullArgsGeneratorBuilder() {
 ArgsGeneratorBuilder* getRangeQueryArgsGeneratorBuilder() {
     return (new RangeQueryArgsGeneratorBuilder())
     ->setDistributionBuilder((new ZipfianDistributionBuilder())->setAlpha(1.0))
-    ->setDataMapBuilder(new ArrayDataMapBuilder())
+    ->setIndexMapBuilder(new ArrayIndexMapBuilder())
     ->setInterval(100);
 }
 
@@ -65,7 +65,7 @@ ArgsGeneratorBuilder* getGeneralizedArgsGeneratorBuilder(ArgsGeneratorBuilder* i
         ->addArgsGeneratorBuilder({"remove"}, getDefaultArgsGeneratorBuilder())
         ->addArgsGeneratorBuilder({"rangeQuery"}, getRangeQueryArgsGeneratorBuilder());
         // ->setDistributionBuilder((new ZipfianDistributionBuilder())->setAlpha(1.0))
-        // ->setDataMapBuilder(new ArrayDataMapBuilder()));
+        // ->setIndexMapBuilder(new ArrayIndexMapBuilder()));
 }
 
 ThreadLoopBuilder* getDefaultThreadLoopBuilder(ArgsGeneratorBuilder* argsGeneratorBuilder) {