fix(S3): Keys in s3store tests

Author: mcakircali

src/fdb5/database/Key.cc

@@ -32,6 +32,8 @@ Key::Key(const TypesRegistry* reg) :
 
 Key::Key(const TypesRegistry& reg) : Key(&reg) {}
 
+Key::Key(const std::string& s, const TypesRegistry& reg) : Key(parseString(s,reg)) {}
+
 Key::Key(const std::string &s, const Rule *rule) :
     keys_(),
     registry_(rule ? &rule->registry() : nullptr) {

src/fdb5/database/Key.h

@@ -48,6 +48,8 @@ class Key {
     explicit Key(const TypesRegistry* reg=nullptr);
     explicit Key(const TypesRegistry& reg);
 
+    explicit Key(const std::string& s, const TypesRegistry& reg);
+
     explicit Key(eckit::Stream &, const TypesRegistry* reg=nullptr);
     explicit Key(eckit::Stream &, const TypesRegistry& reg);
     /// @todo remove ?? explicit Key(const std::string &request, const TypesRegistry* reg=nullptr);

src/fdb5/s3/S3Common.cc

@@ -14,6 +14,10 @@
 #include "eckit/io/s3/S3Credential.h"
 #include "eckit/io/s3/S3Session.h"
 
+#include "metkit/mars/MarsRequest.h"
+
+#include "fdb5/config/Config.h"
+#include "fdb5/rules/Schema.h"
 #include "fdb5/s3/S3Common.h"
 
 // #include "eckit/exception/Exceptions.h"
@@ -30,8 +34,9 @@ S3Common::S3Common(const fdb5::Config& config, const std::string& component, con
 
 
     /// @note: code for bucket per DB
-
-    std::string keyStr = key.valuesToString();
+    Key keyInternal(key);
+    keyInternal.registry(config.schema().registry());
+    std::string keyStr = keyInternal.valuesToString();
     std::replace(keyStr.begin(), keyStr.end(), ':', '-');
     db_bucket_ = prefix_ + keyStr;
 

tests/fdb/s3/test_s3_store.cc

@@ -187,9 +187,9 @@ CASE("S3Store tests") {
 
         fdb5::Schema schema{schema_file()};
 
-        fdb5::Key request_key{"a=1,b=2,c=3,d=4,e=5,f=6"};
-        fdb5::Key db_key{"a=1,b=2"};
-        fdb5::Key index_key{"c=3,d=4"};
+        fdb5::Key request_key{"a=1,b=2,c=3,d=4,e=5,f=6",schema.registry()};
+        fdb5::Key db_key{"a=1,b=2",schema.registry()};
+        fdb5::Key index_key{"c=3,d=4",schema.registry()};
 
         char data[] = "test";
 
@@ -250,10 +250,10 @@ CASE("S3Store tests") {
 
         // request
 
-        fdb5::Key request_key{"a=1,b=2,c=3,d=4,e=5,f=6"};
-        fdb5::Key db_key{"a=1,b=2"};
-        fdb5::Key index_key{"c=3,d=4"};
-        fdb5::Key field_key{"e=5,f=6"};
+        fdb5::Key request_key{"a=1,b=2,c=3,d=4,e=5,f=6",schema.registry()};
+        fdb5::Key db_key{"a=1,b=2",schema.registry()};
+        fdb5::Key index_key{"c=3,d=4",schema.registry()};
+        fdb5::Key field_key{"e=5,f=6",schema.registry()};
 
         // store data
 
@@ -347,9 +347,9 @@ CASE("S3Store tests") {
 
         // request
 
-        fdb5::Key request_key{"a=1,b=2,c=3,d=4,e=5,f=6"};
-        fdb5::Key index_key{"a=1,b=2,c=3,d=4"};
-        fdb5::Key db_key{"a=1,b=2"};
+        fdb5::Key request_key{"a=1,b=2,c=3,d=4,e=5,f=6",config.schema().registry()};
+        fdb5::Key index_key{"a=1,b=2,c=3,d=4",config.schema().registry()};
+        fdb5::Key db_key{"a=1,b=2",config.schema().registry()};
 
         fdb5::FDBToolRequest full_req{
             request_key.request("retrieve"), 
@@ -467,6 +467,8 @@ CASE("S3Store tests") {
 
         std::string prefix{"test4-"};
 
+        ensureClean(prefix);
+
         // FDB configuration
 
         std::string config_str{
@@ -484,9 +486,9 @@ CASE("S3Store tests") {
 
         // request
 
-        fdb5::Key request_key{"a=1,b=2,c=3,d=4,e=5,f=6"};
-        fdb5::Key index_key{"a=1,b=2,c=3,d=4"};
-        fdb5::Key db_key{"a=1,b=2"};
+        fdb5::Key request_key{"a=1,b=2,c=3,d=4,e=5,f=6",config.schema().registry()};
+        fdb5::Key index_key{"a=1,b=2,c=3,d=4",config.schema().registry()};
+        fdb5::Key db_key{"a=1,b=2",config.schema().registry()};
 
         fdb5::FDBToolRequest full_req{
             request_key.request("retrieve"),