Bug#36725332 BLOB_INLINE_SIZE is silently ignored for TINYBLOB

Problem:

A NDB table, with a SQL TINYBLOB column configured with the
BLOB_INLINE_SIZE NDB column option, would (silently) default to the
hardcoded 256 byte value whichever the new size provided. Therefore,
it would not only mislead the user but also not provide the
configurability of BLOB inline size.

Analysis:

On creation of the NDB column from the NDB cluster plugin, the
TINYBLOB case would never read the BLOB_INLINE_SIZE option, therefore
setting the 256 default value. MySQL server already gives the 255 byte
value to be the maximum for a TINYBLOB, thus no over the maximum
writes would be available. However, the BLOB_INLINE_SIZE option also
allows the maximum stored value to be less so that more columns can be
fitted into each row (max of 30k bytes for NDB rows).

Solution:

Do not support BLOB_INLINE_SIZE on SQL TINYBLOB columns
altogether. The reasons are many:
1) TINYBLOB is internally limited to 255
bytes on MySQL server field side (1 byte of packlength)
2) Same behavior can be achieved with VARBINARY with less hassle
3) Gets no benefit on the properties of NDB, such as having
distributed parts of rows partitioned across the cluster.

NDB plugin code now pushes a warning saying it is defaulting to base 256 bytes.

Change-Id: Iab6a3009e5f5e407ef3bef18caf31ed6ed2810a3

Author: dtcpatricio

mysql-test/suite/ndb/r/ndb_blob_size.result

@@ -253,6 +253,21 @@ inline_size
 
 DROP TABLE test.maxlen;
 
+## TINYBLOB columns ignore the BLOB_INLINE_SIZE option
+CREATE TABLE test.bigtiny(
+                      a int primary key,
+                      tb tinyblob comment "NDB_COLUMN=BLOB_INLINE_SIZE=512") engine=ndb;
+Warnings:
+Warning	1296	BLOB_INLINE_SIZE not supported for BLOB column with no part table (e.g. TINYBLOB), using default value 256
+CREATE TABLE test.smalltiny(
+                      a int primary key,
+                      tb tinyblob comment "NDB_COLUMN=BLOB_INLINE_SIZE=128") engine=ndb;
+Warnings:
+Warning	1296	BLOB_INLINE_SIZE not supported for BLOB column with no part table (e.g. TINYBLOB), using default value 256
+
+DROP TABLE test.bigtiny;
+DROP TABLE test.smalltiny;
+
 ## ALTER definitions of extended Blob feature BLOB_INLINE_SIZE
 CREATE TABLE test.inline(
                         a int primary key,
@@ -399,7 +414,7 @@ c0bb7371406f4b1c5d579dcaad1ff066a3bd09e6	c0bb7371406f4b1c5d579dcaad1ff066a3bd09e
 ## Copy ALTER TABLE too big BLOB_INLINE_SIZE
 ALTER TABLE test.inline algorithm=copy,
                         change column b b longblob comment "NDB_COLUMN=BLOB_INLINE_SIZE=27949",
-                        change column t t longtext comment "NDB_COLUMM_BLOB_INLINE_SIZE=1000",
+                        change column t t longtext comment "NDB_COLUMM=BLOB_INLINE_SIZE=1000",
                         change column j j json comment "NDB_COLUMN=BLOB_INLINE_SIZE=27949";
 ERROR HY000: Can't create destination table for copying alter table (use SHOW WARNINGS for more info).
 SHOW WARNINGS;
@@ -425,6 +440,30 @@ Level	Code	Message
 Warning	1478	NDB_COLUMN= : unknown modifier: randomBLOB_INLINE_SIZE=25
 Error	1478	Table storage engine 'ndbcluster' does not support the create option 'Syntax error in COMMENT modifier'
 
+## ALTER TABLE on table for TINYBLOB
+ALTER TABLE test.inline change column b tb tinyblob;
+ERROR 22001: Data too long for column 'tb' at row 1
+## Length value on b (1536) is still larger than what can fit in TINYBLOB length (255)
+ALTER TABLE test.inline change column b b longblob comment "NDB_COLUMN=BLOB_INLINE_SIZE=255";
+ALTER TABLE test.inline change column b tb tinyblob;
+ERROR 22001: Data too long for column 'tb' at row 1
+
+## Must update data to allow to fit TINYBLOB
+UPDATE test.inline SET b = repeat(0x424C4F, 64) WHERE a = 1;
+ALTER TABLE test.inline change column b tb tinyblob;
+SELECT a, length(tb) FROM test.inline;
+a	length(tb)
+1	192
+
+CREATE TABLE test.tiny (
+                      a int primary key,
+                      tb tinyblob) engine = ndb;
+## Always ignored for TINYBLOB
+ALTER TABLE test.tiny change column tb tb tinyblob comment "NDB_COLUMN=BLOB_INLINE_SIZE=128";
+Warnings:
+Warning	1296	BLOB_INLINE_SIZE not supported for BLOB column with no part table (e.g. TINYBLOB), using default value 256
+
+DROP TABLE test.tiny;
 DROP TABLE test.inline;
 
 ## Show Backup and Restore across BLOB inline sizes

mysql-test/suite/ndb/t/ndb_blob_size.test

@@ -185,6 +185,17 @@ CREATE TABLE test.maxlen(
 SELECT inline_size FROM ndbinfo.blobs WHERE table_name = 'maxlen';
 
 DROP TABLE test.maxlen;
+
+## TINYBLOB columns ignore the BLOB_INLINE_SIZE option
+CREATE TABLE test.bigtiny(
+                      a int primary key,
+                      tb tinyblob comment "NDB_COLUMN=BLOB_INLINE_SIZE=512") engine=ndb;
+CREATE TABLE test.smalltiny(
+                      a int primary key,
+                      tb tinyblob comment "NDB_COLUMN=BLOB_INLINE_SIZE=128") engine=ndb;
+
+DROP TABLE test.bigtiny;
+DROP TABLE test.smalltiny;
 --echo
 
 # WL#15044 Configurable BLOB inline size
@@ -291,7 +302,7 @@ SELECT sha1(b), sha1(t), sha1(j) FROM test.inline;
 --error ER_CANT_CREATE_TABLE
 ALTER TABLE test.inline algorithm=copy,
                         change column b b longblob comment "NDB_COLUMN=BLOB_INLINE_SIZE=27949",
-                        change column t t longtext comment "NDB_COLUMM_BLOB_INLINE_SIZE=1000",
+                        change column t t longtext comment "NDB_COLUMM=BLOB_INLINE_SIZE=1000",
                         change column j j json comment "NDB_COLUMN=BLOB_INLINE_SIZE=27949";
 SHOW WARNINGS;
 
@@ -306,6 +317,26 @@ SELECT inline_size FROM ndbinfo.blobs WHERE table_name = 'inline';
 ALTER TABLE test.inline change column b b longblob comment "NDB_COLUMN=randomBLOB_INLINE_SIZE=25";
 SHOW WARNINGS LIMIT 2;
 
+## ALTER TABLE on table for TINYBLOB
+--error ER_DATA_TOO_LONG
+ALTER TABLE test.inline change column b tb tinyblob;
+## Length value on b (1536) is still larger than what can fit in TINYBLOB length (255)
+ALTER TABLE test.inline change column b b longblob comment "NDB_COLUMN=BLOB_INLINE_SIZE=255";
+--error ER_DATA_TOO_LONG
+ALTER TABLE test.inline change column b tb tinyblob;
+
+## Must update data to allow to fit TINYBLOB
+UPDATE test.inline SET b = repeat(0x424C4F, 64) WHERE a = 1;
+ALTER TABLE test.inline change column b tb tinyblob;
+SELECT a, length(tb) FROM test.inline;
+
+CREATE TABLE test.tiny (
+                      a int primary key,
+                      tb tinyblob) engine = ndb;
+## Always ignored for TINYBLOB
+ALTER TABLE test.tiny change column tb tb tinyblob comment "NDB_COLUMN=BLOB_INLINE_SIZE=128";
+
+DROP TABLE test.tiny;
 DROP TABLE test.inline;
 --echo
 

storage/ndb/plugin/ha_ndbcluster.cc

@@ -8170,6 +8170,15 @@ static int create_ndb_column(THD *thd, NDBCOL &col, Field *field,
             }
             mod_size = size;
           }
+          if (col.getPartSize() == 0) {
+            if (thd) {
+              get_thd_ndb(thd)->push_warning(
+                  "BLOB_INLINE_SIZE not supported for BLOB column with no part "
+                  "table (e.g. TINYBLOB), using default value %d",
+                  size);
+            }
+            mod_size = size;
+          }
           col.setInlineSize(mod_size);
         } else {
           col.setInlineSize(size);
@@ -8364,10 +8373,10 @@ static int create_ndb_column(THD *thd, NDBCOL &col, Field *field,
         col.setType(NDBCOL::Text);
         col.setCharset(cs);
       }
-      col.setInlineSize(256);
       // No parts
       col.setPartSize(0);
       col.setStripeSize(0);
+      set_blob_inline_size(thd, col, 256);
       break;
     // mysql_type_blob:
     case MYSQL_TYPE_GEOMETRY:
@@ -8391,12 +8400,13 @@ static int create_ndb_column(THD *thd, NDBCOL &col, Field *field,
         if (field_blob->max_data_length() < (1 << 8))
           goto mysql_type_tiny_blob;
         else if (field_blob->max_data_length() < (1 << 16)) {
-          set_blob_inline_size(thd, col, 256);
-          col.setPartSize(2000);
-          col.setStripeSize(0);
           if (mod_maxblob->m_found) {
             col.setPartSize(DEFAULT_MAX_BLOB_PART_SIZE);
+          } else {
+            col.setPartSize(2000);
           }
+          col.setStripeSize(0);
+          set_blob_inline_size(thd, col, 256);
         } else if (field_blob->max_data_length() < (1 << 24))
           goto mysql_type_medium_blob;
         else
@@ -8411,12 +8421,13 @@ static int create_ndb_column(THD *thd, NDBCOL &col, Field *field,
         col.setType(NDBCOL::Text);
         col.setCharset(cs);
       }
-      set_blob_inline_size(thd, col, 256);
-      col.setPartSize(4000);
-      col.setStripeSize(0);
       if (mod_maxblob->m_found) {
         col.setPartSize(DEFAULT_MAX_BLOB_PART_SIZE);
+      } else {
+        col.setPartSize(4000);
       }
+      col.setStripeSize(0);
+      set_blob_inline_size(thd, col, 256);
       break;
     mysql_type_long_blob:
     case MYSQL_TYPE_LONG_BLOB:
@@ -8426,10 +8437,10 @@ static int create_ndb_column(THD *thd, NDBCOL &col, Field *field,
         col.setType(NDBCOL::Text);
         col.setCharset(cs);
       }
-      set_blob_inline_size(thd, col, 256);
+      // The mod_maxblob modified has no effect here, already at max
       col.setPartSize(DEFAULT_MAX_BLOB_PART_SIZE);
       col.setStripeSize(0);
-      // The mod_maxblob modified has no effect here, already at max
+      set_blob_inline_size(thd, col, 256);
       break;
 
     // MySQL 5.7 binary-encoded JSON type
@@ -8448,9 +8459,9 @@ static int create_ndb_column(THD *thd, NDBCOL &col, Field *field,
       const int NDB_JSON_PART_SIZE = 8100;
 
       col.setType(NDBCOL::Blob);
-      set_blob_inline_size(thd, col, NDB_JSON_INLINE_SIZE);
       col.setPartSize(NDB_JSON_PART_SIZE);
       col.setStripeSize(0);
+      set_blob_inline_size(thd, col, NDB_JSON_INLINE_SIZE);
       break;
     }