Merge branch '2.0' into 2.1

Documentation/Routers/ReadWriteSplit.md

@@ -100,6 +100,25 @@ The `LEAST_GLOBAL_CONNECTIONS` and `LEAST_ROUTER_CONNECTIONS` use the connection
 
 `LEAST_BEHIND_MASTER` does not take server weights into account when choosing a server.
 
+#### Interaction Between `slave_selection_criteria` and `max_slave_connections`
+
+Depending on the value of `max_slave_connections`, the slave selection criteria
+behave in different ways. Here are a few example cases of how the different
+criteria work with different amounts of slave connections.
+
+* With `slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS` and `max_slave_connections=1`, each session picks
+  one slave and one master
+
+* With `slave_selection_criteria=LEAST_CURRENT_OPERATIONS` and `max_slave_connections=100%`, each session
+  picks one master and as many slaves as possible
+
+* With `slave_selection_criteria=LEAST_CURRENT_OPERATIONS` each read is load balanced based on how many
+  queries are active on a particular slave
+
+* With `slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS` each read is sent to the slave with the least
+  amount of connections
+
+
 ### `max_sescmd_history`
 
 **`max_sescmd_history`** sets a limit on how many session commands each session can execute before the session command history is disabled. The default is an unlimited number of session commands.

include/maxscale/protocol/mysql.h

@@ -89,7 +89,7 @@ MXS_BEGIN_DECLS
 #define GW_MYSQL_PROTOCOL_VERSION 10 // version is 10
 #define GW_MYSQL_HANDSHAKE_FILLER 0x00
 #define GW_MYSQL_SERVER_LANGUAGE 0x08
-#define GW_MYSQL_MAX_PACKET_LEN 0xffffffL;
+#define GW_MYSQL_MAX_PACKET_LEN 0xffffffL
 #define GW_MYSQL_SCRAMBLE_SIZE 20
 #define GW_SCRAMBLE_LENGTH_323 8
 

server/modules/protocol/MySQL/MySQLClient/mysql_client.c

@@ -861,7 +861,12 @@ static bool process_client_commands(DCB* dcb, int bytes_available, GWBUF** buffe
             }
 
             MySQLProtocol *proto = (MySQLProtocol*)dcb->protocol;
-            proto->current_command = cmd;
+            if (dcb->protocol_packet_length - MYSQL_HEADER_LEN != GW_MYSQL_MAX_PACKET_LEN)
+            {
+                /** We're processing the first packet of a command */
+                proto->current_command = cmd;
+            }
+
             dcb->protocol_packet_length = pktlen + MYSQL_HEADER_LEN;
             dcb->protocol_bytes_processed = 0;
         }

server/modules/routing/avrorouter/avro_rbr.c

@@ -30,7 +30,7 @@ static bool warn_large_enumset = false; /**< Remove when support for ENUM/SET va
 
 uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create,
                                 avro_value_t *record, uint8_t *ptr,
-                                uint8_t *columns_present);
+                                uint8_t *columns_present, uint8_t *end);
 void notify_all_clients(AVRO_INSTANCE *router);
 void add_used_table(AVRO_INSTANCE* router, const char* table);
 
@@ -292,9 +292,10 @@ bool handle_row_event(AVRO_INSTANCE *router, REP_HEADER *hdr, uint8_t *ptr)
             while (ptr - start < hdr->event_size - BINLOG_EVENT_HDR_LEN)
             {
                 /** Add the current GTID and timestamp */
+                uint8_t *end = ptr + hdr->event_size;
                 int event_type = get_event_type(hdr->event_type);
                 prepare_record(router, hdr, event_type, &record);
-                ptr = process_row_event_data(map, create, &record, ptr, col_present);
+                ptr = process_row_event_data(map, create, &record, ptr, col_present, end);
                 avro_file_writer_append_value(table->avro_file, &record);
 
                 /** Update rows events have the before and after images of the
@@ -303,7 +304,7 @@ bool handle_row_event(AVRO_INSTANCE *router, REP_HEADER *hdr, uint8_t *ptr)
                 if (event_type == UPDATE_EVENT)
                 {
                     prepare_record(router, hdr, UPDATE_EVENT_AFTER, &record);
-                    ptr = process_row_event_data(map, create, &record, ptr, col_present);
+                    ptr = process_row_event_data(map, create, &record, ptr, col_present, end);
                     avro_file_writer_append_value(table->avro_file, &record);
                 }
 
@@ -480,7 +481,7 @@ int get_metadata_len(uint8_t type)
  * @return Pointer to the first byte after the current row event
  */
 uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value_t *record,
-                                uint8_t *ptr, uint8_t *columns_present)
+                                uint8_t *ptr, uint8_t *columns_present, uint8_t *end)
 {
     int npresent = 0;
     avro_value_t field;
@@ -490,10 +491,12 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
 
     /** BIT type values use the extra bits in the row event header */
     int extra_bits = (((ncolumns + 7) / 8) * 8) - ncolumns;
+    ss_dassert(ptr < end);
 
     /** Store the null value bitmap */
     uint8_t *null_bitmap = ptr;
     ptr += (ncolumns + 7) / 8;
+    ss_dassert(ptr < end);
 
     for (long i = 0; i < map->columns && npresent < ncolumns; i++)
     {
@@ -527,6 +530,7 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                     }
                     avro_value_set_string(&field, strval);
                     ptr += bytes;
+                    ss_dassert(ptr < end);
                 }
                 else
                 {
@@ -536,6 +540,7 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                     str[bytes] = '\0';
                     avro_value_set_string(&field, str);
                     ptr += bytes + 1;
+                    ss_dassert(ptr < end);
                 }
             }
             else if (column_is_bit(map->column_types[i]))
@@ -555,21 +560,36 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                 }
                 avro_value_set_int(&field, value);
                 ptr += bytes;
+                ss_dassert(ptr < end);
             }
             else if (column_is_decimal(map->column_types[i]))
             {
                 double f_value = 0.0;
                 ptr += unpack_decimal_field(ptr, metadata + metadata_offset, &f_value);
                 avro_value_set_double(&field, f_value);
+                ss_dassert(ptr < end);
             }
             else if (column_is_variable_string(map->column_types[i]))
             {
                 size_t sz;
-                char *str = mxs_lestr_consume(&ptr, &sz);
+                int bytes = metadata[metadata_offset] | metadata[metadata_offset + 1] << 8;
+                if (bytes > 255)
+                {
+                    sz = gw_mysql_get_byte2(ptr);
+                    ptr += 2;
+                }
+                else
+                {
+                    sz = *ptr;
+                    ptr++;
+                }
+
                 char buf[sz + 1];
-                memcpy(buf, str, sz);
+                memcpy(buf, ptr, sz);
                 buf[sz] = '\0';
+                ptr += sz;
                 avro_value_set_string(&field, buf);
+                ss_dassert(ptr < end);
             }
             else if (column_is_blob(map->column_types[i]))
             {
@@ -579,6 +599,7 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                 ptr += bytes;
                 avro_value_set_bytes(&field, ptr, len);
                 ptr += len;
+                ss_dassert(ptr < end);
             }
             else if (column_is_temporal(map->column_types[i]))
             {
@@ -587,6 +608,7 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                 ptr += unpack_temporal_value(map->column_types[i], ptr, &metadata[metadata_offset], &tm);
                 format_temporal_value(buf, sizeof(buf), map->column_types[i], &tm);
                 avro_value_set_string(&field, buf);
+                ss_dassert(ptr < end);
             }
             /** All numeric types (INT, LONG, FLOAT etc.) */
             else
@@ -596,6 +618,7 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                 ptr += unpack_numeric_field(ptr, map->column_types[i],
                                             &metadata[metadata_offset], lval);
                 set_numeric_field_value(&field, map->column_types[i], &metadata[metadata_offset], lval);
+                ss_dassert(ptr < end);
             }
             ss_dassert(metadata_offset <= map->column_metadata_size);
             metadata_offset += get_metadata_len(map->column_types[i]);

server/modules/routing/avrorouter/avro_schema.c

@@ -449,6 +449,10 @@ static const char *extract_field_name(const char* ptr, char* dest, size_t size)
     while (*ptr && (isspace(*ptr) || (bt = *ptr == '`')))
     {
         ptr++;
+        if (bt)
+        {
+            break;
+        }
     }
 
     if (strncasecmp(ptr, "constraint", 10) == 0 || strncasecmp(ptr, "index", 5) == 0 ||
@@ -481,11 +485,6 @@ static const char *extract_field_name(const char* ptr, char* dest, size_t size)
         /** Valid identifier */
         size_t bytes = ptr - start;
 
-        if (bt)
-        {
-            bytes--;
-        }
-
         memcpy(dest, start, bytes);
         dest[bytes] = '\0';