database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-641 This commit enables CS to return a warning on non-supported ZEROFILL

Browse Source 
keyword.

The change potentially replaces tabs with spaces in the bison's ddl.y file.
This commit is contained in:
Roman Nozdrin
2020-02-18 12:30:30 +00:00
parent 2eb5af1d24
commit 31d597d87e
2 changed files with 138 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dbcon/ddlpackage/ddl.y
View File

@ -63,7 +63,6 @@ char* copy_string(const char *str);
%pure-parser %pure-parser
%lex-param {void * scanner} %lex-param {void * scanner}
%parse-param {struct ddlpackage::pass_to_bison * x} %parse-param {struct ddlpackage::pass_to_bison * x}
%debug
/* Bison uses this to generate a C union definition. This is used to /* Bison uses this to generate a C union definition. This is used to
store the application created values associated with syntactic store the application created values associated with syntactic
@ -1007,7 +1006,7 @@ exact_numeric_type:
$2->fLength = DDLDatatypeLength[DDL_UNSIGNED_NUMERIC]; $2->fLength = DDLDatatypeLength[DDL_UNSIGNED_NUMERIC];
$$ = $2; $$ = $2;
} }
| DECIMAL opt_precision_scale opt_signed opt_zerofill | DECIMAL opt_precision_scale opt_signed
{ {
$2->fType = DDL_DECIMAL; $2->fType = DDL_DECIMAL;
$$ = $2; $$ = $2;
@ -1113,16 +1112,16 @@ opt_signed:
SIGNED {$$ = NULL;} SIGNED {$$ = NULL;}
| {$$ = NULL;} | {$$ = NULL;}
opt_zerofill: opt_zerofill:
ZEROFILL {$$ = NULL;} ZEROFILL {$$ = NULL;}
| {$$ = NULL;} | {$$ = NULL;}
opt_display_width: opt_display_width:
'(' ICONST ')' {$$ = NULL;} '(' ICONST ')' {$$ = NULL;}
| {$$ = NULL;} | {$$ = NULL;}
; ;
approximate_numeric_type: approximate_numeric_type:
DOUBLE opt_display_precision_scale_null DOUBLE opt_display_precision_scale_null
{ {
$$ = new ColumnType(DDL_DOUBLE); $$ = new ColumnType(DDL_DOUBLE);
@ -1165,20 +1164,20 @@ approximate_numeric_type:
} }
; ;
opt_display_precision_scale_null: opt_display_precision_scale_null:
'(' ICONST ')' {$$ = NULL;} '(' ICONST ')' {$$ = NULL;}
| |
'(' ICONST ',' ICONST ')' {$$ = NULL;} '(' ICONST ',' ICONST ')' {$$ = NULL;}
| {$$ = NULL;} | {$$ = NULL;}
; ;
literal: literal:
ICONST ICONST
| string_literal | string_literal
| FCONST | FCONST
; ;
datetime_type: datetime_type:
DATETIME opt_time_precision DATETIME opt_time_precision
{ {
$$ = new ColumnType(DDL_DATETIME); $$ = new ColumnType(DDL_DATETIME);
@ -1206,12 +1205,12 @@ datetime_type:
$$->fPrecision = $2; $$->fPrecision = $2;
} }
opt_time_precision: opt_time_precision:
'(' ICONST ')' {$$ = atoi($2);} '(' ICONST ')' {$$ = atoi($2);}
| {$$ = -1;} | {$$ = -1;}
; ;
drop_column_def: drop_column_def:
DROP column_name drop_behavior {$$ = new AtaDropColumn($2, $3);} DROP column_name drop_behavior {$$ = new AtaDropColumn($2, $3);}
| DROP COLUMN column_name drop_behavior {$$ = new AtaDropColumn($3, $4);} | DROP COLUMN column_name drop_behavior {$$ = new AtaDropColumn($3, $4);}
| DROP COLUMN '(' column_name_list ')' {$$ = new AtaDropColumns($4);} | DROP COLUMN '(' column_name_list ')' {$$ = new AtaDropColumns($4);}
@ -1219,22 +1218,22 @@ drop_column_def:
| DROP COLUMNS '(' column_name_list ')' {$$ = new AtaDropColumns($4);} | DROP COLUMNS '(' column_name_list ')' {$$ = new AtaDropColumns($4);}
; ;
drop_behavior: drop_behavior:
CASCADE {$$ = DDL_CASCADE;} CASCADE {$$ = DDL_CASCADE;}
| RESTRICT {$$ = DDL_RESTRICT;} | RESTRICT {$$ = DDL_RESTRICT;}
| {$$ = DDL_NO_ACTION;} | {$$ = DDL_NO_ACTION;}
; ;
alter_column_def: alter_column_def:
ALTER opt_column column_name SET default_clause {$$ = new AtaSetColumnDefault($3, $5);} ALTER opt_column column_name SET default_clause {$$ = new AtaSetColumnDefault($3, $5);}
| ALTER opt_column column_name DROP DEFAULT {$$ = new AtaDropColumnDefault($3);} | ALTER opt_column column_name DROP DEFAULT {$$ = new AtaDropColumnDefault($3);}
; ;
opt_column: opt_column:
COLUMN COLUMN
| |
; ;
%% %%

24
dbcon/mysql/ha_mcs_ddl.cpp
View File

@ -2299,6 +2299,22 @@ static bool get_field_default_value(THD *thd, Field *field, String *def_value,
return has_default; return has_default;
} }
/*
Utility function search for ZEROFILL
*/
bool hasZerofillDecimal(TABLE *table_arg)
{
for (Field **field= table_arg->field; *field; field++)
{
if (((*field)->flags & ZEROFILL_FLAG)
&& typeid (**field) == typeid(Field_new_decimal))
return true;
}
return false;
}
int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* create_info, cal_connection_info& ci) int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* create_info, cal_connection_info& ci)
{ {
#ifdef MCS_DEBUG #ifdef MCS_DEBUG
@ -2578,6 +2594,14 @@ int ha_mcs_impl_create_(const char* name, TABLE* table_arg, HA_CREATE_INFO* crea
cout << "ha_mcs_impl_create_: ProcessDDL error, now in state NOT_ALTER" << endl; cout << "ha_mcs_impl_create_: ProcessDDL error, now in state NOT_ALTER" << endl;
#endif #endif
} }
else
{
if (hasZerofillDecimal(table_arg))
{
push_warning(thd, Sql_condition::WARN_LEVEL_WARN,
WARN_OPTION_IGNORED, "ZEROFILL is ignored in ColumnStore");
}
}
return rc; return rc;
} }