Commit 38a3df4a authored by Sergey Petrunya's avatar Sergey Petrunya

- Enable mapping of CHAR(n)

- preparations for support of bulk INSERT.
parent 38d4e025
...@@ -527,7 +527,7 @@ ColumnDataConverter *map_field_to_validator(Field *field, const char *validator_ ...@@ -527,7 +527,7 @@ ColumnDataConverter *map_field_to_validator(Field *field, const char *validator_
case MYSQL_TYPE_VAR_STRING: case MYSQL_TYPE_VAR_STRING:
case MYSQL_TYPE_VARCHAR: case MYSQL_TYPE_VARCHAR:
//case MYSQL_TYPE_STRING: <-- todo: should we allow end-padded 'CHAR(N)'? case MYSQL_TYPE_STRING: // these are space padded strings.
if (!strcmp(validator_name, validator_blob) || if (!strcmp(validator_name, validator_blob) ||
!strcmp(validator_name, validator_ascii) || !strcmp(validator_name, validator_ascii) ||
!strcmp(validator_name, validator_text)) !strcmp(validator_name, validator_text))
...@@ -893,7 +893,19 @@ int ha_cassandra::rnd_pos(uchar *buf, uchar *pos) ...@@ -893,7 +893,19 @@ int ha_cassandra::rnd_pos(uchar *buf, uchar *pos)
DBUG_RETURN(rc); DBUG_RETURN(rc);
} }
#if 0
void ha_cassandra::start_bulk_insert(ha_rows rows)
{
/* Do nothing? */
}
int ha_cassandra::end_bulk_insert()
{
// TODO!
return 0;
}
#endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Dummy implementations start // Dummy implementations start
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
......
...@@ -145,7 +145,10 @@ class ha_cassandra: public handler ...@@ -145,7 +145,10 @@ class ha_cassandra: public handler
*/ */
virtual double read_time(uint, uint, ha_rows rows) virtual double read_time(uint, uint, ha_rows rows)
{ return (double) rows / 20.0+1; } { return (double) rows / 20.0+1; }
#if 0
virtual void start_bulk_insert(ha_rows rows);
virtual int end_bulk_insert();
#endif
/* /*
Everything below are methods that we implement in ha_example.cc. Everything below are methods that we implement in ha_example.cc.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment