Commit 5434defe authored by unknown's avatar unknown
Browse files

Collection of changes per Bar and Serg. 


acinclude.m4:
  Change in message
mysql-test/r/blackhole.result:
  Lowered the number of inserts.
mysql-test/t/blackhole.test:
  Lowered the number of inserts.
sql/ha_blackhole.cc:
  Added indexes per Serg, correction of indention, added asserts per Serg.
sql/ha_blackhole.h:
  Indention fix, added methods for index...
parent 8a99997d

acinclude.m4

+1 −1
Original line number Diff line number Diff line
@@ -1525,7 +1525,7 @@ AC_DEFUN([MYSQL_CHECK_BLACKHOLEDB], [ 


  case "$blackholedb" in

    yes )

      AC_DEFINE([HAVE_BLACKHOLE_DB], [1], [Builds Blackhole DB])

      AC_DEFINE([HAVE_BLACKHOLE_DB], [1], [Builds Blackhole Storage Engine])

      AC_MSG_RESULT([yes])

      [blackholedb=yes]

      ;;

mysql-test/r/blackhole.result

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ fld5 char(35) DEFAULT '' NOT NULL, 
fld6 char(4) DEFAULT '' NOT NULL,

primary key (auto)

) ENGINE=blackhole;

INSERT INTO t2 VALUES (1192,068305,00,'Colombo','hardware','colicky','');

INSERT INTO t2 VALUES (1193,000000,00,'nondecreasing','implant','thrillingly','');

select t2.fld3 from t2 where companynr = 58 and fld3 like "%imaginable%";

fld3

select fld3 from t2 where fld3 like "%cultivation" ;
@@ -81,3 +83,4 @@ Full-text indexes are called collections 
Only MyISAM tables	support collections

select * from t1 where MATCH(a,b) AGAINST ("only");

a	b

drop table if exists t1,t2;

mysql-test/t/blackhole.test

+2 −1202

File changed.

Preview size limit exceeded, changes collapsed.

sql/ha_blackhole.cc

+62 −38
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ int ha_blackhole::rnd_next(byte *buf) 
int ha_blackhole::rnd_pos(byte * buf, byte *pos)

{

  DBUG_ENTER("ha_blackhole::rnd_pos");

  DBUG_ASSERT(0);

  DBUG_RETURN(0);

}
@@ -95,6 +96,7 @@ int ha_blackhole::rnd_pos(byte * buf, byte *pos) 
void ha_blackhole::position(const byte *record)

{

  DBUG_ENTER("ha_blackhole::position");

  DBUG_ASSERT(0);

  DBUG_VOID_RETURN;

}
@@ -127,38 +129,60 @@ THR_LOCK_DATA **ha_blackhole::store_lock(THD *thd, 
                                         THR_LOCK_DATA **to,

                                         enum thr_lock_type lock_type)

{

  if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK) 

  *to++= &lock;



  return to;

}





int ha_blackhole::index_read(byte * buf, const byte * key,

                             uint key_len, enum ha_rkey_function find_flag)

{

    /* 

      Here is where we get into the guts of a row level lock.

      If TL_UNLOCK is set 

      If we are not doing a LOCK TABLE or DISCARD/IMPORT

      TABLESPACE, then allow multiple writers 

    */

  DBUG_ENTER("ha_blackhole::index_read");

  DBUG_RETURN(0);

}



    if ((lock_type >= TL_WRITE_CONCURRENT_INSERT &&

         lock_type <= TL_WRITE) && !thd->in_lock_tables

        && !thd->tablespace_op)

      lock_type = TL_WRITE_ALLOW_WRITE;



    /* 

      In queries of type INSERT INTO t1 SELECT ... FROM t2 ...

      MySQL would use the lock TL_READ_NO_INSERT on t2, and that

      would conflict with TL_WRITE_ALLOW_WRITE, blocking all inserts

      to t2. Convert the lock to a normal read lock to allow

      concurrent inserts to t2. 

    */

int ha_blackhole::index_read_idx(byte * buf, uint idx, const byte * key,

                                 uint key_len, enum ha_rkey_function find_flag)

{

  DBUG_ENTER("ha_blackhole::index_read_idx");

  DBUG_RETURN(HA_ERR_END_OF_FILE);

}



    if (lock_type == TL_READ_NO_INSERT && !thd->in_lock_tables) 

      lock_type = TL_READ;



    lock.type=lock_type;

int ha_blackhole::index_read_last(byte * buf, const byte * key, uint key_len)

{

  DBUG_ENTER("ha_blackhole::index_read_last");

  DBUG_RETURN(HA_ERR_END_OF_FILE);

}



  *to++= &lock;



  return to;

int ha_blackhole::index_next(byte * buf)

{

  DBUG_ENTER("ha_blackhole::index_next");

  DBUG_RETURN(HA_ERR_END_OF_FILE);

}





int ha_blackhole::index_prev(byte * buf)

{

  DBUG_ENTER("ha_blackhole::index_prev");

  DBUG_RETURN(HA_ERR_END_OF_FILE);

}





int ha_blackhole::index_first(byte * buf)

{

  DBUG_ENTER("ha_blackhole::index_first");

  DBUG_RETURN(HA_ERR_END_OF_FILE);

}





int ha_blackhole::index_last(byte * buf)

{

  DBUG_ENTER("ha_blackhole::index_last");

  DBUG_RETURN(HA_ERR_END_OF_FILE);

}



#endif /* HAVE_BLACKHOLE_DB */

sql/ha_blackhole.h

+13 −4
Original line number Diff line number Diff line
@@ -68,6 +68,15 @@ class ha_blackhole: public handler 
  int rnd_init(bool scan);

  int rnd_next(byte *buf);

  int rnd_pos(byte * buf, byte *pos);

  int index_read(byte * buf, const byte * key,

                 uint key_len, enum ha_rkey_function find_flag);

  int index_read_idx(byte * buf, uint idx, const byte * key,

                     uint key_len, enum ha_rkey_function find_flag);

  int index_read_last(byte * buf, const byte * key, uint key_len);

  int index_next(byte * buf);

  int index_prev(byte * buf);

  int index_first(byte * buf);

  int index_last(byte * buf);

  void position(const byte *record);

  void info(uint flag);

  int external_lock(THD *thd, int lock_type);