dict0dict.c:
Revert the test changes to wait for a full push of new auto-inc algorithm innobase/dict/dict0dict.c: Revert the test changes to wait for a full push of new auto-inc algorithm
This commit is contained in:
parent
b6b2546c18
commit
81a75051de
@ -261,7 +261,7 @@ dict_table_get_index_noninline(
|
|||||||
{
|
{
|
||||||
return(dict_table_get_index(table, name));
|
return(dict_table_get_index(table, name));
|
||||||
}
|
}
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
Initializes the autoinc counter. It is not an error to initialize an already
|
Initializes the autoinc counter. It is not an error to initialize an already
|
||||||
initialized counter. */
|
initialized counter. */
|
||||||
@ -270,7 +270,7 @@ void
|
|||||||
dict_table_autoinc_initialize(
|
dict_table_autoinc_initialize(
|
||||||
/*==========================*/
|
/*==========================*/
|
||||||
dict_table_t* table, /* in: table */
|
dict_table_t* table, /* in: table */
|
||||||
ib_longlong value) /* in: next value to assign to a row */
|
ib_longlong value) /* in: value which was assigned to a row */
|
||||||
{
|
{
|
||||||
mutex_enter(&(table->autoinc_mutex));
|
mutex_enter(&(table->autoinc_mutex));
|
||||||
|
|
||||||
@ -281,8 +281,8 @@ dict_table_autoinc_initialize(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
Gets the next autoinc value (== autoinc counter value), 0 if not yet
|
Gets the next autoinc value, 0 if not yet initialized. If initialized,
|
||||||
initialized. If initialized, increments the counter by 1. */
|
increments the counter by 1. */
|
||||||
|
|
||||||
ib_longlong
|
ib_longlong
|
||||||
dict_table_autoinc_get(
|
dict_table_autoinc_get(
|
||||||
@ -298,8 +298,8 @@ dict_table_autoinc_get(
|
|||||||
|
|
||||||
value = 0;
|
value = 0;
|
||||||
} else {
|
} else {
|
||||||
value = table->autoinc;
|
|
||||||
table->autoinc = table->autoinc + 1;
|
table->autoinc = table->autoinc + 1;
|
||||||
|
value = table->autoinc;
|
||||||
}
|
}
|
||||||
|
|
||||||
mutex_exit(&(table->autoinc_mutex));
|
mutex_exit(&(table->autoinc_mutex));
|
||||||
@ -334,43 +334,20 @@ dict_table_autoinc_read(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/************************************************************************
|
/************************************************************************
|
||||||
Peeks the autoinc counter value, 0 if not yet initialized. Does not
|
Updates the autoinc counter if the value supplied is bigger than the
|
||||||
increment the counter. The read not protected by any mutex! */
|
|
||||||
|
|
||||||
ib_longlong
|
|
||||||
dict_table_autoinc_peek(
|
|
||||||
/*====================*/
|
|
||||||
/* out: value of the counter */
|
|
||||||
dict_table_t* table) /* in: table */
|
|
||||||
{
|
|
||||||
ib_longlong value;
|
|
||||||
|
|
||||||
if (!table->autoinc_inited) {
|
|
||||||
|
|
||||||
value = 0;
|
|
||||||
} else {
|
|
||||||
value = table->autoinc;
|
|
||||||
}
|
|
||||||
|
|
||||||
return(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/************************************************************************
|
|
||||||
Updates the autoinc counter if the value supplied is equal or bigger than the
|
|
||||||
current value. If not inited, does nothing. */
|
current value. If not inited, does nothing. */
|
||||||
|
|
||||||
void
|
void
|
||||||
dict_table_autoinc_update(
|
dict_table_autoinc_update(
|
||||||
/*======================*/
|
/*======================*/
|
||||||
|
|
||||||
dict_table_t* table, /* in: table */
|
dict_table_t* table, /* in: table */
|
||||||
ib_longlong value) /* in: value which was assigned to a row */
|
ib_longlong value) /* in: value which was assigned to a row */
|
||||||
{
|
{
|
||||||
mutex_enter(&(table->autoinc_mutex));
|
mutex_enter(&(table->autoinc_mutex));
|
||||||
|
|
||||||
if (table->autoinc_inited) {
|
if (table->autoinc_inited) {
|
||||||
if (value >= table->autoinc) {
|
if (value > table->autoinc) {
|
||||||
table->autoinc = value + 1;
|
table->autoinc = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user