From 1e817cd54d4d0e74fea321d4e3050fea634ceef4 Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Tue, 1 Oct 2024 08:10:40 +0200
Subject: [PATCH] #967: Added CTPG script options parser

---
 .github/workflows/check_bazel_tests.yml       |   2 +-
 .../base/javacontainer/script_options/BUILD   |   2 +-
 .../scriptoptionlinesparserlegacy.cc          |   2 +-
 exaudfclient/base/script_options_parser/BUILD |   7 -
 .../base/script_options_parser/ctpg/BUILD     |   8 +
 .../script_options_parser/{ => ctpg}/ctpg.hpp |   0
 .../{ => ctpg}/scriptoptionlines_ctpg.cc      |  93 +++++---
 .../ctpg/scriptoptionlines_ctpg.h             |  54 +++++
 .../script_options_parser/ctpg/test/BUILD     |   8 +
 .../ctpg/test/script_option_lines_test.cpp    | 214 ++++++++++++++++++
 .../base/script_options_parser/legacy/BUILD   |   8 +
 .../{ => legacy}/scriptoptionlines.cc         |   0
 .../{ => legacy}/scriptoptionlines.h          |   0
 .../script_options_parser/legacy/test/BUILD   |   8 +
 .../test/script_option_lines_test.cpp         |   2 +-
 .../scriptoptionlines_ctpg.h                  |  48 ----
 .../base/script_options_parser/test/BUILD     |   8 -
 17 files changed, 361 insertions(+), 103 deletions(-)
 create mode 100644 exaudfclient/base/script_options_parser/ctpg/BUILD
 rename exaudfclient/base/script_options_parser/{ => ctpg}/ctpg.hpp (100%)
 rename exaudfclient/base/script_options_parser/{ => ctpg}/scriptoptionlines_ctpg.cc (70%)
 create mode 100644 exaudfclient/base/script_options_parser/ctpg/scriptoptionlines_ctpg.h
 create mode 100644 exaudfclient/base/script_options_parser/ctpg/test/BUILD
 create mode 100644 exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp
 create mode 100644 exaudfclient/base/script_options_parser/legacy/BUILD
 rename exaudfclient/base/script_options_parser/{ => legacy}/scriptoptionlines.cc (100%)
 rename exaudfclient/base/script_options_parser/{ => legacy}/scriptoptionlines.h (100%)
 create mode 100644 exaudfclient/base/script_options_parser/legacy/test/BUILD
 rename exaudfclient/base/script_options_parser/{ => legacy}/test/script_option_lines_test.cpp (99%)
 delete mode 100644 exaudfclient/base/script_options_parser/scriptoptionlines_ctpg.h
 delete mode 100644 exaudfclient/base/script_options_parser/test/BUILD

diff --git a/.github/workflows/check_bazel_tests.yml b/.github/workflows/check_bazel_tests.yml
index fff76cfa..454b7292 100644
--- a/.github/workflows/check_bazel_tests.yml
+++ b/.github/workflows/check_bazel_tests.yml
@@ -38,6 +38,6 @@ jobs:
     - name: Script Options Parser Tests
       run: |
         export USE_BAZEL_VERSION=7.2.1
-        bazel test //base/script_options_parser/test/...
+        bazel test //base/script_options_parser/...
       working-directory: ./exaudfclient/
 
diff --git a/exaudfclient/base/javacontainer/script_options/BUILD b/exaudfclient/base/javacontainer/script_options/BUILD
index 5469fdd3..765e5961 100644
--- a/exaudfclient/base/javacontainer/script_options/BUILD
+++ b/exaudfclient/base/javacontainer/script_options/BUILD
@@ -5,5 +5,5 @@ cc_library(
     name = "java_scriptoptionlines",
     hdrs = [":scriptoptionlinesconverter.h"],
     srcs = [":scriptoptionlinesparser.h", ":scriptoptionlinesconverter.h", ":scriptoptionlinesconverter.cc", ":scriptoptionlinesparserlegacy.h", ":scriptoptionlinesparserlegacy.cc"],
-    deps = ["//base/script_options_parser:scriptoptionlinesparser", "//base/exaudflib:header", "//base/exaudflib:exaudflib-deps"],
+    deps = ["//base/script_options_parser/legacy:scriptoptionlinesparser_legacy", "//base/exaudflib:header", "//base/exaudflib:exaudflib-deps"],
 )
diff --git a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserlegacy.cc b/exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserlegacy.cc
index 4159e69d..f1ff62e6 100644
--- a/exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserlegacy.cc
+++ b/exaudfclient/base/javacontainer/script_options/scriptoptionlinesparserlegacy.cc
@@ -1,5 +1,5 @@
 #include "base/javacontainer/script_options/scriptoptionlinesparserlegacy.h"
-#include "base/script_options_parser/scriptoptionlines.h"
+#include "base/script_options_parser/legacy/scriptoptionlines.h"
 
 
 namespace SWIGVMContainers {
diff --git a/exaudfclient/base/script_options_parser/BUILD b/exaudfclient/base/script_options_parser/BUILD
index d47cd5d5..ffd0fb0c 100644
--- a/exaudfclient/base/script_options_parser/BUILD
+++ b/exaudfclient/base/script_options_parser/BUILD
@@ -1,8 +1 @@
 package(default_visibility = ["//visibility:public"])
-
-cc_library(
-    name = "scriptoptionlinesparser",
-    hdrs = ["scriptoptionlines.h"],
-    srcs = ["scriptoptionlines.cc","scriptoptionlines.h"],
-    copts= ["-fno-lto"],
-)
diff --git a/exaudfclient/base/script_options_parser/ctpg/BUILD b/exaudfclient/base/script_options_parser/ctpg/BUILD
new file mode 100644
index 00000000..b4d61b8c
--- /dev/null
+++ b/exaudfclient/base/script_options_parser/ctpg/BUILD
@@ -0,0 +1,8 @@
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "scriptoptionlinesparser_ctpg",
+    hdrs = ["scriptoptionlines_ctpg.h"],
+    srcs = ["scriptoptionlines_ctpg.cc","ctpg.hpp"],
+    copts= ["-fno-lto"],
+)
diff --git a/exaudfclient/base/script_options_parser/ctpg.hpp b/exaudfclient/base/script_options_parser/ctpg/ctpg.hpp
similarity index 100%
rename from exaudfclient/base/script_options_parser/ctpg.hpp
rename to exaudfclient/base/script_options_parser/ctpg/ctpg.hpp
diff --git a/exaudfclient/base/script_options_parser/scriptoptionlines_ctpg.cc b/exaudfclient/base/script_options_parser/ctpg/scriptoptionlines_ctpg.cc
similarity index 70%
rename from exaudfclient/base/script_options_parser/scriptoptionlines_ctpg.cc
rename to exaudfclient/base/script_options_parser/ctpg/scriptoptionlines_ctpg.cc
index 16ca9c53..ed9bf973 100644
--- a/exaudfclient/base/script_options_parser/scriptoptionlines_ctpg.cc
+++ b/exaudfclient/base/script_options_parser/ctpg/scriptoptionlines_ctpg.cc
@@ -8,12 +8,14 @@ using namespace exaudf_ctpg;
 using namespace exaudf_ctpg::ftors;
 
 
-namespace OptionsLineParser
+namespace ExecutionGraph
 {
 
+namespace OptionsLineParser
+{
 
-namespace Parser {
 
+namespace CTPG {
 
 
 struct Option {
@@ -25,6 +27,8 @@ struct Option {
 
 using options_type = std::vector<Option>;
 
+namespace ParserInternals {
+
 auto empty_options()
 {
     options_type ob;
@@ -39,7 +43,6 @@ auto to_options(Option&& e)
 
 auto to_option(std::string_view key, std::string value, source_point sp_begin, source_point sp_end)
 {
-    std::cerr << "Found option:" << key << " - '" << value << "'" << std::endl;
     return Option{std::string(key), value, sp_begin, sp_end};
 }
 
@@ -53,7 +56,7 @@ auto&& add_option(Option&& e, options_type&& ob)
 
 constexpr char alpha_numeric_pattern[] = R"_([0-9a-zA-Z_]+)_";
 constexpr char option_char_pattern[] = R"_([^;])_";
-constexpr char whitespaces_pattern[] = R"_([ \x09]+)_";
+constexpr char whitespaces_pattern[] = R"_([ \x09 \x0c \x0b]+)_";
 
 
 constexpr char_term start_option_tag('%');
@@ -133,42 +136,60 @@ constexpr parser option_parser(
 );
 
 void parse(const std::string& code, options_type& result, std::function<void(const char*)> throwException) {
-
-    std::string::const_iterator it = code.begin();
-
-//
-//    for ( std::string & line : lines) {
-//        std::cerr << "Parsing line: '" << line << "'" << std::endl;
-//
-//        std::string t(line);
-//        std::cerr << "orig: " << reinterpret_cast<const void *>(line.c_str()) << std::endl;
-//        std::cerr << "cp: " << reinterpret_cast<const void *>(t.c_str()) << std::endl;
-//
-//        auto res = option_parser.parse(
-//            parse_options{}/*.set_verbose(true)*/.set_skip_whitespace(false),
-//            buffers::string_buffer(std::move(t)),
-//            std::cout);
-//
-//         std::cerr << "Parsing line: '" << line << "'" << std::endl;
-//        if (res.has_value())
-//        {
-//    //        std::cout << res.value() << std::endl;
-//
-//            for (const auto& w : res.value())
-//            {
-//                std::cout <<  w.key << " (" << w.value << ") pos: "<< w.start << "-" << w.end << std::endl;
-//            }
-//        }
-//    }
+    std::stringstream error_buffer;
+    auto res = option_parser.parse(
+        parse_options{}.set_skip_whitespace(false),
+        buffers::string_buffer(code.c_str()),
+        error_buffer);
+    if (res.has_value())
+    {
+        result = res.value();
+    }
+    else
+    {
+        std::stringstream ss;
+        ss << "Error parsing script options: " << error_buffer.str();
+        throwException(ss.str().c_str());
+    }
 }
 
-} //namespace Parser
-
-void parseOptions(const std::string& code, OptionsLineParser::ParserResult & result, std::function<void(const char*)> throwException) {
+} //namespace ParserInternals
+
+void parseOptions(const std::string& code, options_map_t & result, std::function<void(const char*)> throwException) {
+    std::stringstream ss(code);
+    std::string line;
+    size_t current_index(0);
+    while(std::getline(ss, line, '\n')) {
+        if (!line.empty() && !std::all_of(line.begin(),line.end(), [](const char c) {return std::isspace(c);})) {
+            options_type parser_result;
+            ParserInternals::parse(line, parser_result, throwException);
+            for (const auto & option: parser_result)
+            {
+                ScriptOption entry = {
+                    .value = option.value,
+                    .idx_in_source = current_index + option.start.column - 1,
+                    .size = option.end.column - option.start.column + 1
+                };
+                auto it_in_result = result.find(option.key);
+                if (it_in_result == result.end())
+                {
+                    options_t new_options;
+                    new_options.push_back(entry);
+                    result.insert(std::make_pair(option.key, new_options));
+                }
+                else
+                {
+                    it_in_result->second.push_back(entry);
+                }
+            }
+        }
+        current_index += line.size() + 1;
+    }
 }
 
 
-
-
+} // namespace CTPG
 
 } // namespace OptionsLineParser
+
+} // namespace ExecutionGraph
\ No newline at end of file
diff --git a/exaudfclient/base/script_options_parser/ctpg/scriptoptionlines_ctpg.h b/exaudfclient/base/script_options_parser/ctpg/scriptoptionlines_ctpg.h
new file mode 100644
index 00000000..c16a21d9
--- /dev/null
+++ b/exaudfclient/base/script_options_parser/ctpg/scriptoptionlines_ctpg.h
@@ -0,0 +1,54 @@
+#ifndef SCRIPTOPTIONLINESCTPG_H
+#define SCRIPTOPTIONLINESCTPG_H
+
+#include <string>
+#include <functional>
+#include <vector>
+#include <map>
+#include <ostream>
+
+namespace ExecutionGraph
+{
+
+namespace OptionsLineParser
+{
+
+namespace CTPG
+{
+
+class ParserResult;
+
+struct ScriptOption {
+    std::string value;
+    size_t idx_in_source;
+    size_t size;
+
+    bool operator==(const ScriptOption & right) const {
+        return value == right.value && idx_in_source == right.idx_in_source && size == right.size;
+    }
+    friend void PrintTo(const ScriptOption& option, std::ostream* os) {
+        *os << "(" << option.value << "," << option.idx_in_source << "," << option.size << ")";
+    }
+};
+
+using options_t = std::vector<ScriptOption>;
+
+using options_map_t = std::map<std::string, options_t>;
+
+/*!
+ * \brief extractOptionLine Extracts syntactically valid option lines of form %<option> <values> [<values>] from UDF scripts.
+ *
+ * \param code Reference to string where the script code is stored.
+ * \param result Result of all found options.
+ * \param throwException Function to be called to throw exception.
+ *
+ */
+void parseOptions(const std::string& code, options_map_t & result, std::function<void(const char*)> throwException);
+
+} //namespace CTPG
+
+} // namespace OptionsLineParser
+
+} // namespace ExecutionGraph
+
+#endif // SCRIPTOPTIONLINESCTPG_H
diff --git a/exaudfclient/base/script_options_parser/ctpg/test/BUILD b/exaudfclient/base/script_options_parser/ctpg/test/BUILD
new file mode 100644
index 00000000..89fd80ef
--- /dev/null
+++ b/exaudfclient/base/script_options_parser/ctpg/test/BUILD
@@ -0,0 +1,8 @@
+cc_test(
+    name = "script-options-ctpg-parser-test",
+    srcs = ["script_option_lines_test.cpp"],
+    deps = [
+        "//base/script_options_parser/ctpg:scriptoptionlinesparser_ctpg",
+        "@googletest//:gtest_main",
+    ],
+)
\ No newline at end of file
diff --git a/exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp b/exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp
new file mode 100644
index 00000000..83e4371a
--- /dev/null
+++ b/exaudfclient/base/script_options_parser/ctpg/test/script_option_lines_test.cpp
@@ -0,0 +1,214 @@
+#include "base/script_options_parser/ctpg/scriptoptionlines_ctpg.h"
+#include <gtest/gtest.h>
+#include <string>
+#include <exception>
+
+const std::string lineEnd = ";";
+
+class TestException : public std::runtime_error {
+    using std::runtime_error::runtime_error;
+};
+
+void throwException(const char* ex) {
+    throw TestException(std::string(ex));
+}
+
+using namespace ExecutionGraph::OptionsLineParser::CTPG;
+
+
+class ScriptOptionLinesWhitespaceTest : public ::testing::TestWithParam<std::tuple<std::string, std::string, std::string, std::string, std::string, std::string>> {};
+
+TEST_P(ScriptOptionLinesWhitespaceTest, WhitespaceExtractOptionLineTest) {
+    const std::string prefix = std::get<0>(GetParam());
+    const std::string suffix = std::get<1>(GetParam());
+    const std::string option = std::get<2>(GetParam());
+    const std::string delimeter = std::get<3>(GetParam());
+    const std::string value = std::get<4>(GetParam());
+    const std::string payload =  std::get<5>(GetParam());
+    std::string code = prefix + "%" + option + delimeter + value + lineEnd + suffix + "\n" + payload;
+    options_map_t result;
+    parseOptions(code, result, throwException);
+    ASSERT_EQ(result.size(), 1);
+    const auto option_result = result.find(option);
+    ASSERT_TRUE(option_result != result.end());
+    ASSERT_EQ(option_result->second.size(), 1);
+    EXPECT_EQ(option_result->second[0].value, value);
+}
+
+std::vector<std::string> white_space_strings = {"", " ", "\t", "\f", "\v", "\n", " \t", "\t ", "\t\f", "\f\t", "\f ", " \f", "\t\v", "\v\t", "\v ", " \v", "\f\v", "\v\f", "  \t", " \t "};
+std::vector<std::string> delimeters = {" ", "\t", "\f", "\v", " \t", "\t ", "\t\f", "\f\t", "\f ", " \f", "\t\v", "\v\t", "\v ", " \v", "\f\v", "\v\f", "  \t", " \t "};
+std::vector<std::string> keywords = {"import", "jvmoption", "scriptclass", "jar", "env"};
+std::vector<std::string> values = {"something", "com.mycompany.MyScriptClass", "LD_LIBRARY_PATH=/nvdriver", "-Xms128m -Xmx1024m -Xss512k", "/buckets/bfsdefault/default/my_code.jar"};
+std::vector<std::string> payloads = {"anything", "\n\ndef my_func:\n\tpass", "class MyJava\n public static void Main() {\n};\n"};
+
+INSTANTIATE_TEST_SUITE_P(
+    ScriptOptionLines,
+    ScriptOptionLinesWhitespaceTest,
+    ::testing::Combine(::testing::ValuesIn(white_space_strings),
+                       ::testing::ValuesIn(white_space_strings),
+                       ::testing::ValuesIn(keywords),
+                       ::testing::ValuesIn(delimeters),
+                       ::testing::ValuesIn(values),
+                       ::testing::ValuesIn(payloads)
+    )
+);
+
+TEST(ScriptOptionLinesTest, ignore_anything_other_than_whitepsace) {
+    std::string code =
+        "abc %option myoption;\n"
+        "\nmycode";
+    options_map_t result;
+    parseOptions(code, result, throwException);
+    EXPECT_TRUE(result.empty());
+}
+
+TEST(ScriptOptionLinesTest, need_line_end_character) {
+    std::string code =
+        "%option myoption\n"
+        "\nmycode";
+    options_map_t result;
+    EXPECT_THROW({
+       parseOptions(code, result, throwException);
+    }, TestException );
+}
+
+TEST(ScriptOptionLinesTest, finds_the_two_options_same_key) {
+    std::string code =
+        "%option myoption; %option mysecondoption;\n"
+        "\nmycode";
+    options_map_t result;
+    parseOptions(code, result, throwException);
+    ASSERT_EQ(result.size(), 1);
+    const auto option_result = result.find("option");
+
+    ASSERT_TRUE(option_result != result.end());
+    ASSERT_EQ(option_result->second.size(), 2);
+    ScriptOption expected_option_one = { .value = "myoption", .idx_in_source = 0, .size = 17};
+    ScriptOption expected_option_two = { .value = "mysecondoption", .idx_in_source = 18, .size = 23};
+    ASSERT_EQ(option_result->second[0], expected_option_one);
+    ASSERT_EQ(option_result->second[1], expected_option_two);
+    EXPECT_EQ(code.substr(expected_option_one.idx_in_source, expected_option_one.size), "%option myoption;");
+    EXPECT_EQ(code.substr(expected_option_two.idx_in_source, expected_option_two.size), "%option mysecondoption;");
+}
+
+TEST(ScriptOptionLinesTest, finds_the_two_options_different_keys) {
+    std::string code =
+        "%option myoption; %otheroption mysecondoption;\n"
+        "\nmycode";
+    options_map_t result;
+    parseOptions(code, result, throwException);
+    ASSERT_EQ(result.size(), 2);
+    const auto option_result = result.find("option");
+
+    ASSERT_TRUE(option_result != result.end());
+    ASSERT_EQ(option_result->second.size(), 1);
+    ScriptOption expected_option_one = { .value = "myoption", .idx_in_source = 0, .size = 17};
+    ASSERT_EQ(option_result->second[0], expected_option_one);
+    EXPECT_EQ(code.substr(expected_option_one.idx_in_source, expected_option_one.size), "%option myoption;");
+
+    const auto otheroption_result = result.find("otheroption");
+
+    ASSERT_TRUE(otheroption_result != result.end());
+    ASSERT_EQ(otheroption_result->second.size(), 1);
+    ScriptOption expected_option_two = { .value = "mysecondoption", .idx_in_source = 18, .size = 28};
+    ASSERT_EQ(otheroption_result->second[0], expected_option_two);
+    EXPECT_EQ(code.substr(expected_option_two.idx_in_source, expected_option_two.size), "%otheroption mysecondoption;");
+}
+
+class ScriptOptionLinesInvalidOptionTest : public ::testing::TestWithParam<std::string> {};
+
+
+TEST_P(ScriptOptionLinesInvalidOptionTest, value_is_mandatory) {
+    const std::string invalid_option = GetParam();
+    std::string code = invalid_option + "\nsomething";
+    options_map_t result;
+    EXPECT_THROW({
+     parseOptions(code, result, throwException);
+    }, TestException );
+}
+
+std::vector<std::string> invalid_options = {"%option ;", "%option \n", "\n%option\n;", "%option\nvalue;"};
+
+INSTANTIATE_TEST_SUITE_P(
+    ScriptOptionLines,
+    ScriptOptionLinesInvalidOptionTest,
+    ::testing::ValuesIn(invalid_options)
+);
+
+
+
+TEST(ScriptOptionLinesTest, test_all_in_one_line_does_second_option_does_not_work) {
+    /**
+    Verify the correct behavior of new parser for situation as described in https://github.com/exasol/script-languages-release/issues/652.
+    */
+    const std::string code = "%jar /buckets/bucketfs1/jars/exajdbc.jar; %jvmoption -Xms4m; class JAVA_UDF_3 {static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {String host_name = ctx.getString(\"col1\");}}\n/\n;";
+    options_map_t result;
+    parseOptions(code, result, throwException);
+    ASSERT_EQ(result.size(), 2);
+
+    const auto jar_option_result = result.find("jar");
+    ASSERT_TRUE(jar_option_result != result.end());
+    ASSERT_EQ(jar_option_result->second.size(), 1);
+    ScriptOption expected_jar_option = { .value = "/buckets/bucketfs1/jars/exajdbc.jar", .idx_in_source = 0, .size = 41};
+    ASSERT_EQ(jar_option_result->second[0], expected_jar_option);
+    EXPECT_EQ(code.substr(expected_jar_option.idx_in_source, expected_jar_option.size), "%jar /buckets/bucketfs1/jars/exajdbc.jar;");
+
+    const auto jvm_option_result = result.find("jvmoption");
+    ASSERT_TRUE(jvm_option_result != result.end());
+    ASSERT_EQ(jvm_option_result->second.size(), 1);
+    ScriptOption expected_jvm_option = { .value = "-Xms4m", .idx_in_source = 42, .size = 18};
+    ASSERT_EQ(jvm_option_result->second[0], expected_jvm_option);
+    EXPECT_EQ(code.substr(expected_jvm_option.idx_in_source, expected_jvm_option.size), "%jvmoption -Xms4m;");
+}
+
+
+TEST(ScriptOptionLinesTest, test_values_must_not_contain_spaces) {
+    /**
+    Verify the wrong behavior and assumptions as described in https://github.com/exasol/script-languages-release/issues/878
+    The parser is actually correct, but the client code incorrectly parses the result (see javacontainer_test.cc - quoted_jvm_option)
+    */
+    const std::string code =
+        "%jvmoption -Dhttp.agent=\"ABC DEF\";\n\n"
+        "class JVMOPTION_TEST_WITH_SPACE {\n"
+        "static void run(ExaMetadata exa, ExaIterator ctx) throws Exception {\n\n"
+        "	ctx.emit(\"Success!\");\n"
+        " }\n"
+        "}\n";
+    options_map_t result;
+    parseOptions(code, result, throwException);
+    ASSERT_EQ(result.size(), 1);
+
+    const auto jvm_option_result = result.find("jvmoption");
+    ASSERT_TRUE(jvm_option_result != result.end());
+    ASSERT_EQ(jvm_option_result->second.size(), 1);
+    ScriptOption expected_jvm_option = { .value = "-Dhttp.agent=\"ABC DEF\"", .idx_in_source = 0, .size = 34};
+    ASSERT_EQ(jvm_option_result->second[0], expected_jvm_option);
+    EXPECT_EQ(code.substr(expected_jvm_option.idx_in_source, expected_jvm_option.size), "%jvmoption -Dhttp.agent=\"ABC DEF\";");
+}
+
+TEST(ScriptOptionLinesTest, test_multiple_lines_with_code) {
+    /**
+    Verify that the parser can read options coming after some code.
+    */
+    const std::string code =
+        "%jvmoption -Dhttp.agent=\"ABC DEF\"; class Abc{};\n\n"
+        "%jar /buckets/bucketfs1/jars/exajdbc.jar; class DEF{};\n";
+
+    options_map_t result;
+    parseOptions(code, result, throwException);
+    ASSERT_EQ(result.size(), 2);
+
+    const auto jvm_option_result = result.find("jvmoption");
+    ASSERT_TRUE(jvm_option_result != result.end());
+    ASSERT_EQ(jvm_option_result->second.size(), 1);
+    ScriptOption expected_jvm_option = { .value = "-Dhttp.agent=\"ABC DEF\"", .idx_in_source = 0, .size = 34};
+    ASSERT_EQ(jvm_option_result->second[0], expected_jvm_option);
+    EXPECT_EQ(code.substr(expected_jvm_option.idx_in_source, expected_jvm_option.size), "%jvmoption -Dhttp.agent=\"ABC DEF\";");
+
+    const auto jar_option_result = result.find("jar");
+    ASSERT_TRUE(jar_option_result != result.end());
+    ASSERT_EQ(jar_option_result->second.size(), 1);
+    ScriptOption expected_jar_option = { .value = "/buckets/bucketfs1/jars/exajdbc.jar", .idx_in_source = 49, .size = 41};
+    ASSERT_EQ(jar_option_result->second[0], expected_jar_option);
+    EXPECT_EQ(code.substr(expected_jar_option.idx_in_source, expected_jar_option.size), "%jar /buckets/bucketfs1/jars/exajdbc.jar;");
+}
diff --git a/exaudfclient/base/script_options_parser/legacy/BUILD b/exaudfclient/base/script_options_parser/legacy/BUILD
new file mode 100644
index 00000000..7e7fd860
--- /dev/null
+++ b/exaudfclient/base/script_options_parser/legacy/BUILD
@@ -0,0 +1,8 @@
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "scriptoptionlinesparser_legacy",
+    hdrs = ["scriptoptionlines.h"],
+    srcs = ["scriptoptionlines.cc","scriptoptionlines.h"],
+    copts= ["-fno-lto"],
+)
diff --git a/exaudfclient/base/script_options_parser/scriptoptionlines.cc b/exaudfclient/base/script_options_parser/legacy/scriptoptionlines.cc
similarity index 100%
rename from exaudfclient/base/script_options_parser/scriptoptionlines.cc
rename to exaudfclient/base/script_options_parser/legacy/scriptoptionlines.cc
diff --git a/exaudfclient/base/script_options_parser/scriptoptionlines.h b/exaudfclient/base/script_options_parser/legacy/scriptoptionlines.h
similarity index 100%
rename from exaudfclient/base/script_options_parser/scriptoptionlines.h
rename to exaudfclient/base/script_options_parser/legacy/scriptoptionlines.h
diff --git a/exaudfclient/base/script_options_parser/legacy/test/BUILD b/exaudfclient/base/script_options_parser/legacy/test/BUILD
new file mode 100644
index 00000000..44df0f29
--- /dev/null
+++ b/exaudfclient/base/script_options_parser/legacy/test/BUILD
@@ -0,0 +1,8 @@
+cc_test(
+    name = "script-options-legacy-parser-test",
+    srcs = ["script_option_lines_test.cpp"],
+    deps = [
+        "//base/script_options_parser/legacy:scriptoptionlinesparser_legacy",
+        "@googletest//:gtest_main",
+    ],
+)
\ No newline at end of file
diff --git a/exaudfclient/base/script_options_parser/test/script_option_lines_test.cpp b/exaudfclient/base/script_options_parser/legacy/test/script_option_lines_test.cpp
similarity index 99%
rename from exaudfclient/base/script_options_parser/test/script_option_lines_test.cpp
rename to exaudfclient/base/script_options_parser/legacy/test/script_option_lines_test.cpp
index 4a13e936..c0c86df7 100644
--- a/exaudfclient/base/script_options_parser/test/script_option_lines_test.cpp
+++ b/exaudfclient/base/script_options_parser/legacy/test/script_option_lines_test.cpp
@@ -1,4 +1,4 @@
-#include "base/script_options_parser/scriptoptionlines.h"
+#include "base/script_options_parser/legacy/scriptoptionlines.h"
 #include <gtest/gtest.h>
 #include <string>
 #include <exception>
diff --git a/exaudfclient/base/script_options_parser/scriptoptionlines_ctpg.h b/exaudfclient/base/script_options_parser/scriptoptionlines_ctpg.h
deleted file mode 100644
index 9ea3ff2e..00000000
--- a/exaudfclient/base/script_options_parser/scriptoptionlines_ctpg.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef SCRIPTOPTIONLINESCTPG_H
-#define SCRIPTOPTIONLINESCTPG_H
-
-#include <string>
-#include <functional>
-#include <map>
-
-namespace OptionsLineParser
-{
-
-struct OptionValue {
-    std::string value;
-    size_t idx;
-};
-
-class ParserResult {
-    public:
-        ParserResult() = default;
-        using option_values_t = std::vector<OptionValue>;
-
-        void get_option_values_and_remove_from_source_string(std::string & source, const std::string & key,
-                                                             std::vector<std::string> result);
-
-    private:
-        void update_entries(const size_t start_idx, const size_t end_idx);
-
-    private:
-        using options_t = std::map<std::string, option_values_t>;
-        options_t m_options;
-};
-
-/*!
- * \brief extractOptionLine Extracts syntactically valid option lines of form %<option> <values> [<values>] from UDF scripts.
- *
- * \param code Reference to string where the script code is stored.
- * \param option Option to be extracted. eg. "jvmoption", "jar", "env" etc.
- * \param whitespace String of characters that should be treated as white space characters.
- * \param lineEnd String of characters that should be treated as line end characters.
- * \param pos If option is found, contains the start position of the option. Otherwise, contains std::string::npos.
- * \param throwException Function to be called to throw exception.
- *
- * \return String with the option line.
- */
-void parseOptions(const std::string& code, ParserResult & result, std::function<void(const char*)> throwException);
-
-} // namespace OptionsLineParser
-
-#endif // SCRIPTOPTIONLINESCTPG_H
diff --git a/exaudfclient/base/script_options_parser/test/BUILD b/exaudfclient/base/script_options_parser/test/BUILD
deleted file mode 100644
index b9543cf8..00000000
--- a/exaudfclient/base/script_options_parser/test/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-cc_test(
-    name = "script-options-parser-test",
-    srcs = ["script_option_lines_test.cpp"],
-    deps = [
-        "//base/script_options_parser:scriptoptionlinesparser",
-        "@googletest//:gtest_main",
-    ],
-)
\ No newline at end of file