Convert maxscale/query_classifier.h to .hh

The header was not merged with queryclassifier.hh since the latter does not include the former.
2019-01-15 18:05:49 +02:00
parent 45bfbbdd9e
commit d4674faa7d
43 changed files with 70 additions and 74 deletions
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@ -55,7 +55,7 @@
 #include <maxscale/maxscale.h>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/paths.h>
-#include <maxscale/query_classifier.h>
+#include <maxscale/query_classifier.hh>
 #include <maxscale/server.hh>
 #include <maxscale/sqlite3.h>
 #include <maxscale/session.hh>
--- a/server/core/housekeeper.cc
+++ b/server/core/housekeeper.cc
@ -26,7 +26,7 @@
 #include <maxscale/config.hh>
 #include <maxscale/housekeeper.h>
 #include <maxscale/json_api.h>
-#include <maxscale/query_classifier.h>
+#include <maxscale/query_classifier.hh>

 /**
 * @file housekeeper.cc  Provide a mechanism to run periodic tasks
--- a/server/core/internal/query_classifier.hh
+++ b/server/core/internal/query_classifier.hh
@ -13,7 +13,7 @@
 #pragma once

 #include <maxscale/ccdefs.hh>
-#include <maxscale/query_classifier.h>
+#include <maxscale/query_classifier.hh>
 #include <maxscale/jansson.hh>

 MXS_BEGIN_DECLS
--- a/server/core/internal/trxboundaryparser.hh
+++ b/server/core/internal/trxboundaryparser.hh
@ -15,7 +15,7 @@
 #include <maxscale/ccdefs.hh>
 #include <ctype.h>
 #include <maxscale/customparser.hh>
-#include <maxscale/query_classifier.h>
+#include <maxscale/query_classifier.hh>

 namespace maxscale
 {
--- a/server/core/load_utils.cc
+++ b/server/core/load_utils.cc
@ -35,7 +35,7 @@
 #include <maxscale/filter.hh>
 #include <maxscale/authenticator.hh>
 #include <maxscale/monitor.hh>
-#include <maxscale/query_classifier.h>
+#include <maxscale/query_classifier.hh>

 #include "internal/modules.hh"
 #include "internal/config.hh"
--- a/server/core/query_classifier.cc
+++ b/server/core/query_classifier.cc
@ -1473,7 +1473,7 @@ std::unique_ptr<json_t> qc_classify_as_json(const char* zHost, const std::string
    std::unique_ptr<GWBUF> sBuffer(modutil_create_query(statement.c_str()));
    GWBUF* pBuffer = sBuffer.get();

-    qc_parse_result result = qc_parse(pBuffer, QC_COLLECT_ALL);
+    qc_parse_result_t result = qc_parse(pBuffer, QC_COLLECT_ALL);

    json_object_set_new(pParams, CN_PARSE_RESULT, json_string(qc_result_to_string(result)));

--- a/server/core/queryclassifier.cc
+++ b/server/core/queryclassifier.cc
@ -15,7 +15,7 @@
 #include <unordered_map>
 #include <maxscale/alloc.h>
 #include <maxscale/modutil.hh>
-#include <maxscale/query_classifier.h>
+#include <maxscale/query_classifier.hh>
 #include <maxscale/protocol/mysql.hh>

 namespace
--- a/server/core/test/canonical_tests/canonizer.cc
+++ b/server/core/test/canonical_tests/canonizer.cc
@ -21,7 +21,7 @@
 #include <iostream>
 #include <string>

-#include <maxscale/query_classifier.h>
+#include <maxscale/query_classifier.hh>
 #include <maxscale/buffer.hh>
 #include <maxscale/paths.h>
 #include <maxscale/utils.h>
--- a/server/core/test/test_utils.hh
+++ b/server/core/test/test_utils.hh
@ -19,7 +19,7 @@
 #include <maxscale/maxscale_test.h>
 #include <maxscale/log.hh>
 #include <maxscale/config.hh>
-#include <maxscale/query_classifier.h>
+#include <maxscale/query_classifier.hh>
 #include <maxscale/paths.h>
 #include <maxscale/alloc.h>
 #include <maxscale/routingworker.hh>