Refactorings Script Options Parser

closes #990: Forward JAR options without changing order to classpath
closes #989: Trim script class and import script options
closes #993: Added escape sequence for backslash in new Script Options parser
closes #986: Added environment variable for new ScriptOptionsLine parser in UDF client

doc/changes/changes_8.4.0.md

@@ -31,9 +31,13 @@ This release uses version 1.0.0 of the container tool.
   - #971: Removed dead code in Java VM
   - #982: Added a performance test for ScriptOptions parser for a single line UDF
   - #983: Refactor CTPG script options Java parser code
+  - #986: Added environment variable for new ScriptOptionsLine parser in UDF client
+  - #990: Forward JAR options without changing order to classpath
+  - #989: Trim script class and import script options
 
 ## Bugs
   - #977: Fixed Trivy update cache workflow
+  - #993: Added escape sequence for backslash in new Script Options parser
 
 ## Doc
 

exaudfclient/exaudfclient.cc

@@ -129,6 +129,10 @@ int main(int argc, char **argv) {
         cerr << "Usage: " << argv[0] << " <socket> lang=python|lang=r|lang=java|lang=streaming|lang=benchmark" << endl;
         return 1;
     }
+    const char* script_options_parser_env_val = ::getenv("SCRIPT_OPTIONS_PARSER_VERSION");
+    const bool useCtpgScriptOptionsParser = script_options_parser_env_val != nullptr &&
+                                            ::strcmp(script_options_parser_env_val, "2") == 0;
+
 #endif
 
     if (::setenv("HOME", "/tmp", 1) == -1)
@@ -167,7 +171,12 @@ int main(int argc, char **argv) {
     } else if (strcmp(argv[2], "lang=java")==0)
     {
 #ifdef ENABLE_JAVA_VM
-        vmMaker = [&](){return SWIGVMContainers::JavaContainerBuilder().build();};
+        if (useCtpgScriptOptionsParser) {
+            vmMaker = [&](){return SWIGVMContainers::JavaContainerBuilder().useCtpgParser().build();};
+        } else {
+            vmMaker = [&](){return SWIGVMContainers::JavaContainerBuilder().build();};
+        }
+
 #else
         throw SWIGVM::exception("this exaudfclient has been compilied without Java support");
 #endif