Add mxs::extract_sql

The helper function extracts the SQL contents as std::string from a
buffer. This should make it easier to log the query in C++ code.

include/maxscale/modutil.hh

@@ -0,0 +1,29 @@
+#pragma once
+/*
+ * Copyright (c) 2016 MariaDB Corporation Ab
+ *
+ * Use of this software is governed by the Business Source License included
+ * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
+ *
+ * Change Date: 2020-01-01
+ *
+ * On the date above, in accordance with the Business Source License, use
+ * of this software will be governed by version 2 or later of the General
+ * Public License.
+ */
+
+/**
+ * @file modutil.hh C++ additions/alternatives for modutil.h functions
+ */
+
+#include <maxscale/cppdefs.hh>
+#include <maxscale/modutil.h>
+
+#include <string>
+
+namespace maxscale
+{
+
+std::string extract_sql(GWBUF* buffer, size_t len = -1);
+
+}

server/core/modutil.cc

@@ -18,6 +18,8 @@
 #include <string.h>
 #include <strings.h>
 
+#include <iterator>
+
 #include <maxscale/alloc.h>
 #include <maxscale/buffer.h>
 #include <maxscale/buffer.hh>
@@ -1650,3 +1652,26 @@ const char* STRPACKETTYPE(int p)
 
     return unknow_type;
 }
+
+namespace maxscale
+{
+
+std::string extract_sql(GWBUF* buffer, size_t len)
+{
+    std::string rval;
+    uint8_t cmd = mxs_mysql_get_command(buffer);
+
+    if (cmd == MXS_COM_QUERY || cmd == MXS_COM_STMT_PREPARE)
+    {
+        mxs::Buffer buf(buffer);
+        size_t header_len = MYSQL_HEADER_LEN + 1;
+        size_t total_len = buf.length() - header_len;
+        // Skip the packet header and the command byte
+        std::copy_n(std::next(buf.begin(), header_len), MXS_MIN(total_len, len), std::back_inserter(rval));
+        buf.release();
+    }
+
+    return rval;
+}
+
+}