Remove temporary objects in the code

Author: shangqi-lai

Core/SDSSECQSClient.cpp

@@ -126,28 +126,32 @@ vector<int> SDSSECQSClient::search(int count, ...) {
             vector<GT> token_i;
             // compute z=Fp(K_Z, w||i)
             Zr z = Fp(w_i, sizeof(w_i), K_Z);
+            token_i.reserve(xterms.size());
             for (const string &xterm: xterms) {
                 token_i.emplace_back((*gpp) ^ (z * Fp((uint8_t *) xterm.c_str(), xterm.size(), K_X)
                                                * Fp((uint8_t *) sterm.c_str(), sterm.size(), K_z)));
-                // if xterm is never inserted, return an empty vector
-                if (CT.find(xterm) == CT.end()) {
-                    return {};
-                }
-                vector<Zr> zx_i;
-                for (int k = 0; k <= CT[xterm]; k++) {
-                    // w_j=w||j
-                    uint8_t w_j[xterm.size() + sizeof(int)];
-                    // reset the buffer
-                    memset(w_j, 0, xterm.size() + sizeof(int));
-                    memcpy(w_j, xterm.c_str(), xterm.size());
-                    memcpy(w_j + xterm.size(), (uint8_t *) &k, sizeof(int));
-                    zx_i.emplace_back(Fp(w_j, sizeof(w_j), K_x)
-                                      * Fp((uint8_t *) sterm.c_str(), sterm.size(), K_z));
-                }
-                zxtoken_list.emplace_back(zx_i);
             }
             wxtoken_list.emplace_back(token_i);
         }
+
+        for (const string &xterm: xterms) {
+            // if xterm is never inserted, return an empty vector
+            if (CT.find(xterm) == CT.end()) {
+                return {};
+            }
+            vector<Zr> zx_i;
+            for (int k = 0; k <= CT[xterm]; k++) {
+                // w_j=w||j
+                uint8_t w_j[xterm.size() + sizeof(int)];
+                // reset the buffer
+                memset(w_j, 0, xterm.size() + sizeof(int));
+                memcpy(w_j, xterm.c_str(), xterm.size());
+                memcpy(w_j + xterm.size(), (uint8_t *) &k, sizeof(int));
+                zx_i.emplace_back(Fp(w_j, sizeof(w_j), K_x)
+                                  * Fp((uint8_t *) sterm.c_str(), sterm.size(), K_z));
+            }
+            zxtoken_list.emplace_back(zx_i);
+        }
     }
     va_end(keyword_list);
 

Core/SSEClientHandler.cpp

@@ -77,6 +77,7 @@ vector<string> SSEClientHandler::search(const string& keyword) {
                 token);
     // search all deleted positions
     vector<long> bf_pos;
+    bf_pos.reserve(GGM_SIZE);
     for (int i = 0; i < GGM_SIZE; ++i) {
         bf_pos.emplace_back(i);
     }
@@ -89,7 +90,7 @@ vector<string> SSEClientHandler::search(const string& keyword) {
     vector<GGMNode> node_list;
     node_list.reserve(remain_pos.size());
     for (long pos : remain_pos) {
-        node_list.emplace_back(GGMNode(pos, tree->get_level()));
+        node_list.emplace_back(pos, tree->get_level());
     }
     vector<GGMNode> remain_node = tree->min_coverage(node_list);
     // compute the key set and send to the server

Core/SSEServerHandler.cpp

@@ -45,7 +45,7 @@ vector<string> SSEServerHandler::search(uint8_t *token, const vector<GGMNode>& n
                                    derive_key, (uint8_t *) ciphertext_list[i].c_str(),
                         res);
             if(size > 0) {
-                res_list.emplace_back(string(reinterpret_cast<const char *>(res), ciphertext_list[i].size() - AES_BLOCK_SIZE));
+                res_list.emplace_back(reinterpret_cast<const char *>(res), ciphertext_list[i].size() - AES_BLOCK_SIZE);
             }
             break;
         }