Skip to content

M
mariadb
Commit 9ba06976 authored by unknown's avatar unknown
Browse files
Options

This won't be pushed either 


mysql-test/t/handler.test:
  LIMIT tests
sql/mysql_priv.h:
  HANDLER ... LIMIT added
sql/sql_handler.cc:
  HANDLER ... LIMIT added
sql/sql_parse.cc:
  HANDLER ... LIMIT added
sql/sql_yacc.yy:
  HANDLER ... LIMIT added
parent cb2fe473
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 73 deletions
mysql-test/t/handler.test
View file @ 9ba06976
...@@ -45,5 +45,12 @@ handler t2 read a>(18); ...@@ -45,5 +45,12 @@ handler t2 read a>(18);
handler t2 read a<=(18); handler t2 read a<=(18);
handler t2 read a<(18); handler t2 read a<(18);
handler t2 read a first limit 5;
handler t2 read a next limit 3;
handler t2 read a prev limit 10;
handler t2 read a>=(16) limit 4;
handler t2 read a last limit 3;
handler t2 close; handler t2 close;
drop table if exists t1; drop table if exists t1;
sql/mysql_priv.h
View file @ 9ba06976
...@@ -385,7 +385,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables); ...@@ -385,7 +385,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables);
int mysql_ha_open(THD *thd, TABLE_LIST *tables); int mysql_ha_open(THD *thd, TABLE_LIST *tables);
int mysql_ha_close(THD *thd, TABLE_LIST *tables); int mysql_ha_close(THD *thd, TABLE_LIST *tables);
int mysql_ha_read(THD *, TABLE_LIST *,enum enum_ha_read_modes, int mysql_ha_read(THD *, TABLE_LIST *,enum enum_ha_read_modes,
char *,List<Item> *,enum ha_rkey_function); char *,List<Item> *,enum ha_rkey_function,ha_rows,ha_rows);
/* sql_base.cc */ /* sql_base.cc */
void set_item_name(Item *item,char *pos,uint length); void set_item_name(Item *item,char *pos,uint length);
......
sql/sql_handler.cc
View file @ 9ba06976
...@@ -38,9 +38,13 @@ int mysql_ha_close(THD *thd, TABLE_LIST *tables) ...@@ -38,9 +38,13 @@ int mysql_ha_close(THD *thd, TABLE_LIST *tables)
return 0; return 0;
} }
static enum enum_ha_read_modes rkey_to_rnext[]=
{ RNEXT, RNEXT, RPREV, RNEXT, RPREV, RNEXT, RPREV };
int mysql_ha_read(THD *thd, TABLE_LIST *tables, int mysql_ha_read(THD *thd, TABLE_LIST *tables,
enum enum_ha_read_modes mode, char *keyname, List<Item> *key_expr, enum enum_ha_read_modes mode, char *keyname, List<Item> *key_expr,
enum ha_rkey_function ha_rkey_mode) enum ha_rkey_function ha_rkey_mode,
ha_rows select_limit,ha_rows offset_limit)
{ {
int err; int err;
TABLE *table=find_table_by_name(thd, tables->db, tables->name); TABLE *table=find_table_by_name(thd, tables->db, tables->name);
...@@ -71,81 +75,93 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, ...@@ -71,81 +75,93 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
table->file->index_init(keyno); table->file->index_init(keyno);
switch(mode) if (select_limit == thd->default_select_limit) select_limit=1;
select_limit+=offset_limit;
for (uint num_rows=0; num_rows < select_limit; num_rows++)
{ {
case RFIRST: switch(mode)
err=table->file->index_first(table->record[0]); {
break; case RFIRST:
case RLAST: err=table->file->index_first(table->record[0]);
err=table->file->index_last(table->record[0]); mode=RNEXT;
break; break;
case RNEXT: case RLAST:
err=table->file->index_next(table->record[0]); err=table->file->index_last(table->record[0]);
break; mode=RPREV;
case RPREV: break;
err=table->file->index_prev(table->record[0]); case RNEXT:
break; err=table->file->index_next(table->record[0]);
case RKEY: break;
{ case RPREV:
KEY *keyinfo=table->key_info+keyno; err=table->file->index_prev(table->record[0]);
uint key_len=0, i; break;
byte *key, *buf; case RKEY:
if (key_expr->elements > keyinfo->key_parts)
{
my_printf_error(ER_TOO_MANY_KEY_PARTS,ER(ER_TOO_MANY_KEY_PARTS),
MYF(0),keyinfo->key_parts);
return -1;
}
for (i=0; i < key_expr->elements; i++)
key_len+=keyinfo->key_part[i].store_length;
if (!(key=sql_calloc(ALIGN_SIZE(key_len))))
{
send_error(&thd->net,ER_OUTOFMEMORY);
exit(-1);
}
List_iterator<Item> it_ke(*key_expr);
for (i=0, buf=key; i < key_expr->elements; i++)
{ {
uint maybe_null= test(keyinfo->key_part[i].null_bit); KEY *keyinfo=table->key_info+keyno;
store_key_item ski=store_key_item(keyinfo->key_part[i].field, uint key_len=0, i;
(char*)buf+maybe_null,maybe_null ? (char*) buf : 0, byte *key, *buf;
keyinfo->key_part[i].length, it_ke++); if (key_expr->elements > keyinfo->key_parts)
ski.copy(); {
buf+=keyinfo->key_part[i].store_length; my_printf_error(ER_TOO_MANY_KEY_PARTS,ER(ER_TOO_MANY_KEY_PARTS),
MYF(0),keyinfo->key_parts);
return -1;
}
for (i=0; i < key_expr->elements; i++)
key_len+=keyinfo->key_part[i].store_length;
if (!(key=sql_calloc(ALIGN_SIZE(key_len))))
{
send_error(&thd->net,ER_OUTOFMEMORY);
return -1;
}
List_iterator<Item> it_ke(*key_expr);
for (i=0, buf=key; i < key_expr->elements; i++)
{
uint maybe_null= test(keyinfo->key_part[i].null_bit);
store_key_item ski=store_key_item(keyinfo->key_part[i].field,
(char*)buf+maybe_null,maybe_null ? (char*) buf : 0,
keyinfo->key_part[i].length, it_ke++);
ski.copy();
buf+=keyinfo->key_part[i].store_length;
}
err=table->file->index_read(table->record[0],
key,key_len,ha_rkey_mode);
mode=rkey_to_rnext[(int)ha_rkey_mode];
break;
} }
err=table->file->index_read(table->record[0], default:
key,key_len,ha_rkey_mode); send_error(&thd->net,ER_ILLEGAL_HA);
break; return -1;
} }
default:
send_error(&thd->net,ER_ILLEGAL_HA); if (err && err != HA_ERR_KEY_NOT_FOUND && err != HA_ERR_END_OF_FILE)
exit(-1); {
} sql_print_error("mysql_ha_read: Got error %d when reading table",
err);
if (err && err != HA_ERR_KEY_NOT_FOUND && err != HA_ERR_END_OF_FILE) table->file->print_error(err,MYF(0));
{ return -1;
sql_print_error("mysql_ha_read: Got error %d when reading table", }
err); if (num_rows>=offset_limit)
table->file->print_error(err,MYF(0));
return -1;
}
send_fields(thd,list,1);
if (!err)
{
String *packet = &thd->packet;
Item *item;
packet->length(0);
it.rewind();
while ((item=it++))
{ {
if (item->send(packet)) if (num_rows==offset_limit) send_fields(thd,list,1);
if (!err)
{ {
packet->free(); // Free used String *packet = &thd->packet;
my_error(ER_OUT_OF_RESOURCES,MYF(0)); Item *item;
return -1; packet->length(0);
it.rewind();
while ((item=it++))
{
if (item->send(packet))
{
packet->free(); // Free used
my_error(ER_OUT_OF_RESOURCES,MYF(0));
return -1;
}
}
my_net_write(&thd->net, (char*)packet->ptr(), packet->length());
} }
} }
my_net_write(&thd->net, (char*)packet->ptr(), packet->length());
} }
send_eof(&thd->net); send_eof(&thd->net);
return 0; return 0;
......
sql/sql_parse.cc
View file @ 9ba06976
...@@ -2010,7 +2010,8 @@ mysql_execute_command(void) ...@@ -2010,7 +2010,8 @@ mysql_execute_command(void)
if (check_db_used(thd,tables) || check_table_access(thd,SELECT_ACL, tables)) if (check_db_used(thd,tables) || check_table_access(thd,SELECT_ACL, tables))
goto error; goto error;
res = mysql_ha_read(thd, tables, lex->ha_read_mode, res = mysql_ha_read(thd, tables, lex->ha_read_mode,
lex->backup_dir, lex->insert_list, lex->ha_rkey_mode); lex->backup_dir, lex->insert_list, lex->ha_rkey_mode,
lex->select_limit, lex->offset_limit);
break; break;
case SQLCOM_BEGIN: case SQLCOM_BEGIN:
......
sql/sql_yacc.yy
View file @ 9ba06976
...@@ -201,6 +201,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); ...@@ -201,6 +201,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
%token LEVEL_SYM %token LEVEL_SYM
%token LEX_HOSTNAME %token LEX_HOSTNAME
%token LIKE %token LIKE
%token LIMIT
%token LINES %token LINES
%token LOCAL_SYM %token LOCAL_SYM
%token LOGS_SYM %token LOGS_SYM
...@@ -312,7 +313,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize); ...@@ -312,7 +313,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
%token FAST_SYM %token FAST_SYM
%token FLOAT_SYM %token FLOAT_SYM
%token INT_SYM %token INT_SYM
%token LIMIT
%token LONGBLOB %token LONGBLOB
%token LONGTEXT %token LONGTEXT
%token MEDIUMBLOB %token MEDIUMBLOB
...@@ -2860,7 +2860,7 @@ handler: ...@@ -2860,7 +2860,7 @@ handler:
if (!add_table_to_list($2,0,0)) if (!add_table_to_list($2,0,0))
YYABORT; YYABORT;
} }
| HANDLER_SYM table_ident READ_SYM ident handler_read_function | HANDLER_SYM table_ident READ_SYM ident handler_read_function limit_clause
{ {
Lex->sql_command = SQLCOM_HA_READ; Lex->sql_command = SQLCOM_HA_READ;
Lex->backup_dir= $4.str; Lex->backup_dir= $4.str;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7