Remove key_prefix from keys() call

Signed-off-by: James Mulcahy <[email protected]>

Author: jamesmulcahy

include/proxy-wasm/context.h

@@ -353,8 +353,7 @@ class ContextBase : public RootInterface,
   WasmResult getSharedData(std::string_view key,
                            std::pair<std::string, uint32_t /* cas */> *data) override;
   WasmResult setSharedData(std::string_view key, std::string_view value, uint32_t cas) override;
-  WasmResult getSharedDataKeys(std::string_view key_prefix,
-                               std::vector<std::string> *result) override;
+  WasmResult getSharedDataKeys(std::vector<std::string> *result) override;
   WasmResult removeSharedDataKey(std::string_view key, uint32_t cas,
                                  std::pair<std::string, uint32_t> *result) override;
 

include/proxy-wasm/context_interface.h

@@ -596,7 +596,7 @@ struct GeneralInterface {
 };
 
 /**
- * SharedDataInterface is for shaing data between VMs. In general the VMs may be on different
+ * SharedDataInterface is for sharing data between VMs. In general the VMs may be on different
  * threads.  Keys can have any format, but good practice would use reverse DNS and namespacing
  * prefixes to avoid conflicts.
  */
@@ -623,12 +623,10 @@ struct SharedDataInterface {
   virtual WasmResult setSharedData(std::string_view key, std::string_view value, uint32_t cas) = 0;
 
   /**
-   * Return all the keys which match the given key_prefix
-   * @param key_prefix is used to restrict the results to keys matching the given prefix
+   * Return all the keys from the data shraed between VMs
    * @param data is a location to store the returned value.
    */
-  virtual WasmResult getSharedDataKeys(std::string_view key_prefix,
-                                       std::vector<std::string> *result) = 0;
+  virtual WasmResult getSharedDataKeys(std::vector<std::string> *result) = 0;
 
   /**
    * Removes the given key from the data shared between VMs.

src/context.cc

@@ -192,9 +192,8 @@ WasmResult ContextBase::setSharedData(std::string_view key, std::string_view val
   return getGlobalSharedData().set(wasm_->vm_id(), key, value, cas);
 }
 
-WasmResult ContextBase::getSharedDataKeys(std::string_view key_prefix,
-                                          std::vector<std::string> *result) {
-  return getGlobalSharedData().keys(wasm_->vm_id(), key_prefix, result);
+WasmResult ContextBase::getSharedDataKeys(std::vector<std::string> *result) {
+  return getGlobalSharedData().keys(wasm_->vm_id(), result);
 }
 
 WasmResult ContextBase::removeSharedDataKey(std::string_view key, uint32_t cas,

src/shared_data.cc

@@ -56,8 +56,7 @@ WasmResult SharedData::get(std::string_view vm_id, const std::string_view key,
   return WasmResult::NotFound;
 }
 
-WasmResult SharedData::keys(std::string_view vm_id, const std::string_view key_prefix,
-                            std::vector<std::string> *result) {
+WasmResult SharedData::keys(std::string_view vm_id, std::vector<std::string> *result) {
   result->clear();
 
   std::lock_guard<std::mutex> lock(mutex_);
@@ -67,9 +66,7 @@ WasmResult SharedData::keys(std::string_view vm_id, const std::string_view key_p
   }
 
   for (auto kv : map->second) {
-    if (kv.first.rfind(key_prefix, 0) == 0) {
-      result->push_back(kv.first);
-    }
+    result->push_back(kv.first);
   }
 
   return WasmResult::Ok;

src/shared_data.h

@@ -25,8 +25,7 @@ class SharedData {
   SharedData(bool register_vm_id_callback = true);
   WasmResult get(std::string_view vm_id, const std::string_view key,
                  std::pair<std::string, uint32_t> *result);
-  WasmResult keys(std::string_view vm_id, const std::string_view key_prefix,
-                  std::vector<std::string> *result);
+  WasmResult keys(std::string_view vm_id, std::vector<std::string> *result);
   WasmResult set(std::string_view vm_id, std::string_view key, std::string_view value,
                  uint32_t cas);
   WasmResult remove(std::string_view vm_id, const std::string_view key, uint32_t cas,

test/shared_data_test.cc

@@ -29,14 +29,14 @@ TEST(SharedData, SingleThread) {
   // Validate we get an 'Ok' response when fetching keys before anything
   // is initialized.
   std::vector<std::string> keys;
-  EXPECT_EQ(WasmResult::Ok, shared_data.keys(vm_id, "", &keys));
+  EXPECT_EQ(WasmResult::Ok, shared_data.keys(vm_id, &keys));
   EXPECT_EQ(0, keys.size());
 
   // Validate that we clear the result set
   std::vector<std::string> nonEmptyKeys(2);
   nonEmptyKeys[0] = "valueA";
   nonEmptyKeys[1] = "valueB";
-  EXPECT_EQ(WasmResult::Ok, shared_data.keys(vm_id, "", &nonEmptyKeys));
+  EXPECT_EQ(WasmResult::Ok, shared_data.keys(vm_id, &nonEmptyKeys));
   EXPECT_EQ(0, nonEmptyKeys.size());
 
   std::pair<std::string, uint32_t> result;
@@ -59,19 +59,13 @@ TEST(SharedData, SingleThread) {
   EXPECT_EQ(value, result.first);
   EXPECT_EQ(result.second, 3);
 
-  EXPECT_EQ(WasmResult::Ok, shared_data.keys(vm_id, "unmatched-prefix", &keys));
-  EXPECT_EQ(0, keys.size());
-
-  EXPECT_EQ(WasmResult::Ok, shared_data.keys(vm_id, "keyyyyy", &keys));
-  EXPECT_EQ(0, keys.size());
-
-  EXPECT_EQ(WasmResult::Ok, shared_data.keys(vm_id, "ke", &keys));
+  EXPECT_EQ(WasmResult::Ok, shared_data.keys(vm_id, &keys));
   EXPECT_EQ(1, keys.size());
   EXPECT_EQ(key, keys[0]);
 
   keys.clear();
   EXPECT_EQ(WasmResult::CasMismatch, shared_data.remove(vm_id, key, 911, nullptr));
-  EXPECT_EQ(WasmResult::Ok, shared_data.keys(vm_id, "ke", &keys));
+  EXPECT_EQ(WasmResult::Ok, shared_data.keys(vm_id, &keys));
   EXPECT_EQ(1, keys.size());
 
   EXPECT_EQ(WasmResult::Ok, shared_data.remove(vm_id, key, 0, nullptr));