HPCC-33539 Support brackets in the compression options

Signed-off-by: Gavin Halliday <[email protected]>

Author: ghalliday

system/jlib/jstring.cpp

@@ -2829,6 +2829,12 @@ bool loadBinaryFile(StringBuffer & contents, const char *filename, bool throwOnE
     return ok;
 }
 
+
+//Support option1=value1,option2(value2),option3,option4(nested=value,nested(value))
+// option1: value1
+// option2: value2
+// option3: 1
+// option4: nested=value,nested(value)
 void processOptionString(const char * options, optionCallback callback)
 {
     if (!options || !callback)
@@ -2838,33 +2844,61 @@ void processOptionString(const char * options, optionCallback callback)
     StringBuffer value;
     while (true)
     {
-        const char * comma = strchr(options, ',');
-        const char * eq = strchr(options, '=');
-        if (comma && eq)
+        const char * start = options;
+        const char * endname = nullptr;
+        const char * end = nullptr;
+        const char * comma = nullptr;
+        unsigned nesting = 0;
+        for (;;)
         {
-            if (comma < eq)
-                eq = nullptr;
-            else
+            byte next = *options;
+            if (next == '\0')
+                break;
+            else if (next == '(')
+            {
+                if ((nesting++ == 0) && !endname)
+                    endname = options;
+            }
+            else if (next == ')')
+            {
+                if (nesting && --nesting==0 && !end)
+                {
+                    end = options;
+                    //All text after the closing ) until a comma is ignored.
+                }
+            }
+            else if (next == '=')
+            {
+                if (!nesting && !endname)
+                {
+                    endname = options;
+                }
+            }
+            else if (next == ',' && nesting == 0)
             {
-                //Could optionally see if the value is quoted, and if so scan for the terminator to allow quoted commas
-                //but then you may have problems with quoted quotes... so leave as-is for the moment
+                if (!end)
+                    end = options;
+                comma = options;
+                break;
             }
+            options++;
         }
+
         option.clear();
         value.clear();
-        if (eq)
+        if (endname)
         {
-            option.append(eq-options, options);
-            if (comma)
-                value.append(comma-(eq+1), eq+1);
+            option.append(endname-start, start);
+            if (end)
+                value.append(end-(endname+1), endname+1);
             else
-                value.append(eq+1);
+                value.append(endname+1);
         }
         else
         {
             value.append("1");
-            if (comma)
-                option.append(comma-options, options);
+            if (end)
+                option.append(end-start, start);
             else
                 option.append(options);
         }

testing/unittests/jlibtests.cpp

@@ -4635,6 +4635,7 @@ class JLibStringTest : public CppUnit::TestFixture
     CPPUNIT_TEST_SUITE(JLibStringTest);
         CPPUNIT_TEST(testStristr);
         CPPUNIT_TEST(testMemMem);
+        CPPUNIT_TEST(testProcessOptions);
     CPPUNIT_TEST_SUITE_END();
 
     void testStristr()
@@ -4667,6 +4668,37 @@ class JLibStringTest : public CppUnit::TestFixture
         CPPUNIT_ASSERT_EQUAL((const void*)(nullptr), jmemmem(9, haystack, 2, "ij"));
         CPPUNIT_ASSERT_EQUAL((const void*)(haystack+8), jmemmem(10, haystack, 2, "ij"));
     }
+
+    void testOption(const char * text, const std::initializer_list<std::pair<const char *, const char *>> & expected)
+    {
+        StringArray options;
+        StringArray values;
+
+        auto processOption = [this,&options,&values](const char * option, const char * value)
+        {
+            options.append(option);
+            values.append(value);
+        };
+
+        processOptionString(text, processOption);
+
+        CPPUNIT_ASSERT_EQUAL(options.ordinality(), (unsigned)expected.size());
+        ForEachItemIn(i, options)
+        {
+            CPPUNIT_ASSERT_EQUAL(std::string(expected.begin()[i].first), std::string(options.item(i)));
+            CPPUNIT_ASSERT_EQUAL(std::string(expected.begin()[i].second), std::string(values.item(i)));
+        }
+    }
+
+    void testProcessOptions()
+    {
+        testOption("name=boris", {{"name", "boris"}});
+        testOption("name(boris)", {{"name", "boris"}});
+        testOption("name=boris,age(99)", {{"name", "boris"}, {"age", "99"}});
+        testOption("name=boris", {{"name", "boris"}});
+        testOption("option1=value1,option2(value2),option3,option4(nested=value,nested(value))",
+                    {{"option1", "value1"}, {"option2", "value2"}, {"option3", "1"}, {"option4", "nested=value,nested(value)"}});
+    }
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION( JLibStringTest );