Handle '=' in tiledb config values (#605)

Author: gspowley

Makefile

@@ -58,11 +58,15 @@ docs:
 check-format:
 	@./ci/run-clang-format.sh . clang-format 0 \
 		`find libtiledbvcf/src -name "*.cc" -or -name "*.h"`
+	@./ci/run-clang-format.sh . clang-format 0 \
+		`find libtiledbvcf/test -name "*.cc" -or -name "*.h"`
 
 .PHONY: format
 format:
 	 @./ci/run-clang-format.sh . clang-format 1 \
 		`find libtiledbvcf/src -name "*.cc" -or -name "*.h"`
+	 @./ci/run-clang-format.sh . clang-format 1 \
+		`find libtiledbvcf/test -name "*.cc" -or -name "*.h"`
 
 # clean
 # -------------------------------------------------------------------

libtiledbvcf/src/utils/utils.cc

@@ -299,14 +299,16 @@ void set_tiledb_config_map(
     const std::vector<std::string>& params,
     std::unordered_map<std::string, std::string>* cfg) {
   for (const auto& s : params) {
-    auto kv = utils::split(s, '=');
-    if (kv.size() != 2)
+    auto pos = s.find('=');
+    if (pos == std::string::npos) {
       throw std::runtime_error(
           "Error setting TileDB config parameter; bad value '" + s + "'");
-
-    utils::trim(&kv[0]);
-    utils::trim(&kv[1]);
-    cfg->emplace(kv[0], kv[1]);
+    }
+    auto key = s.substr(0, pos);
+    auto value = s.substr(pos + 1);
+    utils::trim(&key);
+    utils::trim(&value);
+    cfg->emplace(key, value);
   }
 }
 
@@ -319,13 +321,16 @@ void set_tiledb_config(
     const std::vector<std::string>& params, tiledb_config_t* cfg) {
   tiledb_error_t* err;
   for (const auto& s : params) {
-    auto kv = utils::split(s, '=');
-    if (kv.size() != 2)
+    auto pos = s.find('=');
+    if (pos == std::string::npos) {
       throw std::runtime_error(
           "Error setting TileDB config parameter; bad value '" + s + "'");
-    utils::trim(&kv[0]);
-    utils::trim(&kv[1]);
-    tiledb_config_set(cfg, kv[0].c_str(), kv[1].c_str(), &err);
+    }
+    auto key = s.substr(0, pos);
+    auto value = s.substr(pos + 1);
+    utils::trim(&key);
+    utils::trim(&value);
+    tiledb_config_set(cfg, key.c_str(), value.c_str(), &err);
     tiledb::impl::check_config_error(err);
   }
 }

libtiledbvcf/test/run-cli-tests.sh

@@ -499,6 +499,10 @@ $tilevcf utils vacuum commits -u ${uri} --log-level trace
 $tilevcf utils vacuum fragment_meta -u ${uri} --log-level trace
 $tilevcf utils vacuum fragments -u ${uri} --log-level trace
 
+# test tiledb-config parsing
+# -------------------------------------------------------------------
+$tilevcf create -u tmp --tiledb-config vfs.azure.storage_sas_token=?sv=123456789== || exit 1
+
 # Expected failures
 echo ""
 echo "** Expected failure error messages follow:"

libtiledbvcf/test/src/unit-c-api-reader.cc

@@ -422,7 +422,8 @@ TEST_CASE("C API: Reader set config", "[capi][query]") {
 
   SECTION("- Valid options") {
     const char* config =
-        "sm.compute_concurrency_level=4, vfs.s3.proxy_host=abc.def.ghi";
+        "sm.compute_concurrency_level=4, vfs.s3.proxy_host=abc.def.ghi, "
+        "vfs.azure.storage_sas_token=?sv=123456789==";
     REQUIRE(
         tiledb_vcf_reader_set_tiledb_config(reader, config) == TILEDB_VCF_OK);
   }