Add the script for automatic benchmarking

shangqi-lai · shangqi-lai · commit 37880be48291 · 2024-11-21T22:00:57.000+11:00
diff --git a/Core/SDSSECQClient.cpp b/Core/SDSSECQClient.cpp
@@ -9,7 +9,7 @@ Zr SDSSECQClient::Fp(uint8_t *input, size_t input_size, uint8_t *key) {
     return Zr(*e, (void*) PRF, DIGEST_SIZE);
 }
 
-SDSSECQClient::SDSSECQClient(int del_size) {
+SDSSECQClient::SDSSECQClient(int ins_size, int del_size) {
     // generate or load pairing
     FILE *sysParamFile = fopen("pairing.param", "r");
     e = new Pairing(sysParamFile);
@@ -35,8 +35,8 @@ SDSSECQClient::SDSSECQClient(int del_size) {
     fclose(saved_g);
 
     // initialise SSE instance
-    TEDB = new SSEClientHandler(del_size);
-    XEDB = new SSEClientHandler(del_size);
+    TEDB = new SSEClientHandler(ins_size, del_size);
+    XEDB = new SSEClientHandler(ins_size, del_size);
 }
 
 void SDSSECQClient::update(OP op, const string& keyword, int ind) {
diff --git a/Core/SDSSECQClient.h b/Core/SDSSECQClient.h
@@ -29,7 +29,7 @@ class SDSSECQClient {
     Zr Fp(uint8_t *input, size_t input_size, uint8_t *key);
 
 public:
-    explicit SDSSECQClient(int del_size);
+    explicit SDSSECQClient(int ins_size, int del_size);
     void update(OP op, const string& keyword, int ind);
     vector<int> search(int count, ...);
 };
diff --git a/Core/SDSSECQSClient.cpp b/Core/SDSSECQSClient.cpp
@@ -10,7 +10,7 @@ Zr SDSSECQSClient::Fp(uint8_t *input, size_t input_size, uint8_t *key) {
 }
 
 
-SDSSECQSClient::SDSSECQSClient(int del_size) {
+SDSSECQSClient::SDSSECQSClient(int ins_size, int del_size) {
     // generate or load pairing
     FILE *sysParamFile = fopen("pairing.param", "r");
     e = new Pairing(sysParamFile);
@@ -36,8 +36,8 @@ SDSSECQSClient::SDSSECQSClient(int del_size) {
     fclose(saved_g);
 
     // initialise SSE instance
-    TEDB = new SSEClientHandler(del_size);
-    XEDB = new SSEClientHandler(del_size);
+    TEDB = new SSEClientHandler(ins_size, del_size);
+    XEDB = new SSEClientHandler(ins_size, del_size);
 }
 
 void SDSSECQSClient::update(OP op, const string& keyword, int ind) {
diff --git a/Core/SDSSECQSClient.h b/Core/SDSSECQSClient.h
@@ -35,7 +35,7 @@ class SDSSECQSClient {
     Zr Fp(uint8_t *input, size_t input_size, uint8_t *key);
 
 public:
-    explicit SDSSECQSClient(int del_size);
+    explicit SDSSECQSClient(int ins_size, int del_size);
     void update(OP op, const string& keyword, int ind);
     vector<int> search(int count, ...);
 };
diff --git a/Core/SSEClientHandler.cpp b/Core/SSEClientHandler.cpp
@@ -1,7 +1,11 @@
 #include "SSEClientHandler.h"
 
-SSEClientHandler::SSEClientHandler(int del_size) {
-    this->GGM_SIZE = get_BF_size(HASH_SIZE, del_size, GGM_FP);
+SSEClientHandler::SSEClientHandler(int ins_size, int del_size) {
+    if (del_size == 0) {
+        this->GGM_SIZE = get_BF_size(HASH_SIZE, ins_size, GGM_FP);
+    } else {
+        this->GGM_SIZE = get_BF_size(HASH_SIZE, del_size, GGM_FP);
+    }
     this->delete_bf = new BloomFilter<32, HASH_SIZE>(GGM_SIZE);
     // init the GGM Tree
     tree = new GGMTree(GGM_SIZE);
diff --git a/Core/SSEClientHandler.h b/Core/SSEClientHandler.h
@@ -19,7 +19,7 @@ class SSEClientHandler {
 
     SSEServerHandler *server;
 public:
-    SSEClientHandler(int del_size);
+    SSEClientHandler(int ins_size, int del_size);
     ~SSEClientHandler();
     void update(OP op, const string& keyword, int ind, uint8_t* content, size_t content_len);
     vector<string> search(const string& keyword);
diff --git a/Data/Evaluation b/Data/Evaluation
@@ -0,0 +1,135 @@
+#!/bin/bash
+
+echo "Benchmark for SDSSE-CQ/SDSSE-CQ-S"
+
+echo -e "\nExperiment: SDSSE-CQ Search Time with Constant |w1| (without deletion)"
+
+echo -e "\nw1 = 10, w2 = 10"
+../build/SDSSECQ 10 10 0
+
+echo -e "\nw1 = 10, w2 = 100"
+../build/SDSSECQ 10 100 0
+
+echo -e "\nw1 = 10, w2 = 1000"
+../build/SDSSECQ 10 1000 0
+
+echo -e "\nw1 = 10, w2 = 10000"
+../build/SDSSECQ 10 10000 0
+
+echo -e "\nw1 = 10, w2 = 100000"
+../build/SDSSECQ 10 100000 0
+
+echo -e "\nExperiment: SDSSE-CQ-S Search Time with Constant |w1| (without deletion)"
+
+echo -e "\nw1 = 10, w2 = 10"
+../build/SDSSECQS 10 10 0
+
+echo -e "\nw1 = 10, w2 = 100"
+../build/SDSSECQS 10 100 0
+
+echo -e "\nw1 = 10, w2 = 1000"
+../build/SDSSECQS 10 1000 0
+
+echo -e "\nw1 = 10, w2 = 10000"
+../build/SDSSECQS 10 10000 0
+
+echo -e "\nw1 = 10, w2 = 100000"
+../build/SDSSECQS 10 100000 0
+
+echo -e "\nExperiment: SDSSE-CQ Search Time with Constant |w1| (with 10% deletion)"
+
+echo -e "\nw1 = 10, w2 = 10"
+../build/SDSSECQ 10 10 1
+
+echo -e "\nw1 = 10, w2 = 100"
+../build/SDSSECQ 10 100 1
+
+echo -e "\nw1 = 10, w2 = 1000"
+../build/SDSSECQ 10 1000 1
+
+echo -e "\nw1 = 10, w2 = 10000"
+../build/SDSSECQ 10 10000 1
+
+echo -e "\nw1 = 10, w2 = 100000"
+../build/SDSSECQ 10 100000 1
+
+echo -e "\nExperiment: SDSSE-CQ-S Search Time with Constant |w1| (with 10% deletion)"
+
+echo -e "\nw1 = 10, w2 = 10"
+../build/SDSSECQS 10 10 1
+
+echo -e "\nw1 = 10, w2 = 100"
+../build/SDSSECQS 10 100 1
+
+echo -e "\nw1 = 10, w2 = 1000"
+../build/SDSSECQS 10 1000 1
+
+echo -e "\nw1 = 10, w2 = 10000"
+../build/SDSSECQS 10 10000 1
+
+echo -e "\nw1 = 10, w2 = 100000"
+../build/SDSSECQS 10 100000 1
+
+echo -e "\nExperiment: SDSSE-CQ Search Time with Constant |w2| (without deletion)"
+echo -e "\nw1 = 10, w2 = 10"
+../build/SDSSECQ 10 10 0
+
+echo -e "\nw1 = 100, w2 = 10"
+../build/SDSSECQ 100 10 0
+
+echo -e "\nw1 = 1000, w2 = 10"
+../build/SDSSECQ 1000 10 0
+
+echo -e "\nw1 = 10000, w2 = 10"
+../build/SDSSECQ 10000 10 0
+
+echo -e "\nw1 = 100000, w2 = 10"
+../build/SDSSECQ 100000 10 0
+
+echo -e "\nExperiment: SDSSE-CQ-S Search Time with Constant |w2| (without deletion)"
+echo -e "\nw1 = 10, w2 = 10"
+../build/SDSSECQS 10 10 0
+
+echo -e "\nw1 = 100, w2 = 10"
+../build/SDSSECQS 100 10 0
+
+echo -e "\nw1 = 1000, w2 = 10"
+../build/SDSSECQS 1000 10 0
+
+echo -e "\nw1 = 10000, w2 = 10"
+../build/SDSSECQS 10000 10 0
+
+echo -e "\nw1 = 100000, w2 = 10"
+../build/SDSSECQS 100000 10 0
+
+echo -e "\nExperiment: SDSSE-CQ Search Time with Constant |w2| (with 10% deletion)"
+echo -e "\nw1 = 10, w2 = 10"
+../build/SDSSECQ 10 10 1
+
+echo -e "\nw1 = 100, w2 = 10"
+../build/SDSSECQ 100 10 10
+
+echo -e "\nw1 = 1000, w2 = 10"
+../build/SDSSECQ 1000 10 100
+
+echo -e "\nw1 = 10000, w2 = 10"
+../build/SDSSECQ 10000 10 1000
+
+echo -e "\nw1 = 100000, w2 = 10"
+../build/SDSSECQ 100000 10 10000
+
+echo -e "\nExperiment: SDSSE-CQ-S Search Time with Constant |w2| (with 10% deletion)"
+echo -e "\nw1 = 10, w2 = 10"
+../build/SDSSECQS 10 10 1
+
+echo -e "\nw1 = 100, w2 = 10"
+../build/SDSSECQS 100 10 10
+
+echo -e "\nw1 = 1000, w2 = 10"
+../build/SDSSECQS 1000 10 100
+
+echo -e "\nw1 = 10000, w2 = 10"
+../build/SDSSECQS 10000 10 1000
+
+echo -e "\nw1 = 100000, w2 = 10"
+../build/SDSSECQS 100000 10 10000
diff --git a/README.md b/README.md
@@ -105,11 +105,12 @@ As mentioned, the current implementation is a proof-of-concept prototype.To eval
 #### Dataset Size
 The source code of those test programs can be found in the root path of the project, namely `SDSSECQ.cpp` and `SDSSECQS.cpp`. The code in this repository inserts 1000 files with two keywords "Alice" and "Bob", deletes 100 files (10% deletion), and then executes the conjunctive query ("Alice" AND "Bob"). To enlarge the size of dataset, one can modify the above two files by increasing the numbers of insertions/deletions or adding more keywords.
 
-Besides, as the number of keyword-id pairs increases, we should use a larger Bloom filter to keep the XSet for conjunctive queries. Hence, the `XSET_SIZE` and `XSET_HASH` in `Util
-/CommonUtil.h` should be updated accordingly. Note that the current parameters `XSET_SIZE=2875518` and `XSET_HASH=20` can support conjunctive queries against a dataset with 100k keyword-id pairs with less than 10^-7 false positive rate. We would refer our readers to [here](https://hur.st/bloomfilter/) to compute the new Bloom filter parameters as required.
+Besides, as the number of keyword-id pairs increases, we should use a larger Bloom filter to keep the XSet for conjunctive queries. Hence, the `MAX_DB_SIZE`, `XSET_FP`, and `XSET_HASH` in `Util
+/CommonUtil.h` should be updated accordingly. Note that the current parameters `MAX_DB_SIZE=100000`, `XSET_FP=0.0000001` and `XSET_HASH=20` can support conjunctive queries against a dataset with 100k keyword-id pairs with less than 10^-7 false positive rate. 
 
 #### Deletion
-Since the deletion is also based on Bloom filter, there are another two Bloom filter parameters, i.e., `GGM_SIZE` and `HASH_SIZE` to be set with the increasing number of deletion operations. The current parameters are `GGM_SIZE=579521` and `HASH_SIZE=5`, which are sufficient for 100 deletions (with only 10^-21 false positive rate) in the test code. Please also update these two parameters when the number of deletion increases by referring to the above Bloom filter calculator.
+Since the deletion is also based on Bloom filter, there are another two Bloom filter parameters, i.e., `GGM_FP` and `HASH_SIZE` to be set to help the code automatically derive the Bloom filter size for the GGM tree.
+The current parameters are `GGM_FP=0.0001` and `HASH_SIZE=5`, which is designed to achieve 10^-4 false positive rate with the 5 hash functions in the test code. Please also update these two parameters if you are looking for a smaller false positive rate or GGM tree size (more hash functions lead to a smaller tree).
 
 ### Main Results and Claims
 
diff --git a/SDSSECQ.cpp b/SDSSECQ.cpp
@@ -15,7 +15,7 @@ int main(int argc, char *argv[]) {
     int w2_size = atoi(argv[2]);
     int del_size = atoi(argv[3]);
 
-    SDSSECQClient client(del_size);
+    SDSSECQClient client(1, del_size);
 
     auto start = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
     for (int i = 0; i < w1_size; ++i) {
@@ -37,10 +37,10 @@ int main(int argc, char *argv[]) {
     start = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
     vector<int> single_results = client.search(1, "alice");
     end = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
-    cout << "Single Keyword Search Time: " << (end - start) / 1000 << " ms" << endl;
+    cout << "Single Keyword Search Time: " << (float)(end - start) / 1000 << " ms" << endl;
     start = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
     vector<int> conjunctive_results = client.search(2, "alice", "bob");
     end = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
-    cout << "Two-Keyword Conjunctive Search Time: " << (end - start) / 1000 << " ms" << endl;
+    cout << "Two-Keyword Conjunctive Search Time: " << (float)(end - start) / 1000 << " ms" << endl;
     return 0;
 }
diff --git a/SDSSECQS.cpp b/SDSSECQS.cpp
@@ -15,7 +15,7 @@ int main(int argc, char *argv[]) {
     int w2_size = atoi(argv[2]);
     int del_size = atoi(argv[3]);
 
-    SDSSECQSClient client(del_size);
+    SDSSECQSClient client(1, del_size);
 
     auto start = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
     for (int i = 0; i < w1_size; ++i) {
@@ -37,10 +37,10 @@ int main(int argc, char *argv[]) {
     start = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
     vector<int> single_results = client.search(1, "alice");
     end = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
-    cout << "Single Keyword Search Time: " << (end - start) / 1000 << " ms" << endl;
+    cout << "Single Keyword Search Time: " << (float)(end - start) / 1000 << " ms" << endl;
     start = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
     vector<int> conjunctive_results = client.search(2, "alice", "bob");
     end = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
-    cout << "Two-Keyword Conjunctive Search Time: " << (end - start) / 1000 << " ms" << endl;
+    cout << "Two-Keyword Conjunctive Search Time: " << (float)(end - start) / 1000 << " ms" << endl;
     return 0;
 }
diff --git a/Test/BloomFilterTest.cpp b/Test/BloomFilterTest.cpp
@@ -4,7 +4,7 @@
 
 
 int main() {
-    auto BF_size = get_BF_size(20, 3);
+    auto BF_size = get_BF_size(20, 3, 0.0000001);
 
     BloomFilter<1, 20> bf(BF_size);
 
diff --git a/Test/SSETest.cpp b/Test/SSETest.cpp
@@ -1,7 +1,7 @@
 #include "Core/SSEClientHandler.h"
 
 int main() {
-    SSEClientHandler client;
+    SSEClientHandler client(200, 10);
 
 //    cout << duration_cast<microseconds>(system_clock::now().time_since_epoch()).count() << endl;
     for (int i = 0; i < 200; ++i) {
