Bug#21854004: GCOLS:INNODB: FAILING ASSERTION: I < TABLE->N_DEF

roylyseng · roylyseng · commit 56aae03a51a3 · 2015-10-26T14:23:33.000+01:00
When changing a generated column's expression, a check for whether the
expression was the same as before was missing.  If the expression is
changed, storage engine may need to rebuild the column.
(A virtual column generally does not need rebuilding, but if is indexed,
the index will need rebuilding).

Two new utility functions to check that generation expressions are equal
are implemented: Field::gcol_expr_is_equal().

In fill_alter_inplace_info(), generate change commands for the storage
engine according to the following:

- It is possible a convert a base column to a generated column and vice
  versa as long as the generated column is stored. Set the handler flag
  ALTER_STORED_COLUMN_TYPE for this case.

- If both source and target column is generated and generation expression
  is modified, set handler flag ALTER_STORED_COLUMN_TYPE if column is
  stored and ALTER_VIRTUAL_COLUMN_TYPE if column is virtual.

Elaborate testing has been added:

- Check modification to and from generated column.

- Check modification of generated column with and without non-unique
  index and unique index.
diff --git a/mysql-test/suite/gcol/inc/gcol_column_def_options.inc b/mysql-test/suite/gcol/inc/gcol_column_def_options.inc
@@ -454,3 +454,97 @@ INSERT INTO t1 (a) VALUES (NULL), (1);
 SELECT * FROM t1;
 
 DROP TABLE t1;
+
+--echo # Bug#21854004: GCOLS:INNODB: FAILING ASSERTION: I < TABLE->N_DEF
+CREATE TABLE t1(
+ col1 INTEGER PRIMARY KEY,
+ col2 INTEGER,
+ col3 INTEGER,
+ col4 INTEGER,
+ vgc1 INTEGER AS (col2 + col3) VIRTUAL,
+ sgc1 INTEGER AS (col2 - col3) STORED
+);
+
+INSERT INTO t1(col1, col2, col3) VALUES
+ (1, 10, 100), (2, 20, 200);
+
+SELECT * FROM t1;
+
+# Change expression of a virtual generated column
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) VIRTUAL;
+SELECT * FROM t1;
+
+# Change expression of a stored generated column
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) STORED;
+SELECT * FROM t1;
+
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 + col3) VIRTUAL;
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 - col3) STORED;
+
+if ($support_virtual_index)
+{
+ALTER TABLE t1 ADD INDEX vgc1 (vgc1);
+}
+ALTER TABLE t1 ADD INDEX sgc1 (sgc1);
+
+if ($support_virtual_index)
+{
+# Change expression of a virtual generated column, with index
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) VIRTUAL;
+SELECT * FROM t1;
+SELECT vgc1 FROM t1;
+}
+
+# Change expression of a stored generated column, with index
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) STORED;
+SELECT * FROM t1;
+SELECT sgc1 FROM t1;
+
+if ($support_virtual_index)
+{
+ALTER TABLE t1 DROP INDEX vgc1;
+}
+ALTER TABLE t1 DROP INDEX sgc1;
+
+if ($support_virtual_index)
+{
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 + col3) VIRTUAL;
+ALTER TABLE t1 ADD UNIQUE INDEX vgc1 (vgc1);
+}
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 - col3) STORED;
+ALTER TABLE t1 ADD UNIQUE INDEX sgc1 (sgc1);
+
+# Change expression of a virtual generated column, with unique index
+if ($support_virtual_index)
+{
+--error ER_DUP_ENTRY
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 / col3) VIRTUAL;
+}
+--error ER_DUP_ENTRY
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) STORED;
+
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) VIRTUAL;
+SELECT * FROM t1;
+SELECT vgc1 FROM t1;
+
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 * col3) STORED;
+SELECT * FROM t1;
+SELECT sgc1 FROM t1;
+
+# Change virtual generated column to become stored
+--error ER_UNSUPPORTED_ACTION_ON_GENERATED_COLUMN
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) STORED;
+
+# Change stored generated column to become virtual
+--error ER_UNSUPPORTED_ACTION_ON_GENERATED_COLUMN
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) VIRTUAL;
+
+# Change base column to become stored generated column:
+ALTER TABLE t1 MODIFY COLUMN col4 INTEGER AS (col1 + col2 + col3) STORED;
+SELECT * FROM t1;
+
+# Change stored generated column to become base column:
+ALTER TABLE t1 MODIFY COLUMN col4 INTEGER;
+SELECT * FROM t1;
+
+DROP TABLE t1;
diff --git a/mysql-test/suite/gcol/r/gcol_column_def_options_innodb.result b/mysql-test/suite/gcol/r/gcol_column_def_options_innodb.result
@@ -538,8 +538,8 @@ ALTER TABLE t ADD c int(11) as (a+b), ADD f varchar(10) as ('aaa');
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 0
 ALTER TABLE t CHANGE c c int(11) as (a), CHANGE f f varchar(10) as('bbb');
-affected rows: 0
-info: Records: 0  Duplicates: 0  Warnings: 0
+affected rows: 1
+info: Records: 1  Duplicates: 0  Warnings: 0
 # Change order should be ALGORITHM=INPLACE on Innodb
 ALTER TABLE t CHANGE c c int(11) as (a) after f;
 affected rows: 1
@@ -589,6 +589,96 @@ a	b	c
 NULL	NULL	NULL
 1	-1	0
 DROP TABLE t1;
+# Bug#21854004: GCOLS:INNODB: FAILING ASSERTION: I < TABLE->N_DEF
+CREATE TABLE t1(
+col1 INTEGER PRIMARY KEY,
+col2 INTEGER,
+col3 INTEGER,
+col4 INTEGER,
+vgc1 INTEGER AS (col2 + col3) VIRTUAL,
+sgc1 INTEGER AS (col2 - col3) STORED
+);
+INSERT INTO t1(col1, col2, col3) VALUES
+(1, 10, 100), (2, 20, 200);
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	110	-90
+2	20	200	NULL	220	-180
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) VIRTUAL;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	1000	-90
+2	20	200	NULL	4000	-180
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) STORED;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	1000	0
+2	20	200	NULL	4000	0
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 + col3) VIRTUAL;
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 - col3) STORED;
+ALTER TABLE t1 ADD INDEX vgc1 (vgc1);
+ALTER TABLE t1 ADD INDEX sgc1 (sgc1);
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) VIRTUAL;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	1000	-90
+2	20	200	NULL	4000	-180
+SELECT vgc1 FROM t1;
+vgc1
+1000
+4000
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) STORED;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	1000	0
+2	20	200	NULL	4000	0
+SELECT sgc1 FROM t1;
+sgc1
+0
+0
+ALTER TABLE t1 DROP INDEX vgc1;
+ALTER TABLE t1 DROP INDEX sgc1;
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 + col3) VIRTUAL;
+ALTER TABLE t1 ADD UNIQUE INDEX vgc1 (vgc1);
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 - col3) STORED;
+ALTER TABLE t1 ADD UNIQUE INDEX sgc1 (sgc1);
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 / col3) VIRTUAL;
+ERROR 23000: Duplicate entry '0' for key 'vgc1'
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) STORED;
+ERROR 23000: Duplicate entry '0' for key 'sgc1'
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) VIRTUAL;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	1000	-90
+2	20	200	NULL	4000	-180
+SELECT vgc1 FROM t1;
+vgc1
+1000
+4000
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 * col3) STORED;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	1000	1000
+2	20	200	NULL	4000	4000
+SELECT sgc1 FROM t1;
+sgc1
+1000
+4000
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) STORED;
+ERROR HY000: 'Changing the STORED status' is not supported for generated columns.
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) VIRTUAL;
+ERROR HY000: 'Changing the STORED status' is not supported for generated columns.
+ALTER TABLE t1 MODIFY COLUMN col4 INTEGER AS (col1 + col2 + col3) STORED;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	111	1000	1000
+2	20	200	222	4000	4000
+ALTER TABLE t1 MODIFY COLUMN col4 INTEGER;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	111	1000	1000
+2	20	200	222	4000	4000
+DROP TABLE t1;
 DROP VIEW  IF EXISTS v1,v2;
 DROP TABLE IF EXISTS t1,t2,t3;
 DROP PROCEDURE IF EXISTS p1;
diff --git a/mysql-test/suite/gcol/r/gcol_column_def_options_myisam.result b/mysql-test/suite/gcol/r/gcol_column_def_options_myisam.result
@@ -542,6 +542,81 @@ a	b	c
 NULL	NULL	NULL
 1	-1	0
 DROP TABLE t1;
+# Bug#21854004: GCOLS:INNODB: FAILING ASSERTION: I < TABLE->N_DEF
+CREATE TABLE t1(
+col1 INTEGER PRIMARY KEY,
+col2 INTEGER,
+col3 INTEGER,
+col4 INTEGER,
+vgc1 INTEGER AS (col2 + col3) VIRTUAL,
+sgc1 INTEGER AS (col2 - col3) STORED
+);
+INSERT INTO t1(col1, col2, col3) VALUES
+(1, 10, 100), (2, 20, 200);
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	110	-90
+2	20	200	NULL	220	-180
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) VIRTUAL;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	1000	-90
+2	20	200	NULL	4000	-180
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) STORED;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	1000	0
+2	20	200	NULL	4000	0
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 + col3) VIRTUAL;
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 - col3) STORED;
+ALTER TABLE t1 ADD INDEX sgc1 (sgc1);
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) STORED;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	110	0
+2	20	200	NULL	220	0
+SELECT sgc1 FROM t1;
+sgc1
+0
+0
+ALTER TABLE t1 DROP INDEX sgc1;
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 - col3) STORED;
+ALTER TABLE t1 ADD UNIQUE INDEX sgc1 (sgc1);
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) STORED;
+ERROR 23000: Duplicate entry '0' for key 'sgc1'
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) VIRTUAL;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	1000	-90
+2	20	200	NULL	4000	-180
+SELECT vgc1 FROM t1;
+vgc1
+1000
+4000
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 * col3) STORED;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	NULL	1000	1000
+2	20	200	NULL	4000	4000
+SELECT sgc1 FROM t1;
+sgc1
+1000
+4000
+ALTER TABLE t1 MODIFY COLUMN vgc1 INTEGER AS (col2 * col3) STORED;
+ERROR HY000: 'Changing the STORED status' is not supported for generated columns.
+ALTER TABLE t1 MODIFY COLUMN sgc1 INTEGER AS (col2 / col3) VIRTUAL;
+ERROR HY000: 'Changing the STORED status' is not supported for generated columns.
+ALTER TABLE t1 MODIFY COLUMN col4 INTEGER AS (col1 + col2 + col3) STORED;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	111	1000	1000
+2	20	200	222	4000	4000
+ALTER TABLE t1 MODIFY COLUMN col4 INTEGER;
+SELECT * FROM t1;
+col1	col2	col3	col4	vgc1	sgc1
+1	10	100	111	1000	1000
+2	20	200	222	4000	4000
+DROP TABLE t1;
 DROP VIEW  IF EXISTS v1,v2;
 DROP TABLE IF EXISTS t1,t2,t3;
 DROP PROCEDURE IF EXISTS p1;
diff --git a/sql/field.cc b/sql/field.cc
@@ -40,6 +40,7 @@
 #include "template_utils.h"              // pointer_cast
 #include "tztime.h"                      // Time_zone
 #include "spatial.h"                     // Geometry
+#include "sql_base.h"                    // is_equal
 
 #include <algorithm>
 #include <memory>                        // auto_ptr
@@ -7102,6 +7103,38 @@ type_conversion_status Field_str::store(double nr)
 }
 
 
+/**
+  Check whether generated columns' expressions are the same.
+
+  @param field  An existing field to compare against
+
+  @return true means the same, otherwise not.
+*/
+
+bool Field::gcol_expr_is_equal(const Field *field) const
+{
+  DBUG_ASSERT(is_gcol() && field->is_gcol());
+
+  return gcol_info->expr_item->eq(field->gcol_info->expr_item, true);
+}
+
+
+/**
+  Check whether generated columns' expressions are the same.
+
+  @param field  A new field to compare against
+
+  @return true means the same, otherwise not.
+*/
+
+bool Field::gcol_expr_is_equal(const Create_field *field) const
+{
+  DBUG_ASSERT(is_gcol() && field->is_gcol());
+
+  return ::is_equal(&gcol_info->expr_str, &field->gcol_info->expr_str);
+}
+
+
 uint Field::is_equal(Create_field *new_field)
 {
   return (new_field->sql_type == real_type());
diff --git a/sql/field.h b/sql/field.h
@@ -890,6 +890,8 @@ class Field: public Proto_field
   static bool type_can_have_key_part(enum_field_types);
   static enum_field_types field_type_merge(enum_field_types, enum_field_types);
   static Item_result result_merge_type(enum_field_types);
+  bool gcol_expr_is_equal(const Field *field) const;
+  bool gcol_expr_is_equal(const Create_field *field) const;
   virtual bool eq(Field *field)
   {
     return (ptr == field->ptr && m_null_ptr == field->m_null_ptr &&
@@ -1467,11 +1469,13 @@ class Field: public Proto_field
   virtual uint32 max_display_length()= 0;
 
   /**
-    Whether a field being created is compatible with a existing one.
+    Whether a field being created is type-compatible with an existing one.
 
     Used by the ALTER TABLE code to evaluate whether the new definition
     of a table is compatible with the old definition so that it can
     determine if data needs to be copied over (table data change).
+    Constraints and generation clause (default value, generation expression)
+    are not checked by this function.
   */
   virtual uint is_equal(Create_field *new_field);
   /* convert decimal to longlong with overflow check */
@@ -4325,6 +4329,7 @@ class Create_field :public Sql_alloc
   /* Used to make a clone of this object for ALTER/CREATE TABLE */
   Create_field *clone(MEM_ROOT *mem_root) const
     { return new (mem_root) Create_field(*this); }
+  bool is_gcol() const { return gcol_info; }
   bool is_virtual_gcol() const
   { return gcol_info && !gcol_info->get_field_stored(); }
   void create_length_to_internal_length(void);
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
