Merge branch 'Z3' into Z3_rabbit_partial

Conflicts:
	server/modules/routing/readwritesplit/readwritesplit.c

query_classifier/query_classifier.cc

@@ -1054,6 +1054,39 @@ char* skygw_get_created_table_name(GWBUF* querybuf)
   }
   
 }
+
+/**
+ * Checks whether the query is a "real" query ie. SELECT,UPDATE,INSERT,DELETE or any variation of these.
+ * Queries that affect the underlying database are not considered as real queries and the queries that target
+ * specific row or variable data are regarded as the real queries.
+ * @param GWBUF to analyze
+ * @return true if the query is a real query, otherwise false
+ */
+bool skygw_is_real_query(GWBUF* querybuf)
+{
+  LEX* lex = get_lex(querybuf);
+  if(lex){
+    switch(lex->sql_command){
+    case SQLCOM_SELECT:
+      return lex->all_selects_list->table_list.elements > 0;
+    case SQLCOM_UPDATE:
+    case SQLCOM_INSERT:
+    case SQLCOM_INSERT_SELECT:
+    case SQLCOM_DELETE:
+    case SQLCOM_TRUNCATE:
+    case SQLCOM_REPLACE:
+    case SQLCOM_REPLACE_SELECT:
+    case SQLCOM_PREPARE:
+    case SQLCOM_EXECUTE:
+      return true;
+    default:
+      return false;
+	}
+  }
+  return false;
+}
+
+
 /**
  * Checks whether the buffer contains a DROP TABLE... query.
  * @param querybuf Buffer to inspect

query_classifier/query_classifier.h

@@ -45,7 +45,7 @@ typedef enum {
     QUERY_TYPE_PREPARE_NAMED_STMT = 0x0400,  /*< Prepared stmt with name from user */
     QUERY_TYPE_PREPARE_STMT       = 0x0800,  /*< Prepared stmt with id provided by server */
     QUERY_TYPE_EXEC_STMT          = 0x1000,  /*< Execute prepared statement */
-    QUERY_TYPE_SESSION_READ       = 0x2000,   /*< Read session data (from master 31.8.14) */
+    QUERY_TYPE_SESSION_READ       = 0x2000,  /*< Read session data (from master 31.8.14) */
     QUERY_TYPE_CREATE_TMP_TABLE   = 0x4000,  /*< Create temporary table */
     QUERY_TYPE_READ_TMP_TABLE     = 0x8000   /*< Read temporary table */
 } skygw_query_type_t;
@@ -55,9 +55,9 @@ typedef struct parsing_info_st {
 #if defined(SS_DEBUG)
         skygw_chk_t pi_chk_top;     
 #endif
-        void*       pi_handle;                        /*< parsing info object pointer */
-        char*       pi_query_plain_str;               /*< query as plain string */
-        void     (*pi_done_fp)(void *);             /*< clean-up function for parsing info */
+        void*       pi_handle;		/*< parsing info object pointer */
+        char*       pi_query_plain_str;	/*< query as plain string */
+        void     (*pi_done_fp)(void *);	/*< clean-up function for parsing info */
 #if defined(SS_DEBUG)
         skygw_chk_t pi_chk_tail;
 #endif