WL#1737 Removed superfluous "NoCommit" from insert

parent 376ef1af
...@@ -991,8 +991,16 @@ int ha_ndbcluster::write_row(byte *record) ...@@ -991,8 +991,16 @@ int ha_ndbcluster::write_row(byte *record)
to NoCommit the transaction between each row. to NoCommit the transaction between each row.
Find out how this is detected! Find out how this is detected!
*/ */
if (trans->execute(NoCommit) != 0) rows_inserted++;
DBUG_RETURN(ndb_err(trans)); if ((rows_inserted % bulk_insert_rows) == 0)
{
// Send rows to NDB
DBUG_PRINT("info", ("Sending inserts to NDB, "\
"rows_inserted:%d, bulk_insert_rows: %d",
rows_inserted, bulk_insert_rows));
if (trans->execute(NoCommit) != 0)
DBUG_RETURN(ndb_err(trans));
}
DBUG_RETURN(0); DBUG_RETURN(0);
} }
...@@ -1679,6 +1687,53 @@ int ha_ndbcluster::extra(enum ha_extra_function operation) ...@@ -1679,6 +1687,53 @@ int ha_ndbcluster::extra(enum ha_extra_function operation)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
/*
Start of an insert, remember number of rows to be inserted, it will
be used in write_row and get_autoincrement to send an optimal number
of rows in each roundtrip to the server
SYNOPSIS
rows number of rows to insert, 0 if unknown
*/
void ha_ndbcluster::start_bulk_insert(ha_rows rows)
{
int bytes, batch;
const NDBTAB *tab= (NDBTAB *) m_table;
DBUG_ENTER("start_bulk_insert");
DBUG_PRINT("enter", ("rows: %d", rows));
rows_inserted= 0;
rows_to_insert= rows;
/*
Calculate how many rows that should be inserted
per roundtrip to NDB. This is done in order to minimize the
number of roundtrips as much as possible. However performance will
degrade if too many bytes are inserted, thus it's limited by this
calculation.
*/
bytes= 12 + tab->getRowSizeInBytes() + 4 * tab->getNoOfColumns();
batch= (1024*256); // 1024 rows, with size 256
batch= batch/bytes; //
batch= batch == 0 ? 1 : batch;
DBUG_PRINT("info", ("batch: %d, bytes: %d", batch, bytes));
bulk_insert_rows= batch;
DBUG_VOID_RETURN;
}
/*
End of an insert
*/
int ha_ndbcluster::end_bulk_insert()
{
DBUG_ENTER("end_bulk_insert");
DBUG_RETURN(0);
}
int ha_ndbcluster::extra_opt(enum ha_extra_function operation, ulong cache_size) int ha_ndbcluster::extra_opt(enum ha_extra_function operation, ulong cache_size)
{ {
...@@ -2321,10 +2376,10 @@ int ndbcluster_drop_database(const char *path) ...@@ -2321,10 +2376,10 @@ int ndbcluster_drop_database(const char *path)
longlong ha_ndbcluster::get_auto_increment() longlong ha_ndbcluster::get_auto_increment()
{ {
// NOTE If number of values to be inserted is known int cache_size = rows_to_insert ? rows_to_insert : 32;
// the autoincrement cache could be used here Uint64 auto_value=
Uint64 auto_value= m_ndb->getAutoIncrementValue(m_tabname); m_ndb->getAutoIncrementValue(m_tabname, cache_size);
return (longlong)auto_value; return (longlong)auto_value;
} }
...@@ -2347,7 +2402,10 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg): ...@@ -2347,7 +2402,10 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg):
HA_NO_BLOBS | HA_NO_BLOBS |
HA_DROP_BEFORE_CREATE | HA_DROP_BEFORE_CREATE |
HA_NOT_READ_AFTER_KEY), HA_NOT_READ_AFTER_KEY),
m_use_write(false) m_use_write(false),
rows_to_insert(0),
rows_inserted(0),
bulk_insert_rows(1024)
{ {
DBUG_ENTER("ha_ndbcluster"); DBUG_ENTER("ha_ndbcluster");
......
...@@ -127,6 +127,8 @@ class ha_ndbcluster: public handler ...@@ -127,6 +127,8 @@ class ha_ndbcluster: public handler
const byte *end_key,uint end_key_len, const byte *end_key,uint end_key_len,
enum ha_rkey_function end_search_flag); enum ha_rkey_function end_search_flag);
void start_bulk_insert(ha_rows rows);
int end_bulk_insert();
static Ndb* seize_ndb(); static Ndb* seize_ndb();
static void release_ndb(Ndb* ndb); static void release_ndb(Ndb* ndb);
...@@ -195,6 +197,9 @@ class ha_ndbcluster: public handler ...@@ -195,6 +197,9 @@ class ha_ndbcluster: public handler
NDB_INDEX_TYPE m_indextype[MAX_KEY]; NDB_INDEX_TYPE m_indextype[MAX_KEY];
NdbRecAttr *m_value[NDB_MAX_ATTRIBUTES_IN_TABLE]; NdbRecAttr *m_value[NDB_MAX_ATTRIBUTES_IN_TABLE];
bool m_use_write; bool m_use_write;
ha_rows rows_to_insert;
ha_rows rows_inserted;
ha_rows bulk_insert_rows;
}; };
bool ndbcluster_init(void); bool ndbcluster_init(void);
......
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