Remove MySQL arguments from qc_init.

There can be any sort of library behind qc_init. Hence the arguments
cannot be hardwired to be like the embedded library wants them.

Eventually it might make sense to allow passing arguments from
maxscale.cnf.

query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc

@@ -60,6 +60,7 @@
 #include <log_manager.h>
 #include <query_classifier.h>
 #include <mysql_client_server_protocol.h>
+#include <gwdirs.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1775,9 +1776,103 @@ qc_query_op_t qc_get_operation(GWBUF* querybuf)
     return operation;
 }
 
-
+namespace
-bool qc_init(int argc, char** argv, char** groups)
 {
+
+// Do not change the order without making corresponding changes to IDX_... below.
+const char* server_options[] =
+{
+    "MariaDB Corporation MaxScale",
+    "--no-defaults",
+    "--datadir=",
+    "--language=",
+    "--skip-innodb",
+    "--default-storage-engine=myisam",
+    NULL
+};
+
+const int IDX_DATADIR = 2;
+const int IDX_LANGUAGE = 3;
+const int N_OPTIONS = (sizeof(server_options) / sizeof(server_options[0])) - 1;
+
+const char* server_groups[] = {
+    "embedded",
+    "server",
+    "server",
+    "embedded",
+    "server",
+    "server",
+    NULL
+};
+
+const int OPTIONS_DATADIR_SIZE = 10 + PATH_MAX; // strlen("--datadir=");
+const int OPTIONS_LANGUAGE_SIZE = 11 + PATH_MAX; // strlen("--language=");
+
+char datadir_arg[OPTIONS_DATADIR_SIZE];
+char language_arg[OPTIONS_LANGUAGE_SIZE];
+
+
+bool create_datadir(const char* base, char* datadir)
+{
+    bool created = false;
+
+    if (snprintf(datadir, PATH_MAX, "%s/data%d", base, getpid()) < PATH_MAX)
+    {
+        int rc = mkdir(datadir, 0777);
+
+        if ((rc == 0) || (errno == EEXIST))
+        {
+            created = true;
+        }
+        else
+        {
+            char errbuf[STRERROR_BUFLEN];
+            fprintf(stderr, "MaxScale: error: Cannot create data directory '%s': %d %s\n",
+                    datadir, errno, strerror_r(errno, errbuf, sizeof(errbuf)));
+        }
+    }
+    else
+    {
+        fprintf(stderr, "MaxScale: error: Too long data directory: %s/data%d.", base, getpid());
+    }
+
+    return created;
+}
+
+void configure_options(const char* datadir, const char* langdir)
+{
+    int rv;
+
+    rv = snprintf(datadir_arg, OPTIONS_DATADIR_SIZE, "--datadir=%s", datadir);
+    ss_dassert(rv < OPTIONS_DATADIR_SIZE); // Ensured by create_datadir().
+    server_options[IDX_DATADIR] = datadir_arg;
+
+    rv = sprintf(language_arg, "--language=%s", langdir);
+    ss_dassert(rv < OPTIONS_LANGUAGE_SIZE); // Ensured by qc_init().
+    server_options[IDX_LANGUAGE] = language_arg;
+}
+
+}
+
+bool qc_init(void)
+{
+    bool inited = false;
+    char datadir[PATH_MAX];
+
+    if (strlen(get_langdir()) >= PATH_MAX)
+    {
+        fprintf(stderr, "MaxScale: error: Language path is too long: %s.", get_langdir());
+    }
+    else
+    {
+        if (create_datadir(get_datadir(), datadir))
+        {
+            configure_options(datadir, get_langdir());
+
+            int argc = N_OPTIONS;
+            char** argv = const_cast<char**>(server_options);
+            char** groups = const_cast<char**>(server_groups);
+
             int rc = mysql_library_init(argc, argv, groups);
 
             if (rc != 0)
@@ -1787,17 +1882,20 @@ bool qc_init(int argc, char** argv, char** groups)
             else
             {
                 MXS_NOTICE("Query classifier initialized.");
+                inited = true;
+            }
+        }
     }
 
-    return rc == 0;
+    return inited;
 }
 
-void qc_end()
+void qc_end(void)
 {
     mysql_library_end();
 }
 
-bool qc_thread_init()
+bool qc_thread_init(void)
 {
     bool inited = (mysql_thread_init() == 0);
 
@@ -1809,7 +1907,7 @@ bool qc_thread_init()
     return inited;
 }
 
-void qc_thread_end()
+void qc_thread_end(void)
 {
     mysql_thread_end();
 }

query_classifier/query_classifier.cc

@@ -40,7 +40,7 @@ static const char default_qc_name[] = "qc_mysqlembedded";
 static QUERY_CLASSIFIER* classifier;
 
 
-bool qc_init(int argc, char** argv, char** groups)
+bool qc_init(void)
 {
     QC_TRACE();
     ss_dassert(!classifier);
@@ -53,7 +53,7 @@ bool qc_init(int argc, char** argv, char** groups)
         classifier = (QUERY_CLASSIFIER*) module;
         MXS_NOTICE("%s loaded.", default_qc_name);
 
-        success = classifier->qc_init(argc, argv, groups);
+        success = classifier->qc_init();
     }
     else
     {
@@ -63,7 +63,7 @@ bool qc_init(int argc, char** argv, char** groups)
     return success;
 }
 
-void qc_end()
+void qc_end(void)
 {
     QC_TRACE();
     ss_dassert(classifier);
@@ -72,7 +72,7 @@ void qc_end()
     classifier = NULL;
 }
 
-bool qc_thread_init()
+bool qc_thread_init(void)
 {
     QC_TRACE();
     ss_dassert(classifier);
@@ -80,7 +80,7 @@ bool qc_thread_init()
     return classifier->qc_thread_init();
 }
 
-void qc_thread_end()
+void qc_thread_end(void)
 {
     QC_TRACE();
     ss_dassert(classifier);

query_classifier/query_classifier.h

@@ -74,11 +74,11 @@ typedef enum
 
 #define QUERY_IS_TYPE(mask,type) ((mask & type) == type)
 
-bool qc_init(int argc, char** argv, char** groups);
+bool qc_init(void);
-void qc_end();
+void qc_end(void);
 
-bool qc_thread_init();
+bool qc_thread_init(void);
-void qc_thread_end();
+void qc_thread_end(void);
 
 /**
  * Create THD and use it for creating parse tree. Examine parse tree and
@@ -99,11 +99,11 @@ char** qc_get_database_names(GWBUF* querybuf, int* size);
 
 typedef struct query_classifier
 {
-    bool (*qc_init)(int argc, char** argv, char** groups);
+    bool (*qc_init)(void);
-    void (*qc_end)();
+    void (*qc_end)(void);
 
-    bool (*qc_thread_init)();
+    bool (*qc_thread_init)(void);
-    void (*qc_thread_end)();
+    void (*qc_thread_end)(void);
 
     qc_query_type_t (*qc_get_type)(GWBUF* querybuf);
     qc_query_op_t (*qc_get_operation)(GWBUF* querybuf);

server/core/gateway.c

@@ -1829,7 +1829,7 @@ int main(int argc, char **argv)
         }
     }
 
-    if (!qc_init(num_elements, server_options, server_groups))
+    if (!qc_init())
     {
         char* logerr = "Failed to initialise query classifier library.";
         print_log_n_stderr(true, true, logerr, logerr, eno);