Merge remote-tracking branch 'origin/MAX-160' into MAX-237

Conflicts:
	query_classifier/query_classifier.cc
	query_classifier/query_classifier.h

server/include/buffer.h

@@ -42,8 +42,11 @@
  * @endverbatim
  */
 #include <skygw_debug.h>
+#include <spinlock.h>
 
 
+EXTERN_C_BLOCK_BEGIN
+
 typedef enum 
 {
         GWBUF_TYPE_UNDEFINED       = 0x00,
@@ -73,6 +76,35 @@ typedef struct  {
 	int		refcount;		/*< Reference count on the buffer */
 } SHARED_BUF;
 
+typedef enum
+{       
+        GWBUF_INFO_NONE         = 0x0,
+        GWBUF_INFO_PARSED       = 0x1
+} gwbuf_info_t;
+
+#define GWBUF_IS_PARSED(b)      (b->gwbuf_info & GWBUF_INFO_PARSED)
+
+/**
+ * A structure for cleaning up memory allocations of structures which are 
+ * referred to by GWBUF and deallocated in gwbuf_free but GWBUF doesn't
+ * know what they are.
+ * All functions on the list are executed before freeing memory of GWBUF struct.
+ */
+typedef enum 
+{
+        GWBUF_PARSING_INFO
+} bufobj_id_t;
+
+typedef struct buffer_object_st buffer_object_t;
+
+struct buffer_object_st {
+        bufobj_id_t      bo_id;
+        void*            bo_data;
+        void            (*bo_donefun_fp)(void *);
+        buffer_object_t* bo_next;
+};
+
+
 /**
  * The buffer structure used by the descriptor control blocks.
  *
@@ -82,11 +114,13 @@ typedef struct  {
  * be copied within the gateway.
  */
 typedef struct gwbuf {
+        SPINLOCK        gwbuf_lock;
 	struct gwbuf	*next;	/*< Next buffer in a linked chain of buffers */
 	void		*start;	/*< Start of the valid data */
 	void		*end;	/*< First byte after the valid data */
 	SHARED_BUF	*sbuf;  /*< The shared buffer with the real data */
-	int		command;/*< The command type for the queue */
+        buffer_object_t *gwbuf_bufobj; /*< List of objects referred to by GWBUF */
+        gwbuf_info_t    gwbuf_info; /*< Info bits */
 	gwbuf_type_t    gwbuf_type; /*< buffer's data type information */
 } GWBUF;
 
@@ -121,4 +155,14 @@ extern unsigned int	gwbuf_length(GWBUF *head);
 extern GWBUF            *gwbuf_clone_portion(GWBUF *head, size_t offset, size_t len);
 extern GWBUF            *gwbuf_clone_transform(GWBUF *head, gwbuf_type_t type);
 extern void             gwbuf_set_type(GWBUF *head, gwbuf_type_t type);
+
+void                    gwbuf_add_buffer_object(GWBUF* buf,
+                                                bufobj_id_t id,
+                                                void*  data,
+                                                void (*donefun_fp)(void *));
+void*                   gwbuf_get_buffer_object_data(GWBUF* buf, bufobj_id_t id);
+
+EXTERN_C_BLOCK_END
+
+
 #endif

server/include/modutil.h

@@ -36,4 +36,6 @@ extern int	modutil_is_SQL(GWBUF *);
 extern int	modutil_extract_SQL(GWBUF *, char **, int *);
 extern int	modutil_MySQL_Query(GWBUF *, char **, int *, int *);
 extern GWBUF	*modutil_replace_SQL(GWBUF *, char *);
+char*           modutil_get_query(GWBUF* buf);
+
 #endif