2009-02-17 10:05:45 +00:00
|
|
|
/*****************************************************************************
|
|
|
|
|
|
|
|
Copyright (c) 2005, 2009, Innobase Oy. All Rights Reserved.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify it under
|
|
|
|
the terms of the GNU General Public License as published by the Free Software
|
|
|
|
Foundation; version 2 of the License.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
|
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License along with
|
|
|
|
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
|
|
|
Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
|
|
|
*****************************************************************************/
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/**************************************************//**
|
|
|
|
@file row/row0merge.c
|
2007-04-04 11:05:33 +00:00
|
|
|
New index creation routines using a merge sort
|
|
|
|
|
|
|
|
Created 12/4/2005 Jan Lindstrom
|
2007-06-08 07:37:07 +00:00
|
|
|
Completed by Sunny Bains and Marko Makela
|
2007-04-04 11:05:33 +00:00
|
|
|
*******************************************************/
|
|
|
|
|
|
|
|
#include "row0merge.h"
|
|
|
|
#include "row0ext.h"
|
|
|
|
#include "row0row.h"
|
|
|
|
#include "row0upd.h"
|
|
|
|
#include "row0ins.h"
|
|
|
|
#include "row0sel.h"
|
|
|
|
#include "dict0dict.h"
|
|
|
|
#include "dict0mem.h"
|
|
|
|
#include "dict0boot.h"
|
|
|
|
#include "dict0crea.h"
|
|
|
|
#include "dict0load.h"
|
|
|
|
#include "btr0btr.h"
|
|
|
|
#include "mach0data.h"
|
|
|
|
#include "trx0rseg.h"
|
|
|
|
#include "trx0trx.h"
|
|
|
|
#include "trx0roll.h"
|
|
|
|
#include "trx0undo.h"
|
|
|
|
#include "trx0purge.h"
|
|
|
|
#include "trx0rec.h"
|
|
|
|
#include "que0que.h"
|
|
|
|
#include "rem0cmp.h"
|
|
|
|
#include "read0read.h"
|
|
|
|
#include "os0file.h"
|
|
|
|
#include "lock0lock.h"
|
|
|
|
#include "data0data.h"
|
|
|
|
#include "data0type.h"
|
|
|
|
#include "que0que.h"
|
|
|
|
#include "pars0pars.h"
|
|
|
|
#include "mem0mem.h"
|
|
|
|
#include "log0log.h"
|
2007-06-08 07:37:07 +00:00
|
|
|
#include "ut0sort.h"
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
#include "handler0alter.h"
|
2007-04-11 08:16:14 +00:00
|
|
|
|
2007-09-21 08:07:58 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
2009-05-25 12:09:24 +00:00
|
|
|
/** Set these in order ot enable debug printout. */
|
|
|
|
/* @{ */
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
/** Log the outcome of each row_merge_cmp() call, comparing records. */
|
2007-09-21 08:07:58 +00:00
|
|
|
static ibool row_merge_print_cmp;
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
/** Log each record read from temporary file. */
|
2007-09-21 08:07:58 +00:00
|
|
|
static ibool row_merge_print_read;
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
/** Log each record write to temporary file. */
|
2007-09-21 08:07:58 +00:00
|
|
|
static ibool row_merge_print_write;
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
/** Log each row_merge_blocks() call, merging two blocks of records to
|
|
|
|
a bigger one. */
|
|
|
|
static ibool row_merge_print_block;
|
|
|
|
/** Log each block read from temporary file. */
|
|
|
|
static ibool row_merge_print_block_read;
|
|
|
|
/** Log each block read from temporary file. */
|
|
|
|
static ibool row_merge_print_block_write;
|
2009-05-25 12:09:24 +00:00
|
|
|
/* @} */
|
2007-09-21 08:07:58 +00:00
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
2009-05-25 12:09:24 +00:00
|
|
|
/** @brief Block size for I/O operations in merge sort.
|
|
|
|
|
|
|
|
The minimum is UNIV_PAGE_SIZE, or page_get_free_space_of_empty()
|
|
|
|
rounded to a power of 2.
|
2007-09-26 13:52:08 +00:00
|
|
|
|
|
|
|
When not creating a PRIMARY KEY that contains column prefixes, this
|
|
|
|
can be set as small as UNIV_PAGE_SIZE / 2. See the comment above
|
|
|
|
ut_ad(data_size < sizeof(row_merge_block_t)). */
|
2007-09-24 08:52:15 +00:00
|
|
|
typedef byte row_merge_block_t[1048576];
|
2007-06-08 07:37:07 +00:00
|
|
|
|
2009-05-25 12:09:24 +00:00
|
|
|
/** @brief Secondary buffer for I/O operations of merge records.
|
2007-06-08 07:37:07 +00:00
|
|
|
|
2009-05-25 12:09:24 +00:00
|
|
|
This buffer is used for writing or reading a record that spans two
|
|
|
|
row_merge_block_t. Thus, it must be able to hold one merge record,
|
|
|
|
whose maximum size is the same as the minimum size of
|
|
|
|
row_merge_block_t. */
|
2007-09-27 06:13:33 +00:00
|
|
|
typedef byte mrec_buf_t[UNIV_PAGE_SIZE];
|
2007-06-08 07:37:07 +00:00
|
|
|
|
2009-05-25 12:09:24 +00:00
|
|
|
/** @brief Merge record in row_merge_block_t.
|
|
|
|
|
|
|
|
The format is the same as a record in ROW_FORMAT=COMPACT with the
|
|
|
|
exception that the REC_N_NEW_EXTRA_BYTES are omitted. */
|
2007-06-08 07:37:07 +00:00
|
|
|
typedef byte mrec_t;
|
|
|
|
|
2009-05-25 12:09:24 +00:00
|
|
|
/** Buffer for sorting in main memory. */
|
2007-06-08 07:37:07 +00:00
|
|
|
struct row_merge_buf_struct {
|
2009-05-25 12:09:24 +00:00
|
|
|
mem_heap_t* heap; /*!< memory heap where allocated */
|
|
|
|
dict_index_t* index; /*!< the index the tuples belong to */
|
|
|
|
ulint total_size; /*!< total amount of data bytes */
|
|
|
|
ulint n_tuples; /*!< number of data tuples */
|
|
|
|
ulint max_tuples; /*!< maximum number of data tuples */
|
|
|
|
const dfield_t**tuples; /*!< array of pointers to
|
2007-06-08 07:37:07 +00:00
|
|
|
arrays of fields that form
|
|
|
|
the data tuples */
|
2009-05-25 12:09:24 +00:00
|
|
|
const dfield_t**tmp_tuples; /*!< temporary copy of tuples,
|
2007-06-08 07:37:07 +00:00
|
|
|
for sorting */
|
2007-04-11 12:17:55 +00:00
|
|
|
};
|
|
|
|
|
2009-05-25 12:09:24 +00:00
|
|
|
/** Buffer for sorting in main memory. */
|
2007-06-08 07:37:07 +00:00
|
|
|
typedef struct row_merge_buf_struct row_merge_buf_t;
|
2007-04-11 12:17:55 +00:00
|
|
|
|
2009-05-25 12:09:24 +00:00
|
|
|
/** Information about temporary files used in merge sort */
|
2007-06-08 07:37:07 +00:00
|
|
|
struct merge_file_struct {
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
int fd; /*!< file descriptor */
|
|
|
|
ulint offset; /*!< file offset (end of file) */
|
|
|
|
ib_uint64_t n_rec; /*!< number of records in the file */
|
2007-04-11 12:17:55 +00:00
|
|
|
};
|
|
|
|
|
2009-05-25 12:09:24 +00:00
|
|
|
/** Information about temporary files used in merge sort */
|
2007-06-08 07:37:07 +00:00
|
|
|
typedef struct merge_file_struct merge_file_t;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-21 08:07:58 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
2009-05-25 09:52:29 +00:00
|
|
|
/******************************************************//**
|
2007-09-21 08:07:58 +00:00
|
|
|
Display a merge tuple. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
row_merge_tuple_print(
|
|
|
|
/*==================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
FILE* f, /*!< in: output stream */
|
|
|
|
const dfield_t* entry, /*!< in: tuple to print */
|
|
|
|
ulint n_fields)/*!< in: number of fields in the tuple */
|
2007-09-21 08:07:58 +00:00
|
|
|
{
|
|
|
|
ulint j;
|
|
|
|
|
|
|
|
for (j = 0; j < n_fields; j++) {
|
|
|
|
const dfield_t* field = &entry[j];
|
|
|
|
|
|
|
|
if (dfield_is_null(field)) {
|
|
|
|
fputs("\n NULL;", f);
|
|
|
|
} else {
|
2007-10-23 06:46:12 +00:00
|
|
|
ulint field_len = dfield_get_len(field);
|
|
|
|
ulint len = ut_min(field_len, 20);
|
2007-09-21 08:07:58 +00:00
|
|
|
if (dfield_is_ext(field)) {
|
|
|
|
fputs("\nE", f);
|
|
|
|
} else {
|
|
|
|
fputs("\n ", f);
|
|
|
|
}
|
2007-10-23 06:46:12 +00:00
|
|
|
ut_print_buf(f, dfield_get_data(field), len);
|
|
|
|
if (len != field_len) {
|
|
|
|
fprintf(f, " (total %lu bytes)", field_len);
|
2007-09-21 08:07:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
putc('\n', f);
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/******************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Allocate a sort buffer.
|
|
|
|
@return own: sort buffer */
|
2007-04-04 11:05:33 +00:00
|
|
|
static
|
2007-06-08 07:37:07 +00:00
|
|
|
row_merge_buf_t*
|
|
|
|
row_merge_buf_create_low(
|
|
|
|
/*=====================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
mem_heap_t* heap, /*!< in: heap where allocated */
|
|
|
|
dict_index_t* index, /*!< in: secondary index */
|
|
|
|
ulint max_tuples, /*!< in: maximum number of data tuples */
|
|
|
|
ulint buf_size) /*!< in: size of the buffer, in bytes */
|
2007-04-12 10:32:16 +00:00
|
|
|
{
|
2007-06-08 07:37:07 +00:00
|
|
|
row_merge_buf_t* buf;
|
|
|
|
|
2007-08-03 11:49:51 +00:00
|
|
|
ut_ad(max_tuples > 0);
|
|
|
|
ut_ad(max_tuples <= sizeof(row_merge_block_t));
|
|
|
|
ut_ad(max_tuples < buf_size);
|
|
|
|
|
2007-08-16 13:25:56 +00:00
|
|
|
buf = mem_heap_zalloc(heap, buf_size);
|
2007-06-08 07:37:07 +00:00
|
|
|
buf->heap = heap;
|
|
|
|
buf->index = index;
|
|
|
|
buf->max_tuples = max_tuples;
|
|
|
|
buf->tuples = mem_heap_alloc(heap,
|
|
|
|
2 * max_tuples * sizeof *buf->tuples);
|
|
|
|
buf->tmp_tuples = buf->tuples + max_tuples;
|
|
|
|
|
|
|
|
return(buf);
|
2007-04-12 10:32:16 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/******************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Allocate a sort buffer.
|
|
|
|
@return own: sort buffer */
|
2007-04-12 10:32:16 +00:00
|
|
|
static
|
2007-06-08 07:37:07 +00:00
|
|
|
row_merge_buf_t*
|
|
|
|
row_merge_buf_create(
|
2007-04-04 11:05:33 +00:00
|
|
|
/*=================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
dict_index_t* index) /*!< in: secondary index */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
2007-06-08 07:37:07 +00:00
|
|
|
row_merge_buf_t* buf;
|
|
|
|
ulint max_tuples;
|
|
|
|
ulint buf_size;
|
|
|
|
mem_heap_t* heap;
|
2007-04-12 10:32:16 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
max_tuples = sizeof(row_merge_block_t)
|
|
|
|
/ ut_max(1, dict_index_get_min_size(index));
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
buf_size = (sizeof *buf) + (max_tuples - 1) * sizeof *buf->tuples;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
heap = mem_heap_create(buf_size + sizeof(row_merge_block_t));
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
buf = row_merge_buf_create_low(heap, index, max_tuples, buf_size);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
return(buf);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/******************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Empty a sort buffer.
|
|
|
|
@return sort buffer */
|
2007-04-04 11:05:33 +00:00
|
|
|
static
|
2007-08-03 11:49:51 +00:00
|
|
|
row_merge_buf_t*
|
2007-06-08 07:37:07 +00:00
|
|
|
row_merge_buf_empty(
|
|
|
|
/*================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
row_merge_buf_t* buf) /*!< in,own: sort buffer */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
2007-06-08 07:37:07 +00:00
|
|
|
ulint buf_size;
|
|
|
|
ulint max_tuples = buf->max_tuples;
|
|
|
|
mem_heap_t* heap = buf->heap;
|
|
|
|
dict_index_t* index = buf->index;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
buf_size = (sizeof *buf) + (max_tuples - 1) * sizeof *buf->tuples;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
mem_heap_empty(heap);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-08-03 11:49:51 +00:00
|
|
|
return(row_merge_buf_create_low(heap, index, max_tuples, buf_size));
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/******************************************************//**
|
2007-06-08 07:37:07 +00:00
|
|
|
Deallocate a sort buffer. */
|
2007-04-04 11:05:33 +00:00
|
|
|
static
|
2007-06-08 07:37:07 +00:00
|
|
|
void
|
|
|
|
row_merge_buf_free(
|
|
|
|
/*===============*/
|
2009-05-25 05:30:14 +00:00
|
|
|
row_merge_buf_t* buf) /*!< in,own: sort buffer, to be freed */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
2007-06-08 07:37:07 +00:00
|
|
|
mem_heap_free(buf->heap);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/******************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Insert a data tuple into a sort buffer.
|
|
|
|
@return TRUE if added, FALSE if out of space */
|
2007-04-04 11:05:33 +00:00
|
|
|
static
|
2007-06-08 07:37:07 +00:00
|
|
|
ibool
|
|
|
|
row_merge_buf_add(
|
|
|
|
/*==============*/
|
2009-05-25 05:30:14 +00:00
|
|
|
row_merge_buf_t* buf, /*!< in/out: sort buffer */
|
|
|
|
const dtuple_t* row, /*!< in: row in clustered index */
|
|
|
|
const row_ext_t* ext) /*!< in: cache of externally stored
|
2007-06-08 07:37:07 +00:00
|
|
|
column prefixes, or NULL */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
ulint i;
|
|
|
|
ulint n_fields;
|
|
|
|
ulint data_size;
|
|
|
|
ulint extra_size;
|
|
|
|
const dict_index_t* index;
|
|
|
|
dfield_t* entry;
|
|
|
|
dfield_t* field;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (buf->n_tuples >= buf->max_tuples) {
|
|
|
|
return(FALSE);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2007-08-15 11:54:15 +00:00
|
|
|
UNIV_PREFETCH_R(row->fields);
|
|
|
|
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
index = buf->index;
|
|
|
|
|
|
|
|
n_fields = dict_index_get_n_fields(index);
|
2007-06-08 07:37:07 +00:00
|
|
|
|
|
|
|
entry = mem_heap_alloc(buf->heap, n_fields * sizeof *entry);
|
|
|
|
buf->tuples[buf->n_tuples] = entry;
|
|
|
|
field = entry;
|
|
|
|
|
|
|
|
data_size = 0;
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
extra_size = UT_BITS_IN_BYTES(index->n_nullable);
|
2007-06-08 07:37:07 +00:00
|
|
|
|
2007-09-19 07:14:36 +00:00
|
|
|
for (i = 0; i < n_fields; i++, field++) {
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
const dict_field_t* ifield;
|
2007-06-08 07:37:07 +00:00
|
|
|
const dict_col_t* col;
|
|
|
|
ulint col_no;
|
|
|
|
const dfield_t* row_field;
|
2007-09-19 07:14:36 +00:00
|
|
|
ulint len;
|
2007-06-08 07:37:07 +00:00
|
|
|
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
ifield = dict_index_get_nth_field(index, i);
|
2007-06-08 07:37:07 +00:00
|
|
|
col = ifield->col;
|
|
|
|
col_no = dict_col_get_no(col);
|
|
|
|
row_field = dtuple_get_nth_field(row, col_no);
|
|
|
|
dfield_copy(field, row_field);
|
2007-10-23 06:46:12 +00:00
|
|
|
len = dfield_get_len(field);
|
2007-06-08 07:37:07 +00:00
|
|
|
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
if (dfield_is_null(field)) {
|
|
|
|
ut_ad(!(col->prtype & DATA_NOT_NULL));
|
|
|
|
continue;
|
|
|
|
} else if (UNIV_LIKELY(!ext)) {
|
|
|
|
} else if (dict_index_is_clust(index)) {
|
|
|
|
/* Flag externally stored fields. */
|
2007-11-29 12:47:18 +00:00
|
|
|
const byte* buf = row_ext_lookup(ext, col_no,
|
|
|
|
&len);
|
2007-09-19 07:14:36 +00:00
|
|
|
if (UNIV_LIKELY_NULL(buf)) {
|
2007-11-27 09:11:45 +00:00
|
|
|
ut_a(buf != field_ref_zero);
|
2007-09-19 07:14:36 +00:00
|
|
|
if (i < dict_index_get_n_unique(index)) {
|
|
|
|
dfield_set_data(field, buf, len);
|
|
|
|
} else {
|
|
|
|
dfield_set_ext(field);
|
2007-10-23 06:46:12 +00:00
|
|
|
len = dfield_get_len(field);
|
2007-09-19 07:14:36 +00:00
|
|
|
}
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
}
|
|
|
|
} else {
|
2007-11-29 12:47:18 +00:00
|
|
|
const byte* buf = row_ext_lookup(ext, col_no,
|
|
|
|
&len);
|
2007-06-08 07:37:07 +00:00
|
|
|
if (UNIV_LIKELY_NULL(buf)) {
|
2007-11-27 09:11:45 +00:00
|
|
|
ut_a(buf != field_ref_zero);
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
dfield_set_data(field, buf, len);
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* If a column prefix index, take only the prefix */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (ifield->prefix_len) {
|
2007-10-23 06:46:12 +00:00
|
|
|
len = dtype_get_at_most_n_mbchars(
|
2007-06-08 07:37:07 +00:00
|
|
|
col->prtype,
|
|
|
|
col->mbminlen, col->mbmaxlen,
|
|
|
|
ifield->prefix_len,
|
2007-10-23 06:46:12 +00:00
|
|
|
len, dfield_get_data(field));
|
|
|
|
dfield_set_len(field, len);
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-19 07:14:36 +00:00
|
|
|
ut_ad(len <= col->len || col->mtype == DATA_BLOB);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (ifield->fixed_len) {
|
2007-09-19 07:14:36 +00:00
|
|
|
ut_ad(len == ifield->fixed_len);
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
ut_ad(!dfield_is_ext(field));
|
|
|
|
} else if (dfield_is_ext(field)) {
|
|
|
|
extra_size += 2;
|
2007-09-19 07:14:36 +00:00
|
|
|
} else if (len < 128
|
2007-06-08 07:37:07 +00:00
|
|
|
|| (col->len < 256 && col->mtype != DATA_BLOB)) {
|
|
|
|
extra_size++;
|
|
|
|
} else {
|
2007-09-19 07:14:36 +00:00
|
|
|
/* For variable-length columns, we look up the
|
|
|
|
maximum length from the column itself. If this
|
|
|
|
is a prefix index column shorter than 256 bytes,
|
|
|
|
this will waste one byte. */
|
2007-06-08 07:37:07 +00:00
|
|
|
extra_size += 2;
|
|
|
|
}
|
2007-09-19 07:14:36 +00:00
|
|
|
data_size += len;
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
{
|
|
|
|
ulint size;
|
|
|
|
ulint extra;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
size = rec_get_converted_size_comp(index,
|
2007-06-08 07:37:07 +00:00
|
|
|
REC_STATUS_ORDINARY,
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
entry, n_fields, &extra);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
ut_ad(data_size + extra_size + REC_N_NEW_EXTRA_BYTES == size);
|
|
|
|
ut_ad(extra_size + REC_N_NEW_EXTRA_BYTES == extra);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
2007-06-08 07:37:07 +00:00
|
|
|
#endif /* UNIV_DEBUG */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Add to the total size of the record in row_merge_block_t
|
|
|
|
the encoded length of extra_size and the extra bytes (extra_size).
|
|
|
|
See row_merge_buf_write() for the variable-length encoding
|
|
|
|
of extra_size. */
|
2007-06-08 20:30:26 +00:00
|
|
|
data_size += (extra_size + 1) + ((extra_size + 1) >= 0x80);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-26 13:52:08 +00:00
|
|
|
/* The following assertion may fail if row_merge_block_t is
|
|
|
|
declared very small and a PRIMARY KEY is being created with
|
|
|
|
many prefix columns. In that case, the record may exceed the
|
|
|
|
page_zip_rec_needs_ext() limit. However, no further columns
|
|
|
|
will be moved to external storage until the record is inserted
|
|
|
|
to the clustered index B-tree. */
|
|
|
|
ut_ad(data_size < sizeof(row_merge_block_t));
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Reserve one byte for the end marker of row_merge_block_t. */
|
|
|
|
if (buf->total_size + data_size >= sizeof(row_merge_block_t) - 1) {
|
|
|
|
return(FALSE);
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
buf->total_size += data_size;
|
|
|
|
buf->n_tuples++;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
field = entry;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Copy the data fields. */
|
2007-08-15 11:54:15 +00:00
|
|
|
|
|
|
|
do {
|
2007-10-23 06:46:12 +00:00
|
|
|
dfield_dup(field++, buf->heap);
|
2007-08-15 11:54:15 +00:00
|
|
|
} while (--n_fields);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
return(TRUE);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 12:09:24 +00:00
|
|
|
/** Structure for reporting duplicate records. */
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
struct row_merge_dup_struct {
|
2009-05-25 12:09:24 +00:00
|
|
|
const dict_index_t* index; /*!< index being sorted */
|
|
|
|
TABLE* table; /*!< MySQL table object */
|
|
|
|
ulint n_dup; /*!< number of duplicates */
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
};
|
|
|
|
|
2009-05-25 12:09:24 +00:00
|
|
|
/** Structure for reporting duplicate records. */
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
typedef struct row_merge_dup_struct row_merge_dup_t;
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*************************************************************//**
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
Report a duplicate key. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
row_merge_dup_report(
|
|
|
|
/*=================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
row_merge_dup_t* dup, /*!< in/out: for reporting duplicates */
|
|
|
|
const dfield_t* entry) /*!< in: duplicate index entry */
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
{
|
2007-09-27 08:28:25 +00:00
|
|
|
mrec_buf_t buf;
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
const dtuple_t* tuple;
|
|
|
|
dtuple_t tuple_store;
|
2007-09-27 08:28:25 +00:00
|
|
|
const rec_t* rec;
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
const dict_index_t* index = dup->index;
|
|
|
|
ulint n_fields= dict_index_get_n_fields(index);
|
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
|
|
ulint* offsets;
|
2007-09-27 08:28:25 +00:00
|
|
|
ulint n_ext;
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
|
|
|
|
if (dup->n_dup++) {
|
|
|
|
/* Only report the first duplicate record,
|
|
|
|
but count all duplicate records. */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-09-28 07:05:57 +00:00
|
|
|
rec_offs_init(offsets_);
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
|
2007-09-27 08:28:25 +00:00
|
|
|
/* Convert the tuple to a record and then to MySQL format. */
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
|
2007-09-27 08:28:25 +00:00
|
|
|
tuple = dtuple_from_fields(&tuple_store, entry, n_fields);
|
|
|
|
n_ext = dict_index_is_clust(index) ? dtuple_get_n_ext(tuple) : 0;
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
|
2007-09-27 08:28:25 +00:00
|
|
|
rec = rec_convert_dtuple_to_rec(buf, index, tuple, n_ext);
|
|
|
|
offsets = rec_get_offsets(rec, index, offsets_, ULINT_UNDEFINED,
|
|
|
|
&heap);
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
|
2007-09-27 08:28:25 +00:00
|
|
|
innobase_rec_to_mysql(dup->table, rec, index, offsets);
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
|
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Compare two tuples.
|
|
|
|
@return 1, 0, -1 if a is greater, equal, less, respectively, than b */
|
2007-04-04 11:05:33 +00:00
|
|
|
static
|
2007-04-16 09:13:44 +00:00
|
|
|
int
|
2007-06-08 07:37:07 +00:00
|
|
|
row_merge_tuple_cmp(
|
|
|
|
/*================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
ulint n_field,/*!< in: number of fields */
|
|
|
|
const dfield_t* a, /*!< in: first tuple to be compared */
|
|
|
|
const dfield_t* b, /*!< in: second tuple to be compared */
|
|
|
|
row_merge_dup_t* dup) /*!< in/out: for reporting duplicates */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
int cmp;
|
|
|
|
const dfield_t* field = a;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2009-01-07 14:17:47 +00:00
|
|
|
/* Compare the fields of the tuples until a difference is
|
|
|
|
found or we run out of fields to compare. If !cmp at the
|
|
|
|
end, the tuples are equal. */
|
2007-06-08 07:37:07 +00:00
|
|
|
do {
|
|
|
|
cmp = cmp_dfield_dfield(a++, b++);
|
|
|
|
} while (!cmp && --n_field);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
if (UNIV_UNLIKELY(!cmp) && UNIV_LIKELY_NULL(dup)) {
|
2009-01-07 14:17:47 +00:00
|
|
|
/* Report a duplicate value error if the tuples are
|
|
|
|
logically equal. NULL columns are logically inequal,
|
|
|
|
although they are equal in the sorting order. Find
|
|
|
|
out if any of the fields are NULL. */
|
|
|
|
for (b = field; b != a; b++) {
|
|
|
|
if (dfield_is_null(b)) {
|
|
|
|
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
row_merge_dup_report(dup, field);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
2007-04-16 09:13:44 +00:00
|
|
|
|
2009-01-07 14:17:47 +00:00
|
|
|
func_exit:
|
2007-06-08 07:37:07 +00:00
|
|
|
return(cmp);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 12:09:24 +00:00
|
|
|
/** Wrapper for row_merge_tuple_sort() to inject some more context to
|
|
|
|
UT_SORT_FUNCTION_BODY().
|
|
|
|
@param a array of tuples that being sorted
|
|
|
|
@param b aux (work area), same size as tuples[]
|
|
|
|
@param c lower bound of the sorting area, inclusive
|
|
|
|
@param d upper bound of the sorting area, inclusive */
|
2007-06-08 07:37:07 +00:00
|
|
|
#define row_merge_tuple_sort_ctx(a,b,c,d) \
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
row_merge_tuple_sort(n_field, dup, a, b, c, d)
|
2009-05-25 12:09:24 +00:00
|
|
|
/** Wrapper for row_merge_tuple_cmp() to inject some more context to
|
|
|
|
UT_SORT_FUNCTION_BODY().
|
|
|
|
@param a first tuple to be compared
|
|
|
|
@param b second tuple to be compared
|
|
|
|
@return 1, 0, -1 if a is greater, equal, less, respectively, than b */
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
#define row_merge_tuple_cmp_ctx(a,b) row_merge_tuple_cmp(n_field, a, b, dup)
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2009-05-26 12:28:49 +00:00
|
|
|
/**********************************************************************//**
|
|
|
|
Merge sort the tuple buffer in main memory. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
row_merge_tuple_sort(
|
|
|
|
/*=================*/
|
|
|
|
ulint n_field,/*!< in: number of fields */
|
|
|
|
row_merge_dup_t* dup, /*!< in/out: for reporting duplicates */
|
|
|
|
const dfield_t** tuples, /*!< in/out: tuples */
|
|
|
|
const dfield_t** aux, /*!< in/out: work area */
|
|
|
|
ulint low, /*!< in: lower bound of the
|
|
|
|
sorting area, inclusive */
|
|
|
|
ulint high) /*!< in: upper bound of the
|
|
|
|
sorting area, exclusive */
|
|
|
|
{
|
2007-06-08 07:37:07 +00:00
|
|
|
UT_SORT_FUNCTION_BODY(row_merge_tuple_sort_ctx,
|
|
|
|
tuples, aux, low, high, row_merge_tuple_cmp_ctx);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/******************************************************//**
|
2007-06-08 07:37:07 +00:00
|
|
|
Sort a buffer. */
|
2007-04-04 11:05:33 +00:00
|
|
|
static
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
void
|
2007-06-08 07:37:07 +00:00
|
|
|
row_merge_buf_sort(
|
2007-04-04 11:05:33 +00:00
|
|
|
/*===============*/
|
2009-05-25 05:30:14 +00:00
|
|
|
row_merge_buf_t* buf, /*!< in/out: sort buffer */
|
|
|
|
row_merge_dup_t* dup) /*!< in/out: for reporting duplicates */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
row_merge_tuple_sort(dict_index_get_n_unique(buf->index), dup,
|
2007-06-08 07:37:07 +00:00
|
|
|
buf->tuples, buf->tmp_tuples, 0, buf->n_tuples);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/******************************************************//**
|
2007-06-08 07:37:07 +00:00
|
|
|
Write a buffer to a block. */
|
2007-04-04 11:05:33 +00:00
|
|
|
static
|
2007-06-08 07:37:07 +00:00
|
|
|
void
|
|
|
|
row_merge_buf_write(
|
|
|
|
/*================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
const row_merge_buf_t* buf, /*!< in: sorted buffer */
|
2007-09-21 11:44:57 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
2009-05-25 05:30:14 +00:00
|
|
|
const merge_file_t* of, /*!< in: output file */
|
2007-09-21 11:44:57 +00:00
|
|
|
#endif /* UNIV_DEBUG */
|
2009-05-25 05:30:14 +00:00
|
|
|
row_merge_block_t* block) /*!< out: buffer for writing to file */
|
2007-09-21 11:44:57 +00:00
|
|
|
#ifndef UNIV_DEBUG
|
|
|
|
# define row_merge_buf_write(buf, of, block) row_merge_buf_write(buf, block)
|
|
|
|
#endif /* !UNIV_DEBUG */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
const dict_index_t* index = buf->index;
|
|
|
|
ulint n_fields= dict_index_get_n_fields(index);
|
|
|
|
byte* b = &(*block)[0];
|
2007-06-08 07:37:07 +00:00
|
|
|
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
ulint i;
|
2007-06-08 07:37:07 +00:00
|
|
|
|
|
|
|
for (i = 0; i < buf->n_tuples; i++) {
|
|
|
|
ulint size;
|
|
|
|
ulint extra_size;
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
const dfield_t* entry = buf->tuples[i];
|
2007-06-08 07:37:07 +00:00
|
|
|
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
size = rec_get_converted_size_comp(index,
|
2007-06-08 07:37:07 +00:00
|
|
|
REC_STATUS_ORDINARY,
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
entry, n_fields,
|
2007-06-08 07:37:07 +00:00
|
|
|
&extra_size);
|
|
|
|
ut_ad(size > extra_size);
|
|
|
|
ut_ad(extra_size >= REC_N_NEW_EXTRA_BYTES);
|
|
|
|
extra_size -= REC_N_NEW_EXTRA_BYTES;
|
|
|
|
size -= REC_N_NEW_EXTRA_BYTES;
|
|
|
|
|
|
|
|
/* Encode extra_size + 1 */
|
|
|
|
if (extra_size + 1 < 0x80) {
|
branches/zip: Fix most MSVC (Windows) compilation warnings.
lock_get_table(), locks_row_eq_lock(), buf_page_get_mutex(): Add return
after ut_error. On Windows, ut_error is not declared as "noreturn".
Add explicit type casts when assigning ulint to byte to get rid of
"possible loss of precision" warnings.
struct i_s_table_cache_struct: Declare rows_used, rows_allocd as ulint
instead of ullint. 32 bits should be enough.
fill_innodb_trx_from_cache(), i_s_zip_fill_low(): Cast 64-bit unsigned
integers to longlong when calling Field::store(longlong, bool is_unsigned).
Otherwise, the compiler would implicitly convert them to double and
invoke Field::store(double) instead.
recv_truncate_group(), recv_copy_group(), recv_calc_lsn_on_data_add():
Cast ib_uint64_t expressions to ulint to get rid of "possible loss of
precision" warnings. (There should not be any loss of precision in
these cases.)
log_close(), log_checkpoint_margin(): Declare some variables as ib_uint64_t
instead of ulint, so that there won't be any potential loss of precision.
mach_write_ull(): Cast the second argument of mach_write_to_4() to ulint.
OS_FILE_FROM_FD(): Cast the return value of _get_osfhandle() to HANDLE.
row_merge_dict_table_get_index(): Cast the parameter of mem_free() to (void*)
in order to get rid of the bogus MSVC warning C4090, which has been reported
as MSVC bug 101661:
<http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=101661>
row_mysql_read_blob_ref(): To get rid of a bogus MSVC warning C4090,
drop a const qualifier.
2008-03-04 08:57:07 +00:00
|
|
|
*b++ = (byte) (extra_size + 1);
|
2007-06-08 07:37:07 +00:00
|
|
|
} else {
|
2007-06-08 20:30:26 +00:00
|
|
|
ut_ad((extra_size + 1) < 0x8000);
|
branches/zip: Fix most MSVC (Windows) compilation warnings.
lock_get_table(), locks_row_eq_lock(), buf_page_get_mutex(): Add return
after ut_error. On Windows, ut_error is not declared as "noreturn".
Add explicit type casts when assigning ulint to byte to get rid of
"possible loss of precision" warnings.
struct i_s_table_cache_struct: Declare rows_used, rows_allocd as ulint
instead of ullint. 32 bits should be enough.
fill_innodb_trx_from_cache(), i_s_zip_fill_low(): Cast 64-bit unsigned
integers to longlong when calling Field::store(longlong, bool is_unsigned).
Otherwise, the compiler would implicitly convert them to double and
invoke Field::store(double) instead.
recv_truncate_group(), recv_copy_group(), recv_calc_lsn_on_data_add():
Cast ib_uint64_t expressions to ulint to get rid of "possible loss of
precision" warnings. (There should not be any loss of precision in
these cases.)
log_close(), log_checkpoint_margin(): Declare some variables as ib_uint64_t
instead of ulint, so that there won't be any potential loss of precision.
mach_write_ull(): Cast the second argument of mach_write_to_4() to ulint.
OS_FILE_FROM_FD(): Cast the return value of _get_osfhandle() to HANDLE.
row_merge_dict_table_get_index(): Cast the parameter of mem_free() to (void*)
in order to get rid of the bogus MSVC warning C4090, which has been reported
as MSVC bug 101661:
<http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=101661>
row_mysql_read_blob_ref(): To get rid of a bogus MSVC warning C4090,
drop a const qualifier.
2008-03-04 08:57:07 +00:00
|
|
|
*b++ = (byte) (0x80 | ((extra_size + 1) >> 8));
|
2007-06-08 07:37:07 +00:00
|
|
|
*b++ = (byte) (extra_size + 1);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
ut_ad(b + size < block[1]);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
rec_convert_dtuple_to_rec_comp(b + extra_size, 0, index,
|
|
|
|
REC_STATUS_ORDINARY,
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
entry, n_fields);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
b += size;
|
2007-09-21 11:44:57 +00:00
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (row_merge_print_write) {
|
|
|
|
fprintf(stderr, "row_merge_buf_write %p,%d,%lu %lu",
|
|
|
|
(void*) b, of->fd, (ulong) of->offset,
|
|
|
|
(ulong) i);
|
|
|
|
row_merge_tuple_print(stderr, entry, n_fields);
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Write an "end-of-chunk" marker. */
|
|
|
|
ut_a(b < block[1]);
|
2007-06-08 20:30:26 +00:00
|
|
|
ut_a(b == block[0] + buf->total_size);
|
2007-06-08 07:37:07 +00:00
|
|
|
*b++ = 0;
|
|
|
|
#ifdef UNIV_DEBUG_VALGRIND
|
|
|
|
/* The rest of the block is uninitialized. Initialize it
|
|
|
|
to avoid bogus warnings. */
|
2007-09-20 12:20:17 +00:00
|
|
|
memset(b, 0xff, block[1] - b);
|
2007-06-08 07:37:07 +00:00
|
|
|
#endif /* UNIV_DEBUG_VALGRIND */
|
2007-09-21 08:07:58 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (row_merge_print_write) {
|
2007-09-21 11:44:57 +00:00
|
|
|
fprintf(stderr, "row_merge_buf_write %p,%d,%lu EOF\n",
|
|
|
|
(void*) b, of->fd, (ulong) of->offset);
|
2007-09-21 08:07:58 +00:00
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/******************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Create a memory heap and allocate space for row_merge_rec_offsets().
|
|
|
|
@return memory heap */
|
2007-04-04 11:05:33 +00:00
|
|
|
static
|
2007-06-08 07:37:07 +00:00
|
|
|
mem_heap_t*
|
|
|
|
row_merge_heap_create(
|
|
|
|
/*==================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
const dict_index_t* index, /*!< in: record descriptor */
|
|
|
|
ulint** offsets1, /*!< out: offsets */
|
|
|
|
ulint** offsets2) /*!< out: offsets */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
2007-06-08 20:30:26 +00:00
|
|
|
ulint i = 1 + REC_OFFS_HEADER_SIZE
|
2007-06-08 07:37:07 +00:00
|
|
|
+ dict_index_get_n_fields(index);
|
|
|
|
mem_heap_t* heap = mem_heap_create(2 * i * sizeof *offsets1);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
*offsets1 = mem_heap_alloc(heap, i * sizeof *offsets1);
|
|
|
|
*offsets2 = mem_heap_alloc(heap, i * sizeof *offsets2);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
(*offsets1)[0] = (*offsets2)[0] = i;
|
|
|
|
(*offsets1)[1] = (*offsets2)[1] = dict_index_get_n_fields(index);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
return(heap);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/**********************************************************************//**
|
2007-06-08 07:37:07 +00:00
|
|
|
Search an index object by name and column names. If several indexes match,
|
2009-05-25 05:30:14 +00:00
|
|
|
return the index with the max id.
|
|
|
|
@return matching index, NULL if not found */
|
2007-04-04 11:05:33 +00:00
|
|
|
static
|
2007-06-08 07:37:07 +00:00
|
|
|
dict_index_t*
|
|
|
|
row_merge_dict_table_get_index(
|
|
|
|
/*===========================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
dict_table_t* table, /*!< in: table */
|
|
|
|
const merge_index_def_t*index_def) /*!< in: index definition */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
2007-06-08 07:37:07 +00:00
|
|
|
ulint i;
|
|
|
|
dict_index_t* index;
|
|
|
|
const char** column_names;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
column_names = mem_alloc(index_def->n_fields * sizeof *column_names);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
for (i = 0; i < index_def->n_fields; ++i) {
|
|
|
|
column_names[i] = index_def->fields[i].field_name;
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
index = dict_table_get_index_by_max_id(
|
|
|
|
table, index_def->name, column_names, index_def->n_fields);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
branches/zip: Fix most MSVC (Windows) compilation warnings.
lock_get_table(), locks_row_eq_lock(), buf_page_get_mutex(): Add return
after ut_error. On Windows, ut_error is not declared as "noreturn".
Add explicit type casts when assigning ulint to byte to get rid of
"possible loss of precision" warnings.
struct i_s_table_cache_struct: Declare rows_used, rows_allocd as ulint
instead of ullint. 32 bits should be enough.
fill_innodb_trx_from_cache(), i_s_zip_fill_low(): Cast 64-bit unsigned
integers to longlong when calling Field::store(longlong, bool is_unsigned).
Otherwise, the compiler would implicitly convert them to double and
invoke Field::store(double) instead.
recv_truncate_group(), recv_copy_group(), recv_calc_lsn_on_data_add():
Cast ib_uint64_t expressions to ulint to get rid of "possible loss of
precision" warnings. (There should not be any loss of precision in
these cases.)
log_close(), log_checkpoint_margin(): Declare some variables as ib_uint64_t
instead of ulint, so that there won't be any potential loss of precision.
mach_write_ull(): Cast the second argument of mach_write_to_4() to ulint.
OS_FILE_FROM_FD(): Cast the return value of _get_osfhandle() to HANDLE.
row_merge_dict_table_get_index(): Cast the parameter of mem_free() to (void*)
in order to get rid of the bogus MSVC warning C4090, which has been reported
as MSVC bug 101661:
<http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=101661>
row_mysql_read_blob_ref(): To get rid of a bogus MSVC warning C4090,
drop a const qualifier.
2008-03-04 08:57:07 +00:00
|
|
|
mem_free((void*) column_names);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
return(index);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/********************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Read a merge block from the file system.
|
|
|
|
@return TRUE if request was successful, FALSE if fail */
|
2007-06-08 07:37:07 +00:00
|
|
|
static
|
|
|
|
ibool
|
|
|
|
row_merge_read(
|
|
|
|
/*===========*/
|
2009-05-25 05:30:14 +00:00
|
|
|
int fd, /*!< in: file descriptor */
|
|
|
|
ulint offset, /*!< in: offset where to read */
|
|
|
|
row_merge_block_t* buf) /*!< out: data */
|
2007-06-08 07:37:07 +00:00
|
|
|
{
|
|
|
|
ib_uint64_t ofs = ((ib_uint64_t) offset) * sizeof *buf;
|
2007-08-20 12:33:27 +00:00
|
|
|
ibool success;
|
|
|
|
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (row_merge_print_block_read) {
|
|
|
|
fprintf(stderr, "row_merge_read fd=%d ofs=%lu\n",
|
|
|
|
fd, (ulong) offset);
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
2007-08-20 12:33:27 +00:00
|
|
|
success = os_file_read_no_error_handling(OS_FILE_FROM_FD(fd), buf,
|
|
|
|
(ulint) (ofs & 0xFFFFFFFF),
|
|
|
|
(ulint) (ofs >> 32),
|
|
|
|
sizeof *buf);
|
|
|
|
if (UNIV_UNLIKELY(!success)) {
|
|
|
|
ut_print_timestamp(stderr);
|
|
|
|
fprintf(stderr,
|
|
|
|
" InnoDB: failed to read merge block at %llu\n", ofs);
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-08-20 12:33:27 +00:00
|
|
|
return(UNIV_LIKELY(success));
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/********************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Read a merge block from the file system.
|
|
|
|
@return TRUE if request was successful, FALSE if fail */
|
2007-06-08 07:37:07 +00:00
|
|
|
static
|
|
|
|
ibool
|
|
|
|
row_merge_write(
|
|
|
|
/*============*/
|
2009-05-25 05:30:14 +00:00
|
|
|
int fd, /*!< in: file descriptor */
|
|
|
|
ulint offset, /*!< in: offset where to write */
|
|
|
|
const void* buf) /*!< in: data */
|
2007-06-08 07:37:07 +00:00
|
|
|
{
|
|
|
|
ib_uint64_t ofs = ((ib_uint64_t) offset)
|
|
|
|
* sizeof(row_merge_block_t);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (row_merge_print_block_write) {
|
|
|
|
fprintf(stderr, "row_merge_write fd=%d ofs=%lu\n",
|
|
|
|
fd, (ulong) offset);
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
return(UNIV_LIKELY(os_file_write("(merge)", OS_FILE_FROM_FD(fd), buf,
|
|
|
|
(ulint) (ofs & 0xFFFFFFFF),
|
|
|
|
(ulint) (ofs >> 32),
|
|
|
|
sizeof(row_merge_block_t))));
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/********************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Read a merge record.
|
|
|
|
@return pointer to next record, or NULL on I/O error or end of list */
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
static __attribute__((nonnull))
|
2007-06-08 07:37:07 +00:00
|
|
|
const byte*
|
|
|
|
row_merge_read_rec(
|
|
|
|
/*===============*/
|
2009-05-25 05:30:14 +00:00
|
|
|
row_merge_block_t* block, /*!< in/out: file buffer */
|
|
|
|
mrec_buf_t* buf, /*!< in/out: secondary buffer */
|
|
|
|
const byte* b, /*!< in: pointer to record */
|
|
|
|
const dict_index_t* index, /*!< in: index of the record */
|
|
|
|
int fd, /*!< in: file descriptor */
|
|
|
|
ulint* foffs, /*!< in/out: file offset */
|
|
|
|
const mrec_t** mrec, /*!< out: pointer to merge record,
|
2007-06-08 07:37:07 +00:00
|
|
|
or NULL on end of list
|
|
|
|
(non-NULL on I/O error) */
|
2009-05-25 05:30:14 +00:00
|
|
|
ulint* offsets)/*!< out: offsets of mrec */
|
2007-06-08 07:37:07 +00:00
|
|
|
{
|
|
|
|
ulint extra_size;
|
|
|
|
ulint data_size;
|
|
|
|
ulint avail_size;
|
|
|
|
|
|
|
|
ut_ad(block);
|
|
|
|
ut_ad(buf);
|
|
|
|
ut_ad(b >= block[0]);
|
|
|
|
ut_ad(b < block[1]);
|
|
|
|
ut_ad(index);
|
|
|
|
ut_ad(foffs);
|
|
|
|
ut_ad(mrec);
|
|
|
|
ut_ad(offsets);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 20:30:26 +00:00
|
|
|
ut_ad(*offsets == 1 + REC_OFFS_HEADER_SIZE
|
2007-06-08 07:37:07 +00:00
|
|
|
+ dict_index_get_n_fields(index));
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
extra_size = *b++;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (UNIV_UNLIKELY(!extra_size)) {
|
|
|
|
/* End of list */
|
|
|
|
*mrec = NULL;
|
2007-09-21 08:07:58 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (row_merge_print_read) {
|
2007-09-21 11:44:57 +00:00
|
|
|
fprintf(stderr, "row_merge_read %p,%p,%d,%lu EOF\n",
|
|
|
|
(const void*) b, (const void*) block,
|
|
|
|
fd, (ulong) *foffs);
|
2007-09-21 08:07:58 +00:00
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
2007-06-08 07:37:07 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (extra_size >= 0x80) {
|
|
|
|
/* Read another byte of extra_size. */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (UNIV_UNLIKELY(b >= block[1])) {
|
|
|
|
if (!row_merge_read(fd, ++(*foffs), block)) {
|
|
|
|
err_exit:
|
|
|
|
/* Signal I/O error. */
|
|
|
|
*mrec = b;
|
|
|
|
return(NULL);
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Wrap around to the beginning of the buffer. */
|
|
|
|
b = block[0];
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
extra_size = (extra_size & 0x7f) << 8;
|
|
|
|
extra_size |= *b++;
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-19 11:40:51 +00:00
|
|
|
/* Normalize extra_size. Above, value 0 signals "end of list". */
|
2007-06-08 07:37:07 +00:00
|
|
|
extra_size--;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Read the extra bytes. */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (UNIV_UNLIKELY(b + extra_size >= block[1])) {
|
|
|
|
/* The record spans two blocks. Copy the entire record
|
|
|
|
to the auxiliary buffer and handle this as a special
|
|
|
|
case. */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
avail_size = block[1] - b;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
memcpy(*buf, b, avail_size);
|
2007-04-12 10:32:16 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (!row_merge_read(fd, ++(*foffs), block)) {
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-04-13 12:11:43 +00:00
|
|
|
goto err_exit;
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Wrap around to the beginning of the buffer. */
|
|
|
|
b = block[0];
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Copy the record. */
|
|
|
|
memcpy(*buf + avail_size, b, extra_size - avail_size);
|
|
|
|
b += extra_size - avail_size;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
*mrec = *buf + extra_size;
|
2007-04-12 12:58:09 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
rec_init_offsets_comp_ordinary(*mrec, 0, index, offsets);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
data_size = rec_offs_data_size(offsets);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* These overflows should be impossible given that
|
|
|
|
records are much smaller than either buffer, and
|
|
|
|
the record starts near the beginning of each buffer. */
|
|
|
|
ut_a(extra_size + data_size < sizeof *buf);
|
|
|
|
ut_a(b + data_size < block[1]);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Copy the data bytes. */
|
|
|
|
memcpy(*buf + extra_size, b, data_size);
|
|
|
|
b += data_size;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-21 08:07:58 +00:00
|
|
|
goto func_exit;
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
*mrec = b + extra_size;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
rec_init_offsets_comp_ordinary(*mrec, 0, index, offsets);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
data_size = rec_offs_data_size(offsets);
|
|
|
|
ut_ad(extra_size + data_size < sizeof *buf);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
b += extra_size + data_size;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (UNIV_LIKELY(b < block[1])) {
|
|
|
|
/* The record fits entirely in the block.
|
|
|
|
This is the normal case. */
|
2007-09-21 08:07:58 +00:00
|
|
|
goto func_exit;
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* The record spans two blocks. Copy it to buf. */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-19 11:40:51 +00:00
|
|
|
b -= extra_size + data_size;
|
2007-06-08 07:37:07 +00:00
|
|
|
avail_size = block[1] - b;
|
|
|
|
memcpy(*buf, b, avail_size);
|
|
|
|
*mrec = *buf + extra_size;
|
2009-06-17 12:03:45 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
/* We cannot invoke rec_offs_make_valid() here, because there
|
|
|
|
are no REC_N_NEW_EXTRA_BYTES between extra_size and data_size.
|
|
|
|
Similarly, rec_offs_validate() would fail, because it invokes
|
|
|
|
rec_get_status(). */
|
|
|
|
offsets[2] = (ulint) *mrec;
|
|
|
|
offsets[3] = (ulint) index;
|
|
|
|
#endif /* UNIV_DEBUG */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (!row_merge_read(fd, ++(*foffs), block)) {
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
goto err_exit;
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Wrap around to the beginning of the buffer. */
|
|
|
|
b = block[0];
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Copy the rest of the record. */
|
|
|
|
memcpy(*buf + avail_size, b, extra_size + data_size - avail_size);
|
|
|
|
b += extra_size + data_size - avail_size;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-21 08:07:58 +00:00
|
|
|
func_exit:
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (row_merge_print_read) {
|
2007-09-21 11:44:57 +00:00
|
|
|
fprintf(stderr, "row_merge_read %p,%p,%d,%lu ",
|
|
|
|
(const void*) b, (const void*) block,
|
|
|
|
fd, (ulong) *foffs);
|
2007-09-21 08:07:58 +00:00
|
|
|
rec_print_comp(stderr, *mrec, offsets);
|
|
|
|
putc('\n', stderr);
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
return(b);
|
|
|
|
}
|
2007-04-11 09:42:50 +00:00
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/********************************************************************//**
|
2007-06-08 07:37:07 +00:00
|
|
|
Write a merge record. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
row_merge_write_rec_low(
|
|
|
|
/*====================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
byte* b, /*!< out: buffer */
|
|
|
|
ulint e, /*!< in: encoded extra_size */
|
2007-09-19 11:40:51 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
2009-05-25 05:30:14 +00:00
|
|
|
ulint size, /*!< in: total size to write */
|
|
|
|
int fd, /*!< in: file descriptor */
|
|
|
|
ulint foffs, /*!< in: file offset */
|
2007-09-19 11:40:51 +00:00
|
|
|
#endif /* UNIV_DEBUG */
|
2009-05-25 05:30:14 +00:00
|
|
|
const mrec_t* mrec, /*!< in: record to write */
|
|
|
|
const ulint* offsets)/*!< in: offsets of mrec */
|
2007-09-21 11:44:57 +00:00
|
|
|
#ifndef UNIV_DEBUG
|
|
|
|
# define row_merge_write_rec_low(b, e, size, fd, foffs, mrec, offsets) \
|
|
|
|
row_merge_write_rec_low(b, e, mrec, offsets)
|
|
|
|
#endif /* !UNIV_DEBUG */
|
2007-06-08 07:37:07 +00:00
|
|
|
{
|
2007-09-19 11:40:51 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
const byte* const end = b + size;
|
|
|
|
ut_ad(e == rec_offs_extra_size(offsets) + 1);
|
|
|
|
|
2007-09-21 08:07:58 +00:00
|
|
|
if (row_merge_print_write) {
|
2007-09-21 11:44:57 +00:00
|
|
|
fprintf(stderr, "row_merge_write %p,%d,%lu ",
|
|
|
|
(void*) b, fd, (ulong) foffs);
|
2007-09-21 08:07:58 +00:00
|
|
|
rec_print_comp(stderr, mrec, offsets);
|
|
|
|
putc('\n', stderr);
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (e < 0x80) {
|
branches/zip: Fix most MSVC (Windows) compilation warnings.
lock_get_table(), locks_row_eq_lock(), buf_page_get_mutex(): Add return
after ut_error. On Windows, ut_error is not declared as "noreturn".
Add explicit type casts when assigning ulint to byte to get rid of
"possible loss of precision" warnings.
struct i_s_table_cache_struct: Declare rows_used, rows_allocd as ulint
instead of ullint. 32 bits should be enough.
fill_innodb_trx_from_cache(), i_s_zip_fill_low(): Cast 64-bit unsigned
integers to longlong when calling Field::store(longlong, bool is_unsigned).
Otherwise, the compiler would implicitly convert them to double and
invoke Field::store(double) instead.
recv_truncate_group(), recv_copy_group(), recv_calc_lsn_on_data_add():
Cast ib_uint64_t expressions to ulint to get rid of "possible loss of
precision" warnings. (There should not be any loss of precision in
these cases.)
log_close(), log_checkpoint_margin(): Declare some variables as ib_uint64_t
instead of ulint, so that there won't be any potential loss of precision.
mach_write_ull(): Cast the second argument of mach_write_to_4() to ulint.
OS_FILE_FROM_FD(): Cast the return value of _get_osfhandle() to HANDLE.
row_merge_dict_table_get_index(): Cast the parameter of mem_free() to (void*)
in order to get rid of the bogus MSVC warning C4090, which has been reported
as MSVC bug 101661:
<http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=101661>
row_mysql_read_blob_ref(): To get rid of a bogus MSVC warning C4090,
drop a const qualifier.
2008-03-04 08:57:07 +00:00
|
|
|
*b++ = (byte) e;
|
2007-06-08 07:37:07 +00:00
|
|
|
} else {
|
branches/zip: Fix most MSVC (Windows) compilation warnings.
lock_get_table(), locks_row_eq_lock(), buf_page_get_mutex(): Add return
after ut_error. On Windows, ut_error is not declared as "noreturn".
Add explicit type casts when assigning ulint to byte to get rid of
"possible loss of precision" warnings.
struct i_s_table_cache_struct: Declare rows_used, rows_allocd as ulint
instead of ullint. 32 bits should be enough.
fill_innodb_trx_from_cache(), i_s_zip_fill_low(): Cast 64-bit unsigned
integers to longlong when calling Field::store(longlong, bool is_unsigned).
Otherwise, the compiler would implicitly convert them to double and
invoke Field::store(double) instead.
recv_truncate_group(), recv_copy_group(), recv_calc_lsn_on_data_add():
Cast ib_uint64_t expressions to ulint to get rid of "possible loss of
precision" warnings. (There should not be any loss of precision in
these cases.)
log_close(), log_checkpoint_margin(): Declare some variables as ib_uint64_t
instead of ulint, so that there won't be any potential loss of precision.
mach_write_ull(): Cast the second argument of mach_write_to_4() to ulint.
OS_FILE_FROM_FD(): Cast the return value of _get_osfhandle() to HANDLE.
row_merge_dict_table_get_index(): Cast the parameter of mem_free() to (void*)
in order to get rid of the bogus MSVC warning C4090, which has been reported
as MSVC bug 101661:
<http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=101661>
row_mysql_read_blob_ref(): To get rid of a bogus MSVC warning C4090,
drop a const qualifier.
2008-03-04 08:57:07 +00:00
|
|
|
*b++ = (byte) (0x80 | (e >> 8));
|
2007-06-08 07:37:07 +00:00
|
|
|
*b++ = (byte) e;
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
memcpy(b, mrec - rec_offs_extra_size(offsets), rec_offs_size(offsets));
|
2007-09-19 11:40:51 +00:00
|
|
|
ut_ad(b + rec_offs_size(offsets) == end);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/********************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Write a merge record.
|
|
|
|
@return pointer to end of block, or NULL on error */
|
2007-04-04 11:05:33 +00:00
|
|
|
static
|
2007-06-08 07:37:07 +00:00
|
|
|
byte*
|
|
|
|
row_merge_write_rec(
|
|
|
|
/*================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
row_merge_block_t* block, /*!< in/out: file buffer */
|
|
|
|
mrec_buf_t* buf, /*!< in/out: secondary buffer */
|
|
|
|
byte* b, /*!< in: pointer to end of block */
|
|
|
|
int fd, /*!< in: file descriptor */
|
|
|
|
ulint* foffs, /*!< in/out: file offset */
|
|
|
|
const mrec_t* mrec, /*!< in: record to write */
|
|
|
|
const ulint* offsets)/*!< in: offsets of mrec */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
2007-06-08 07:37:07 +00:00
|
|
|
ulint extra_size;
|
|
|
|
ulint size;
|
|
|
|
ulint avail_size;
|
|
|
|
|
|
|
|
ut_ad(block);
|
|
|
|
ut_ad(buf);
|
|
|
|
ut_ad(b >= block[0]);
|
|
|
|
ut_ad(b < block[1]);
|
|
|
|
ut_ad(mrec);
|
|
|
|
ut_ad(foffs);
|
|
|
|
ut_ad(mrec < block[0] || mrec > block[1]);
|
|
|
|
ut_ad(mrec < buf[0] || mrec > buf[1]);
|
|
|
|
|
|
|
|
/* Normalize extra_size. Value 0 signals "end of list". */
|
|
|
|
extra_size = rec_offs_extra_size(offsets) + 1;
|
|
|
|
|
|
|
|
size = extra_size + (extra_size >= 0x80)
|
|
|
|
+ rec_offs_data_size(offsets);
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(b + size >= block[1])) {
|
|
|
|
/* The record spans two blocks.
|
|
|
|
Copy it to the temporary buffer first. */
|
|
|
|
avail_size = block[1] - b;
|
|
|
|
|
2007-09-19 11:40:51 +00:00
|
|
|
row_merge_write_rec_low(buf[0],
|
2007-09-21 11:44:57 +00:00
|
|
|
extra_size, size, fd, *foffs,
|
|
|
|
mrec, offsets);
|
2007-06-08 07:37:07 +00:00
|
|
|
|
|
|
|
/* Copy the head of the temporary buffer, write
|
|
|
|
the completed block, and copy the tail of the
|
|
|
|
record to the head of the new block. */
|
|
|
|
memcpy(b, buf[0], avail_size);
|
|
|
|
|
|
|
|
if (!row_merge_write(fd, (*foffs)++, block)) {
|
|
|
|
return(NULL);
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-20 12:20:17 +00:00
|
|
|
UNIV_MEM_INVALID(block[0], sizeof block[0]);
|
2007-09-19 13:52:43 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Copy the rest. */
|
|
|
|
b = block[0];
|
|
|
|
memcpy(b, buf[0] + avail_size, size - avail_size);
|
|
|
|
b += size - avail_size;
|
|
|
|
} else {
|
2007-09-21 11:44:57 +00:00
|
|
|
row_merge_write_rec_low(b, extra_size, size, fd, *foffs,
|
|
|
|
mrec, offsets);
|
2007-09-19 11:40:51 +00:00
|
|
|
b += size;
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
return(b);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/********************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Write an end-of-list marker.
|
|
|
|
@return pointer to end of block, or NULL on error */
|
2007-04-04 11:05:33 +00:00
|
|
|
static
|
2007-06-08 07:37:07 +00:00
|
|
|
byte*
|
|
|
|
row_merge_write_eof(
|
|
|
|
/*================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
row_merge_block_t* block, /*!< in/out: file buffer */
|
|
|
|
byte* b, /*!< in: pointer to end of block */
|
|
|
|
int fd, /*!< in: file descriptor */
|
|
|
|
ulint* foffs) /*!< in/out: file offset */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
2007-06-08 07:37:07 +00:00
|
|
|
ut_ad(block);
|
|
|
|
ut_ad(b >= block[0]);
|
|
|
|
ut_ad(b < block[1]);
|
|
|
|
ut_ad(foffs);
|
2007-09-21 08:07:58 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (row_merge_print_write) {
|
2007-09-21 11:44:57 +00:00
|
|
|
fprintf(stderr, "row_merge_write %p,%p,%d,%lu EOF\n",
|
|
|
|
(void*) b, (void*) block, fd, (ulong) *foffs);
|
2007-09-21 08:07:58 +00:00
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
2007-06-08 07:37:07 +00:00
|
|
|
|
|
|
|
*b++ = 0;
|
2007-09-19 13:52:43 +00:00
|
|
|
UNIV_MEM_ASSERT_RW(block[0], b - block[0]);
|
|
|
|
UNIV_MEM_ASSERT_W(block[0], sizeof block[0]);
|
2007-09-20 12:20:17 +00:00
|
|
|
#ifdef UNIV_DEBUG_VALGRIND
|
|
|
|
/* The rest of the block is uninitialized. Initialize it
|
|
|
|
to avoid bogus warnings. */
|
|
|
|
memset(b, 0xff, block[1] - b);
|
|
|
|
#endif /* UNIV_DEBUG_VALGRIND */
|
2007-06-08 07:37:07 +00:00
|
|
|
|
|
|
|
if (!row_merge_write(fd, (*foffs)++, block)) {
|
|
|
|
return(NULL);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2007-09-20 12:20:17 +00:00
|
|
|
UNIV_MEM_INVALID(block[0], sizeof block[0]);
|
2007-06-08 07:37:07 +00:00
|
|
|
return(block[0]);
|
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Compare two merge records.
|
|
|
|
@return 1, 0, -1 if mrec1 is greater, equal, less, respectively, than mrec2 */
|
2007-06-08 07:37:07 +00:00
|
|
|
static
|
|
|
|
int
|
|
|
|
row_merge_cmp(
|
|
|
|
/*==========*/
|
2009-05-25 05:30:14 +00:00
|
|
|
const mrec_t* mrec1, /*!< in: first merge
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
record to be compared */
|
2009-05-25 05:30:14 +00:00
|
|
|
const mrec_t* mrec2, /*!< in: second merge
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
record to be compared */
|
2009-05-25 05:30:14 +00:00
|
|
|
const ulint* offsets1, /*!< in: first record offsets */
|
|
|
|
const ulint* offsets2, /*!< in: second record offsets */
|
|
|
|
const dict_index_t* index) /*!< in: index */
|
2007-06-08 07:37:07 +00:00
|
|
|
{
|
2007-09-21 08:07:58 +00:00
|
|
|
int cmp;
|
|
|
|
|
|
|
|
cmp = cmp_rec_rec_simple(mrec1, mrec2, offsets1, offsets2, index);
|
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (row_merge_print_cmp) {
|
|
|
|
fputs("row_merge_cmp1 ", stderr);
|
|
|
|
rec_print_comp(stderr, mrec1, offsets1);
|
|
|
|
fputs("\nrow_merge_cmp2 ", stderr);
|
|
|
|
rec_print_comp(stderr, mrec2, offsets2);
|
|
|
|
fprintf(stderr, "\nrow_merge_cmp=%d\n", cmp);
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
|
|
|
return(cmp);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/********************************************************************//**
|
2007-04-04 11:05:33 +00:00
|
|
|
Reads clustered index of the table and create temporary files
|
2009-05-25 05:30:14 +00:00
|
|
|
containing the index entries for the indexes to be built.
|
|
|
|
@return DB_SUCCESS or error */
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
static __attribute__((nonnull))
|
2007-04-04 11:05:33 +00:00
|
|
|
ulint
|
|
|
|
row_merge_read_clustered_index(
|
|
|
|
/*===========================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
trx_t* trx, /*!< in: transaction */
|
|
|
|
TABLE* table, /*!< in/out: MySQL table object,
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
for reporting erroneous records */
|
2009-05-25 05:30:14 +00:00
|
|
|
const dict_table_t* old_table,/*!< in: table where rows are
|
2007-08-10 15:52:09 +00:00
|
|
|
read from */
|
2009-05-25 05:30:14 +00:00
|
|
|
const dict_table_t* new_table,/*!< in: table where indexes are
|
2007-08-10 15:52:09 +00:00
|
|
|
created; identical to old_table
|
|
|
|
unless creating a PRIMARY KEY */
|
2009-05-25 05:30:14 +00:00
|
|
|
dict_index_t** index, /*!< in: indexes to be created */
|
|
|
|
merge_file_t* files, /*!< in: temporary files */
|
|
|
|
ulint n_index,/*!< in: number of indexes to create */
|
|
|
|
row_merge_block_t* block) /*!< in/out: file buffer */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
2007-06-08 07:37:07 +00:00
|
|
|
dict_index_t* clust_index; /* Clustered index */
|
|
|
|
mem_heap_t* row_heap; /* Heap memory to create
|
2007-04-04 11:05:33 +00:00
|
|
|
clustered index records */
|
2007-06-08 07:37:07 +00:00
|
|
|
row_merge_buf_t** merge_buf; /* Temporary list for records*/
|
|
|
|
btr_pcur_t pcur; /* Persistent cursor on the
|
2007-05-22 06:48:53 +00:00
|
|
|
clustered index */
|
2007-06-08 07:37:07 +00:00
|
|
|
mtr_t mtr; /* Mini transaction */
|
|
|
|
ulint err = DB_SUCCESS;/* Return code */
|
|
|
|
ulint i;
|
2007-08-10 15:52:09 +00:00
|
|
|
ulint n_nonnull = 0; /* number of columns
|
|
|
|
changed to NOT NULL */
|
|
|
|
ulint* nonnull = NULL; /* NOT NULL columns */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
trx->op_info = "reading clustered index";
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-05-22 06:48:53 +00:00
|
|
|
ut_ad(trx);
|
2007-08-10 15:52:09 +00:00
|
|
|
ut_ad(old_table);
|
|
|
|
ut_ad(new_table);
|
2007-05-22 06:48:53 +00:00
|
|
|
ut_ad(index);
|
|
|
|
ut_ad(files);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Create and initialize memory for record buffers */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
merge_buf = mem_alloc(n_index * sizeof *merge_buf);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
for (i = 0; i < n_index; i++) {
|
|
|
|
merge_buf[i] = row_merge_buf_create(index[i]);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
mtr_start(&mtr);
|
|
|
|
|
|
|
|
/* Find the clustered index and create a persistent cursor
|
|
|
|
based on that. */
|
|
|
|
|
2007-08-10 15:52:09 +00:00
|
|
|
clust_index = dict_table_get_first_index(old_table);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
|
|
|
btr_pcur_open_at_index_side(
|
|
|
|
TRUE, clust_index, BTR_SEARCH_LEAF, &pcur, TRUE, &mtr);
|
|
|
|
|
2007-08-10 15:52:09 +00:00
|
|
|
if (UNIV_UNLIKELY(old_table != new_table)) {
|
|
|
|
ulint n_cols = dict_table_get_n_cols(old_table);
|
|
|
|
|
|
|
|
/* A primary key will be created. Identify the
|
|
|
|
columns that were flagged NOT NULL in the new table,
|
|
|
|
so that we can quickly check that the records in the
|
|
|
|
(old) clustered index do not violate the added NOT
|
|
|
|
NULL constraints. */
|
|
|
|
|
|
|
|
ut_a(n_cols == dict_table_get_n_cols(new_table));
|
|
|
|
|
|
|
|
nonnull = mem_alloc(n_cols * sizeof *nonnull);
|
|
|
|
|
|
|
|
for (i = 0; i < n_cols; i++) {
|
|
|
|
if (dict_table_get_nth_col(old_table, i)->prtype
|
|
|
|
& DATA_NOT_NULL) {
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dict_table_get_nth_col(new_table, i)->prtype
|
|
|
|
& DATA_NOT_NULL) {
|
|
|
|
|
|
|
|
nonnull[n_nonnull++] = i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!n_nonnull) {
|
|
|
|
mem_free(nonnull);
|
|
|
|
nonnull = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-09-27 08:28:25 +00:00
|
|
|
row_heap = mem_heap_create(sizeof(mrec_buf_t));
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Scan the clustered index. */
|
2007-05-22 06:48:53 +00:00
|
|
|
for (;;) {
|
|
|
|
const rec_t* rec;
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
ulint* offsets;
|
2007-08-01 07:52:05 +00:00
|
|
|
dtuple_t* row = NULL;
|
2007-04-04 11:05:33 +00:00
|
|
|
row_ext_t* ext;
|
2007-08-01 07:52:05 +00:00
|
|
|
ibool has_next = TRUE;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-10-22 08:16:35 +00:00
|
|
|
btr_pcur_move_to_next_on_page(&pcur);
|
2007-06-07 08:14:42 +00:00
|
|
|
|
2007-05-22 06:48:53 +00:00
|
|
|
/* When switching pages, commit the mini-transaction
|
|
|
|
in order to release the latch on the old page. */
|
|
|
|
|
2007-10-22 08:16:35 +00:00
|
|
|
if (btr_pcur_is_after_last_on_page(&pcur)) {
|
2007-05-22 06:48:53 +00:00
|
|
|
btr_pcur_store_position(&pcur, &mtr);
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
mtr_start(&mtr);
|
|
|
|
btr_pcur_restore_position(BTR_SEARCH_LEAF,
|
|
|
|
&pcur, &mtr);
|
2007-06-08 07:37:07 +00:00
|
|
|
has_next = btr_pcur_move_to_next_user_rec(&pcur, &mtr);
|
2007-05-22 06:48:53 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (UNIV_LIKELY(has_next)) {
|
|
|
|
rec = btr_pcur_get_rec(&pcur);
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
offsets = rec_get_offsets(rec, clust_index, NULL,
|
|
|
|
ULINT_UNDEFINED, &row_heap);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Skip delete marked records. */
|
2007-08-10 15:52:09 +00:00
|
|
|
if (rec_get_deleted_flag(
|
|
|
|
rec, dict_table_is_comp(old_table))) {
|
2007-06-08 07:37:07 +00:00
|
|
|
continue;
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
|
|
|
srv_n_rows_inserted++;
|
2007-06-08 07:37:07 +00:00
|
|
|
|
2007-08-10 15:52:09 +00:00
|
|
|
/* Build a row based on the clustered index. */
|
2007-06-08 07:37:07 +00:00
|
|
|
|
|
|
|
row = row_build(ROW_COPY_POINTERS, clust_index,
|
2007-12-03 12:16:07 +00:00
|
|
|
rec, offsets,
|
|
|
|
new_table, &ext, row_heap);
|
2007-06-08 07:37:07 +00:00
|
|
|
|
2007-08-10 15:52:09 +00:00
|
|
|
if (UNIV_LIKELY_NULL(nonnull)) {
|
|
|
|
for (i = 0; i < n_nonnull; i++) {
|
|
|
|
dfield_t* field
|
|
|
|
= &row->fields[nonnull[i]];
|
2007-10-23 06:46:12 +00:00
|
|
|
dtype_t* field_type
|
|
|
|
= dfield_get_type(field);
|
2007-08-10 15:52:09 +00:00
|
|
|
|
2007-10-23 06:46:12 +00:00
|
|
|
ut_a(!(field_type->prtype
|
2007-08-10 15:52:09 +00:00
|
|
|
& DATA_NOT_NULL));
|
|
|
|
|
|
|
|
if (dfield_is_null(field)) {
|
|
|
|
err = DB_PRIMARY_KEY_IS_NULL;
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
i = 0;
|
|
|
|
goto err_exit;
|
2007-08-10 15:52:09 +00:00
|
|
|
}
|
|
|
|
|
2007-10-23 06:46:12 +00:00
|
|
|
field_type->prtype |= DATA_NOT_NULL;
|
2007-08-10 15:52:09 +00:00
|
|
|
}
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2007-08-10 15:52:09 +00:00
|
|
|
/* Build all entries for all the indexes to be created
|
|
|
|
in a single scan of the clustered index. */
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
for (i = 0; i < n_index; i++) {
|
|
|
|
row_merge_buf_t* buf = merge_buf[i];
|
|
|
|
merge_file_t* file = &files[i];
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
const dict_index_t* index = buf->index;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (UNIV_LIKELY
|
2007-08-01 07:52:05 +00:00
|
|
|
(row && row_merge_buf_add(buf, row, ext))) {
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
file->n_rec++;
|
2007-06-08 07:37:07 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2007-09-21 14:33:49 +00:00
|
|
|
/* The buffer must be sufficiently large
|
|
|
|
to hold at least one record. */
|
2007-06-08 07:37:07 +00:00
|
|
|
ut_ad(buf->n_tuples || !has_next);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* We have enough data tuples to form a block.
|
|
|
|
Sort them and write to disk. */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
if (buf->n_tuples) {
|
|
|
|
if (dict_index_is_unique(index)) {
|
2007-11-01 11:44:49 +00:00
|
|
|
row_merge_dup_t dup;
|
|
|
|
dup.index = buf->index;
|
|
|
|
dup.table = table;
|
|
|
|
dup.n_dup = 0;
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
|
|
|
|
row_merge_buf_sort(buf, &dup);
|
|
|
|
|
|
|
|
if (dup.n_dup) {
|
|
|
|
err = DB_DUPLICATE_KEY;
|
|
|
|
err_exit:
|
|
|
|
trx->error_key_num = i;
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
row_merge_buf_sort(buf, NULL);
|
|
|
|
}
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-21 11:44:57 +00:00
|
|
|
row_merge_buf_write(buf, file, block);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (!row_merge_write(file->fd, file->offset++,
|
|
|
|
block)) {
|
|
|
|
err = DB_OUT_OF_FILE_SPACE;
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
goto err_exit;
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-20 12:20:17 +00:00
|
|
|
UNIV_MEM_INVALID(block[0], sizeof block[0]);
|
2007-08-03 11:49:51 +00:00
|
|
|
merge_buf[i] = row_merge_buf_empty(buf);
|
2007-09-21 14:33:49 +00:00
|
|
|
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
if (UNIV_LIKELY(row != NULL)) {
|
|
|
|
/* Try writing the record again, now
|
|
|
|
that the buffer has been written out
|
|
|
|
and emptied. */
|
2007-09-21 14:33:49 +00:00
|
|
|
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
if (UNIV_UNLIKELY
|
|
|
|
(!row_merge_buf_add(buf, row, ext))) {
|
|
|
|
/* An empty buffer should have enough
|
|
|
|
room for at least one record. */
|
|
|
|
ut_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
file->n_rec++;
|
2007-09-21 14:33:49 +00:00
|
|
|
}
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
mem_heap_empty(row_heap);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (UNIV_UNLIKELY(!has_next)) {
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
func_exit:
|
|
|
|
btr_pcur_close(&pcur);
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
mem_heap_free(row_heap);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-08-10 15:52:09 +00:00
|
|
|
if (UNIV_LIKELY_NULL(nonnull)) {
|
|
|
|
mem_free(nonnull);
|
|
|
|
}
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
for (i = 0; i < n_index; i++) {
|
|
|
|
row_merge_buf_free(merge_buf[i]);
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
mem_free(merge_buf);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
trx->op_info = "";
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
return(err);
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2009-05-26 12:28:49 +00:00
|
|
|
/** Write a record via buffer 2 and read the next record to buffer N.
|
|
|
|
@param N number of the buffer (0 or 1)
|
|
|
|
@param AT_END statement to execute at end of input */
|
|
|
|
#define ROW_MERGE_WRITE_GET_NEXT(N, AT_END) \
|
|
|
|
do { \
|
|
|
|
b2 = row_merge_write_rec(&block[2], &buf[2], b2, \
|
|
|
|
of->fd, &of->offset, \
|
|
|
|
mrec##N, offsets##N); \
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
if (UNIV_UNLIKELY(!b2 || ++of->n_rec > file->n_rec)) { \
|
2009-05-26 12:28:49 +00:00
|
|
|
goto corrupt; \
|
|
|
|
} \
|
|
|
|
b##N = row_merge_read_rec(&block[N], &buf[N], \
|
|
|
|
b##N, index, \
|
|
|
|
file->fd, foffs##N, \
|
|
|
|
&mrec##N, offsets##N); \
|
|
|
|
if (UNIV_UNLIKELY(!b##N)) { \
|
|
|
|
if (mrec##N) { \
|
|
|
|
goto corrupt; \
|
|
|
|
} \
|
|
|
|
AT_END; \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*************************************************************//**
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
Merge two blocks of records on disk and write a bigger block.
|
2009-05-25 05:30:14 +00:00
|
|
|
@return DB_SUCCESS or error code */
|
2007-06-08 07:37:07 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
row_merge_blocks(
|
|
|
|
/*=============*/
|
2009-05-25 05:30:14 +00:00
|
|
|
const dict_index_t* index, /*!< in: index being created */
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
const merge_file_t* file, /*!< in: file containing
|
2007-06-08 07:37:07 +00:00
|
|
|
index entries */
|
2009-05-25 05:30:14 +00:00
|
|
|
row_merge_block_t* block, /*!< in/out: 3 buffers */
|
|
|
|
ulint* foffs0, /*!< in/out: offset of first
|
2007-06-08 07:37:07 +00:00
|
|
|
source list in the file */
|
2009-05-25 05:30:14 +00:00
|
|
|
ulint* foffs1, /*!< in/out: offset of second
|
2007-06-08 07:37:07 +00:00
|
|
|
source list in the file */
|
2009-05-25 05:30:14 +00:00
|
|
|
merge_file_t* of, /*!< in/out: output file */
|
|
|
|
TABLE* table) /*!< in/out: MySQL table, for
|
2007-09-27 08:28:25 +00:00
|
|
|
reporting erroneous key value
|
|
|
|
if applicable */
|
2007-06-08 07:37:07 +00:00
|
|
|
{
|
2009-05-26 12:28:49 +00:00
|
|
|
mem_heap_t* heap; /*!< memory heap for offsets0, offsets1 */
|
|
|
|
|
|
|
|
mrec_buf_t buf[3]; /*!< buffer for handling split mrec in block[] */
|
|
|
|
const byte* b0; /*!< pointer to block[0] */
|
|
|
|
const byte* b1; /*!< pointer to block[1] */
|
|
|
|
byte* b2; /*!< pointer to block[2] */
|
|
|
|
const mrec_t* mrec0; /*!< merge rec, points to block[0] or buf[0] */
|
|
|
|
const mrec_t* mrec1; /*!< merge rec, points to block[1] or buf[1] */
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
ulint* offsets0;/* offsets of mrec0 */
|
2007-06-08 07:37:07 +00:00
|
|
|
ulint* offsets1;/* offsets of mrec1 */
|
|
|
|
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (row_merge_print_block) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"row_merge_blocks fd=%d ofs=%lu + fd=%d ofs=%lu"
|
|
|
|
" = fd=%d ofs=%lu\n",
|
|
|
|
file->fd, (ulong) *foffs0,
|
|
|
|
file->fd, (ulong) *foffs1,
|
|
|
|
of->fd, (ulong) of->offset);
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
heap = row_merge_heap_create(index, &offsets0, &offsets1);
|
2007-06-08 07:37:07 +00:00
|
|
|
|
|
|
|
/* Write a record and read the next record. Split the output
|
|
|
|
file in two halves, which can be merged on the following pass. */
|
2009-05-25 12:09:24 +00:00
|
|
|
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
if (!row_merge_read(file->fd, *foffs0, &block[0])
|
|
|
|
|| !row_merge_read(file->fd, *foffs1, &block[1])) {
|
2007-06-08 07:37:07 +00:00
|
|
|
corrupt:
|
|
|
|
mem_heap_free(heap);
|
|
|
|
return(DB_CORRUPTION);
|
|
|
|
}
|
|
|
|
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
b0 = block[0];
|
|
|
|
b1 = block[1];
|
|
|
|
b2 = block[2];
|
2007-06-08 07:37:07 +00:00
|
|
|
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
b0 = row_merge_read_rec(&block[0], &buf[0], b0, index, file->fd,
|
|
|
|
foffs0, &mrec0, offsets0);
|
|
|
|
b1 = row_merge_read_rec(&block[1], &buf[1], b1, index, file->fd,
|
2007-06-08 07:37:07 +00:00
|
|
|
foffs1, &mrec1, offsets1);
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
if (UNIV_UNLIKELY(!b0 && mrec0)
|
|
|
|
|| UNIV_UNLIKELY(!b1 && mrec1)) {
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
goto corrupt;
|
|
|
|
}
|
|
|
|
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
while (mrec0 && mrec1) {
|
|
|
|
switch (row_merge_cmp(mrec0, mrec1,
|
|
|
|
offsets0, offsets1, index)) {
|
2007-06-08 07:37:07 +00:00
|
|
|
case 0:
|
|
|
|
if (UNIV_UNLIKELY
|
|
|
|
(dict_index_is_unique(index))) {
|
2007-09-27 08:28:25 +00:00
|
|
|
innobase_rec_to_mysql(table, mrec0,
|
|
|
|
index, offsets0);
|
2007-06-08 07:37:07 +00:00
|
|
|
mem_heap_free(heap);
|
|
|
|
return(DB_DUPLICATE_KEY);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
2007-06-08 07:37:07 +00:00
|
|
|
/* fall through */
|
|
|
|
case -1:
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
ROW_MERGE_WRITE_GET_NEXT(0, goto merged);
|
2007-06-08 07:37:07 +00:00
|
|
|
break;
|
|
|
|
case 1:
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
ROW_MERGE_WRITE_GET_NEXT(1, goto merged);
|
2007-06-08 07:37:07 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ut_error;
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
2007-06-08 07:37:07 +00:00
|
|
|
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
merged:
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
if (mrec0) {
|
|
|
|
/* append all mrec0 to output */
|
2007-06-08 07:37:07 +00:00
|
|
|
for (;;) {
|
2007-06-08 20:30:26 +00:00
|
|
|
ROW_MERGE_WRITE_GET_NEXT(0, goto done0);
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
|
|
|
}
|
2007-06-08 20:30:26 +00:00
|
|
|
done0:
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
if (mrec1) {
|
|
|
|
/* append all mrec1 to output */
|
2007-06-08 07:37:07 +00:00
|
|
|
for (;;) {
|
2007-06-08 20:30:26 +00:00
|
|
|
ROW_MERGE_WRITE_GET_NEXT(1, goto done1);
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
|
|
|
}
|
2007-06-08 20:30:26 +00:00
|
|
|
done1:
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
mem_heap_free(heap);
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
b2 = row_merge_write_eof(&block[2], b2, of->fd, &of->offset);
|
|
|
|
return(b2 ? DB_SUCCESS : DB_CORRUPTION);
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
/*************************************************************//**
|
|
|
|
Copy a block of index entries.
|
|
|
|
@return TRUE on success, FALSE on failure */
|
|
|
|
static __attribute__((nonnull))
|
|
|
|
ibool
|
|
|
|
row_merge_blocks_copy(
|
|
|
|
/*==================*/
|
|
|
|
const dict_index_t* index, /*!< in: index being created */
|
|
|
|
const merge_file_t* file, /*!< in: input file */
|
|
|
|
row_merge_block_t* block, /*!< in/out: 3 buffers */
|
|
|
|
ulint* foffs0, /*!< in/out: input file offset */
|
|
|
|
merge_file_t* of) /*!< in/out: output file */
|
|
|
|
{
|
|
|
|
mem_heap_t* heap; /*!< memory heap for offsets0, offsets1 */
|
|
|
|
|
|
|
|
mrec_buf_t buf[3]; /*!< buffer for handling
|
|
|
|
split mrec in block[] */
|
|
|
|
const byte* b0; /*!< pointer to block[0] */
|
|
|
|
byte* b2; /*!< pointer to block[2] */
|
|
|
|
const mrec_t* mrec0; /*!< merge rec, points to block[0] */
|
|
|
|
ulint* offsets0;/* offsets of mrec0 */
|
|
|
|
ulint* offsets1;/* dummy offsets */
|
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
if (row_merge_print_block) {
|
|
|
|
fprintf(stderr,
|
|
|
|
"row_merge_blocks_copy fd=%d ofs=%lu"
|
|
|
|
" = fd=%d ofs=%lu\n",
|
|
|
|
file->fd, (ulong) foffs0,
|
|
|
|
of->fd, (ulong) of->offset);
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
|
|
|
heap = row_merge_heap_create(index, &offsets0, &offsets1);
|
|
|
|
|
|
|
|
/* Write a record and read the next record. Split the output
|
|
|
|
file in two halves, which can be merged on the following pass. */
|
|
|
|
|
|
|
|
if (!row_merge_read(file->fd, *foffs0, &block[0])) {
|
|
|
|
corrupt:
|
|
|
|
mem_heap_free(heap);
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
b0 = block[0];
|
|
|
|
b2 = block[2];
|
|
|
|
|
|
|
|
b0 = row_merge_read_rec(&block[0], &buf[0], b0, index, file->fd,
|
|
|
|
foffs0, &mrec0, offsets0);
|
|
|
|
if (UNIV_UNLIKELY(!b0 && mrec0)) {
|
|
|
|
|
|
|
|
goto corrupt;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mrec0) {
|
|
|
|
/* append all mrec0 to output */
|
|
|
|
for (;;) {
|
|
|
|
ROW_MERGE_WRITE_GET_NEXT(0, goto done0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
done0:
|
|
|
|
|
|
|
|
/* The file offset points to the beginning of the last page
|
|
|
|
that has been read. Update it to point to the next block. */
|
|
|
|
(*foffs0)++;
|
|
|
|
|
|
|
|
mem_heap_free(heap);
|
|
|
|
return(row_merge_write_eof(&block[2], b2, of->fd, &of->offset)
|
|
|
|
!= NULL);
|
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Merge disk files.
|
|
|
|
@return DB_SUCCESS or error code */
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
static __attribute__((nonnull))
|
2007-06-08 07:37:07 +00:00
|
|
|
ulint
|
|
|
|
row_merge(
|
|
|
|
/*======*/
|
2009-05-25 05:30:14 +00:00
|
|
|
const dict_index_t* index, /*!< in: index being created */
|
|
|
|
merge_file_t* file, /*!< in/out: file containing
|
2007-09-27 08:28:25 +00:00
|
|
|
index entries */
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
ulint* half, /*!< in/out: half the file */
|
2009-05-25 05:30:14 +00:00
|
|
|
row_merge_block_t* block, /*!< in/out: 3 buffers */
|
|
|
|
int* tmpfd, /*!< in/out: temporary file handle */
|
|
|
|
TABLE* table) /*!< in/out: MySQL table, for
|
2007-09-27 08:28:25 +00:00
|
|
|
reporting erroneous key value
|
|
|
|
if applicable */
|
2007-06-08 07:37:07 +00:00
|
|
|
{
|
2009-05-26 12:28:49 +00:00
|
|
|
ulint foffs0; /*!< first input offset */
|
|
|
|
ulint foffs1; /*!< second input offset */
|
|
|
|
ulint error; /*!< error code */
|
|
|
|
merge_file_t of; /*!< output file */
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
const ulint ihalf = *half;
|
|
|
|
/*!< half the input file */
|
|
|
|
ulint ohalf; /*!< half the output file */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-21 13:05:51 +00:00
|
|
|
UNIV_MEM_ASSERT_W(block[0], 3 * sizeof block[0]);
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
ut_ad(ihalf < file->offset);
|
2007-09-21 13:05:51 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
of.fd = *tmpfd;
|
|
|
|
of.offset = 0;
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
of.n_rec = 0;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Merge blocks to the output file. */
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
ohalf = 0;
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
foffs0 = 0;
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
foffs1 = ihalf;
|
|
|
|
|
|
|
|
for (; foffs0 < ihalf && foffs1 < file->offset; foffs0++, foffs1++) {
|
|
|
|
ulint ahalf; /*!< arithmetic half the input file */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
error = row_merge_blocks(index, file, block,
|
2007-09-27 08:28:25 +00:00
|
|
|
&foffs0, &foffs1, &of, table);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
return(error);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
|
|
|
|
/* Record the offset of the output file when
|
|
|
|
approximately half the output has been generated. In
|
|
|
|
this way, the next invocation of row_merge() will
|
|
|
|
spend most of the time in this loop. The initial
|
|
|
|
estimate is ohalf==0. */
|
|
|
|
ahalf = file->offset / 2;
|
|
|
|
ut_ad(ohalf <= of.offset);
|
|
|
|
|
|
|
|
/* Improve the estimate until reaching half the input
|
|
|
|
file size, or we can not get any closer to it. All
|
|
|
|
comparands should be non-negative when !(ohalf < ahalf)
|
|
|
|
because ohalf <= of.offset. */
|
|
|
|
if (ohalf < ahalf || of.offset - ahalf < ohalf - ahalf) {
|
|
|
|
ohalf = of.offset;
|
|
|
|
}
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
/* Copy the last blocks, if there are any. */
|
|
|
|
|
|
|
|
while (foffs0 < ihalf) {
|
|
|
|
if (!row_merge_blocks_copy(index, file, block, &foffs0, &of)) {
|
2007-09-21 13:05:51 +00:00
|
|
|
return(DB_CORRUPTION);
|
|
|
|
}
|
|
|
|
}
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
|
|
|
|
ut_ad(foffs0 == ihalf);
|
|
|
|
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
while (foffs1 < file->offset) {
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
if (!row_merge_blocks_copy(index, file, block, &foffs1, &of)) {
|
2007-06-08 07:37:07 +00:00
|
|
|
return(DB_CORRUPTION);
|
2007-04-13 12:11:43 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
ut_ad(foffs1 == file->offset);
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(of.n_rec != file->n_rec)) {
|
|
|
|
return(DB_CORRUPTION);
|
|
|
|
}
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Swap file descriptors for the next pass. */
|
|
|
|
*tmpfd = file->fd;
|
|
|
|
*file = of;
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
*half = ohalf;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-21 13:05:51 +00:00
|
|
|
UNIV_MEM_INVALID(block[0], 3 * sizeof block[0]);
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
return(DB_SUCCESS);
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Merge disk files.
|
|
|
|
@return DB_SUCCESS or error code */
|
2007-06-08 07:37:07 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
row_merge_sort(
|
|
|
|
/*===========*/
|
2009-05-25 05:30:14 +00:00
|
|
|
const dict_index_t* index, /*!< in: index being created */
|
|
|
|
merge_file_t* file, /*!< in/out: file containing
|
2007-09-27 08:28:25 +00:00
|
|
|
index entries */
|
2009-05-25 05:30:14 +00:00
|
|
|
row_merge_block_t* block, /*!< in/out: 3 buffers */
|
|
|
|
int* tmpfd, /*!< in/out: temporary file handle */
|
|
|
|
TABLE* table) /*!< in/out: MySQL table, for
|
2007-09-27 08:28:25 +00:00
|
|
|
reporting erroneous key value
|
|
|
|
if applicable */
|
2007-06-08 07:37:07 +00:00
|
|
|
{
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
ulint half = file->offset / 2;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2009-09-03 13:36:15 +00:00
|
|
|
/* The file should always contain at least one byte (the end
|
|
|
|
of file marker). Thus, it must be at least one block. */
|
|
|
|
ut_ad(file->offset > 0);
|
|
|
|
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
do {
|
2007-09-24 08:46:13 +00:00
|
|
|
ulint error;
|
|
|
|
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
error = row_merge(index, file, &half, block, tmpfd, table);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
return(error);
|
|
|
|
}
|
2009-09-03 13:36:15 +00:00
|
|
|
|
|
|
|
/* half > 0 should hold except when the file consists
|
|
|
|
of one block. No need to merge further then. */
|
|
|
|
ut_ad(half > 0 || file->offset == 1);
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
} while (half < file->offset && half > 0);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
return(DB_SUCCESS);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*************************************************************//**
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
Copy externally stored columns to the data tuple. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
row_merge_copy_blobs(
|
|
|
|
/*=================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
const mrec_t* mrec, /*!< in: merge record */
|
|
|
|
const ulint* offsets,/*!< in: offsets of mrec */
|
|
|
|
ulint zip_size,/*!< in: compressed page size in bytes, or 0 */
|
|
|
|
dtuple_t* tuple, /*!< in/out: data tuple */
|
|
|
|
mem_heap_t* heap) /*!< in/out: memory heap */
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
{
|
|
|
|
ulint i;
|
|
|
|
ulint n_fields = dtuple_get_n_fields(tuple);
|
|
|
|
|
|
|
|
for (i = 0; i < n_fields; i++) {
|
|
|
|
ulint len;
|
|
|
|
const void* data;
|
|
|
|
dfield_t* field = dtuple_get_nth_field(tuple, i);
|
|
|
|
|
|
|
|
if (!dfield_is_ext(field)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_ad(!dfield_is_null(field));
|
|
|
|
|
2008-01-11 19:59:47 +00:00
|
|
|
/* The table is locked during index creation.
|
|
|
|
Therefore, externally stored columns cannot possibly
|
|
|
|
be freed between the time the BLOB pointers are read
|
|
|
|
(row_merge_read_clustered_index()) and dereferenced
|
|
|
|
(below). */
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
data = btr_rec_copy_externally_stored_field(
|
|
|
|
mrec, offsets, zip_size, i, &len, heap);
|
|
|
|
|
|
|
|
dfield_set_data(field, data, len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/********************************************************************//**
|
2007-04-04 11:05:33 +00:00
|
|
|
Read sorted file containing index data tuples and insert these data
|
2009-05-25 05:30:14 +00:00
|
|
|
tuples to the index
|
|
|
|
@return DB_SUCCESS or error number */
|
2007-06-08 07:37:07 +00:00
|
|
|
static
|
2007-04-04 11:05:33 +00:00
|
|
|
ulint
|
|
|
|
row_merge_insert_index_tuples(
|
|
|
|
/*==========================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
trx_t* trx, /*!< in: transaction */
|
|
|
|
dict_index_t* index, /*!< in: index */
|
|
|
|
dict_table_t* table, /*!< in: new table */
|
|
|
|
ulint zip_size,/*!< in: compressed page size of
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
the old table, or 0 if uncompressed */
|
2009-05-25 05:30:14 +00:00
|
|
|
int fd, /*!< in: file descriptor */
|
|
|
|
row_merge_block_t* block) /*!< in/out: file buffer */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
2007-06-08 07:37:07 +00:00
|
|
|
mrec_buf_t buf;
|
|
|
|
const byte* b;
|
|
|
|
que_thr_t* thr;
|
|
|
|
ins_node_t* node;
|
|
|
|
mem_heap_t* tuple_heap;
|
|
|
|
mem_heap_t* graph_heap;
|
|
|
|
ulint error = DB_SUCCESS;
|
|
|
|
ulint foffs = 0;
|
|
|
|
ulint* offsets;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
ut_ad(trx);
|
|
|
|
ut_ad(index);
|
|
|
|
ut_ad(table);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
|
|
|
/* We use the insert query graph as the dummy graph
|
|
|
|
needed in the row module call */
|
|
|
|
|
|
|
|
trx->op_info = "inserting index entries";
|
|
|
|
|
2007-04-13 12:11:43 +00:00
|
|
|
graph_heap = mem_heap_create(500);
|
2007-04-04 11:05:33 +00:00
|
|
|
node = ins_node_create(INS_DIRECT, table, graph_heap);
|
|
|
|
|
|
|
|
thr = pars_complete_graph_for_exec(node, trx, graph_heap);
|
|
|
|
|
|
|
|
que_thr_move_to_run_state_for_mysql(thr, trx);
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
tuple_heap = mem_heap_create(1000);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
{
|
2007-06-08 20:30:26 +00:00
|
|
|
ulint i = 1 + REC_OFFS_HEADER_SIZE
|
2007-06-08 07:37:07 +00:00
|
|
|
+ dict_index_get_n_fields(index);
|
|
|
|
offsets = mem_heap_alloc(graph_heap, i * sizeof *offsets);
|
|
|
|
offsets[0] = i;
|
|
|
|
offsets[1] = dict_index_get_n_fields(index);
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
b = *block;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (!row_merge_read(fd, foffs, block)) {
|
|
|
|
error = DB_CORRUPTION;
|
|
|
|
} else {
|
|
|
|
for (;;) {
|
|
|
|
const mrec_t* mrec;
|
|
|
|
dtuple_t* dtuple;
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
ulint n_ext;
|
2007-06-08 07:37:07 +00:00
|
|
|
|
|
|
|
b = row_merge_read_rec(block, &buf, b, index,
|
|
|
|
fd, &foffs, &mrec, offsets);
|
|
|
|
if (UNIV_UNLIKELY(!b)) {
|
|
|
|
/* End of list, or I/O error */
|
|
|
|
if (mrec) {
|
|
|
|
error = DB_CORRUPTION;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
dtuple = row_rec_to_index_entry_low(
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
mrec, index, offsets, &n_ext, tuple_heap);
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(n_ext)) {
|
|
|
|
row_merge_copy_blobs(mrec, offsets, zip_size,
|
|
|
|
dtuple, tuple_heap);
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
node->row = dtuple;
|
|
|
|
node->table = table;
|
|
|
|
node->trx_id = trx->id;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
ut_ad(dtuple_validate(dtuple));
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
do {
|
|
|
|
thr->run_node = thr;
|
|
|
|
thr->prev_node = thr->common.parent;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
error = row_ins_index_entry(index, dtuple,
|
|
|
|
0, FALSE, thr);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
if (UNIV_LIKELY(error == DB_SUCCESS)) {
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
goto next_rec;
|
|
|
|
}
|
2007-04-13 12:11:43 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
thr->lock_state = QUE_THR_LOCK_ROW;
|
|
|
|
trx->error_state = error;
|
|
|
|
que_thr_stop_for_mysql(thr);
|
|
|
|
thr->lock_state = QUE_THR_LOCK_NOLOCK;
|
|
|
|
} while (row_mysql_handle_errors(&error, trx,
|
|
|
|
thr, NULL));
|
2007-04-13 12:11:43 +00:00
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
goto err_exit;
|
2007-04-13 12:11:43 +00:00
|
|
|
next_rec:
|
2007-06-08 07:37:07 +00:00
|
|
|
mem_heap_empty(tuple_heap);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
|
|
|
que_thr_stop_for_mysql_no_error(thr, trx);
|
2007-04-13 12:11:43 +00:00
|
|
|
err_exit:
|
2007-04-04 11:05:33 +00:00
|
|
|
que_graph_free(thr->graph);
|
|
|
|
|
|
|
|
trx->op_info = "";
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
mem_heap_free(tuple_heap);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
|
|
|
return(error);
|
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Sets an exclusive lock on a table, for the duration of creating indexes.
|
|
|
|
@return error code or DB_SUCCESS */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-08-21 12:10:14 +00:00
|
|
|
ulint
|
|
|
|
row_merge_lock_table(
|
|
|
|
/*=================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
trx_t* trx, /*!< in/out: transaction */
|
|
|
|
dict_table_t* table, /*!< in: table to lock */
|
|
|
|
enum lock_mode mode) /*!< in: LOCK_X or LOCK_S */
|
2007-08-21 12:10:14 +00:00
|
|
|
{
|
|
|
|
mem_heap_t* heap;
|
|
|
|
que_thr_t* thr;
|
|
|
|
ulint err;
|
|
|
|
sel_node_t* node;
|
|
|
|
|
|
|
|
ut_ad(trx);
|
|
|
|
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
|
branches/zip: Fast index creation: Remove the ROW_PREBUILT_OBSOLETE nonsense.
Active transactions must not switch table or index definitions on the fly,
for several reasons, including the following:
* copied indexes do not carry any history or locking information;
that is, rollbacks, read views, and record locking would be broken
* huge potential for race conditions, inconsistent reads and writes,
loss of data, and corruption
Instead of trying to track down if the table was changed during a transaction,
acquire appropriate locks that protect the creation and dropping of indexes.
innodb-index.test: Test the locking of CREATE INDEX and DROP INDEX. Test
that consistent reads work across dropped indexes.
lock_rec_insert_check_and_lock(): Relax the lock_table_has() assertion.
When inserting a record into an index, the table must be at least IX-locked.
However, when an index is being created, an IS-lock on the table is
sufficient.
row_merge_lock_table(): Add the parameter enum lock_mode mode, which must
be LOCK_X or LOCK_S.
row_merge_drop_table(): Assert that n_mysql_handles_opened == 0.
Unconditionally drop the table.
ha_innobase::add_index(): Acquire an X or S lock on the table, as appropriate.
After acquiring an X lock, assert that n_mysql_handles_opened == 1.
Remove the comments about dropping tables in the background.
ha_innobase::final_drop_index(): Acquire an X lock on the table.
dict_table_t: Remove version_number, to_be_dropped, and prebuilts.
ins_node_t: Remove table_version_number.
enum lock_mode: Move the definition from lock0lock.h to lock0types.h.
ROW_PREBUILT_OBSOLETE, row_update_prebuilt(), row_prebuilt_table_obsolete():
Remove.
row_prebuilt_t: Remove the declaration from row0types.h.
row_drop_table_for_mysql_no_commit(): Always print a warning if a table
was added to the background drop queue.
2007-12-17 15:49:59 +00:00
|
|
|
ut_ad(mode == LOCK_X || mode == LOCK_S);
|
2007-08-21 12:10:14 +00:00
|
|
|
|
|
|
|
heap = mem_heap_create(512);
|
|
|
|
|
2007-12-17 20:51:34 +00:00
|
|
|
trx->op_info = "setting table lock for creating or dropping index";
|
2007-08-21 12:10:14 +00:00
|
|
|
|
|
|
|
node = sel_node_create(heap);
|
|
|
|
thr = pars_complete_graph_for_exec(node, trx, heap);
|
|
|
|
thr->graph->state = QUE_FORK_ACTIVE;
|
|
|
|
|
|
|
|
/* We use the select query graph as the dummy graph needed
|
|
|
|
in the lock module call */
|
|
|
|
|
|
|
|
thr = que_fork_get_first_thr(que_node_get_parent(thr));
|
|
|
|
que_thr_move_to_run_state_for_mysql(thr, trx);
|
|
|
|
|
|
|
|
run_again:
|
|
|
|
thr->run_node = thr;
|
|
|
|
thr->prev_node = thr->common.parent;
|
|
|
|
|
branches/zip: Fast index creation: Remove the ROW_PREBUILT_OBSOLETE nonsense.
Active transactions must not switch table or index definitions on the fly,
for several reasons, including the following:
* copied indexes do not carry any history or locking information;
that is, rollbacks, read views, and record locking would be broken
* huge potential for race conditions, inconsistent reads and writes,
loss of data, and corruption
Instead of trying to track down if the table was changed during a transaction,
acquire appropriate locks that protect the creation and dropping of indexes.
innodb-index.test: Test the locking of CREATE INDEX and DROP INDEX. Test
that consistent reads work across dropped indexes.
lock_rec_insert_check_and_lock(): Relax the lock_table_has() assertion.
When inserting a record into an index, the table must be at least IX-locked.
However, when an index is being created, an IS-lock on the table is
sufficient.
row_merge_lock_table(): Add the parameter enum lock_mode mode, which must
be LOCK_X or LOCK_S.
row_merge_drop_table(): Assert that n_mysql_handles_opened == 0.
Unconditionally drop the table.
ha_innobase::add_index(): Acquire an X or S lock on the table, as appropriate.
After acquiring an X lock, assert that n_mysql_handles_opened == 1.
Remove the comments about dropping tables in the background.
ha_innobase::final_drop_index(): Acquire an X lock on the table.
dict_table_t: Remove version_number, to_be_dropped, and prebuilts.
ins_node_t: Remove table_version_number.
enum lock_mode: Move the definition from lock0lock.h to lock0types.h.
ROW_PREBUILT_OBSOLETE, row_update_prebuilt(), row_prebuilt_table_obsolete():
Remove.
row_prebuilt_t: Remove the declaration from row0types.h.
row_drop_table_for_mysql_no_commit(): Always print a warning if a table
was added to the background drop queue.
2007-12-17 15:49:59 +00:00
|
|
|
err = lock_table(0, table, mode, thr);
|
2007-08-21 12:10:14 +00:00
|
|
|
|
|
|
|
trx->error_state = err;
|
|
|
|
|
|
|
|
if (UNIV_LIKELY(err == DB_SUCCESS)) {
|
|
|
|
que_thr_stop_for_mysql_no_error(thr, trx);
|
|
|
|
} else {
|
|
|
|
que_thr_stop_for_mysql(thr);
|
|
|
|
|
|
|
|
if (err != DB_QUE_THR_SUSPENDED) {
|
|
|
|
ibool was_lock_wait;
|
|
|
|
|
|
|
|
was_lock_wait = row_mysql_handle_errors(
|
|
|
|
&err, trx, thr, NULL);
|
|
|
|
|
|
|
|
if (was_lock_wait) {
|
|
|
|
goto run_again;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
que_thr_t* run_thr;
|
|
|
|
que_node_t* parent;
|
|
|
|
|
|
|
|
parent = que_node_get_parent(thr);
|
|
|
|
run_thr = que_fork_start_command(parent);
|
|
|
|
|
|
|
|
ut_a(run_thr == thr);
|
|
|
|
|
|
|
|
/* There was a lock wait but the thread was not
|
|
|
|
in a ready to run or running state. */
|
|
|
|
trx->error_state = DB_LOCK_WAIT;
|
|
|
|
|
|
|
|
goto run_again;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
que_graph_free(thr->graph);
|
|
|
|
trx->op_info = "";
|
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2008-10-10 11:44:27 +00:00
|
|
|
Drop an index from the InnoDB system tables. The data dictionary must
|
|
|
|
have been locked exclusively by the caller, because the transaction
|
|
|
|
will not be committed. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-06-04 07:49:31 +00:00
|
|
|
void
|
|
|
|
row_merge_drop_index(
|
|
|
|
/*=================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
dict_index_t* index, /*!< in: index to be removed */
|
|
|
|
dict_table_t* table, /*!< in: table */
|
|
|
|
trx_t* trx) /*!< in: transaction handle */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
|
|
|
ulint err;
|
2007-04-11 12:42:54 +00:00
|
|
|
pars_info_t* info = pars_info_create();
|
2007-04-04 11:05:33 +00:00
|
|
|
|
|
|
|
/* We use the private SQL parser of Innobase to generate the
|
|
|
|
query graphs needed in deleting the dictionary data from system
|
|
|
|
tables in Innobase. Deleting a row from SYS_INDEXES table also
|
|
|
|
frees the file segments of the B-tree associated with the index. */
|
|
|
|
|
|
|
|
static const char str1[] =
|
|
|
|
"PROCEDURE DROP_INDEX_PROC () IS\n"
|
|
|
|
"BEGIN\n"
|
2007-04-11 12:42:54 +00:00
|
|
|
"DELETE FROM SYS_FIELDS WHERE INDEX_ID = :indexid;\n"
|
|
|
|
"DELETE FROM SYS_INDEXES WHERE ID = :indexid\n"
|
|
|
|
" AND TABLE_ID = :tableid;\n"
|
2007-04-04 11:05:33 +00:00
|
|
|
"END;\n";
|
|
|
|
|
|
|
|
ut_ad(index && table && trx);
|
|
|
|
|
2007-04-11 12:42:54 +00:00
|
|
|
pars_info_add_dulint_literal(info, "indexid", index->id);
|
|
|
|
pars_info_add_dulint_literal(info, "tableid", table->id);
|
|
|
|
|
2007-04-04 11:05:33 +00:00
|
|
|
trx_start_if_not_started(trx);
|
|
|
|
trx->op_info = "dropping index";
|
|
|
|
|
2008-10-10 11:44:27 +00:00
|
|
|
ut_a(trx->dict_operation_lock_mode == RW_X_LATCH);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-04-11 12:42:54 +00:00
|
|
|
err = que_eval_sql(info, str1, FALSE, trx);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-04-11 12:42:54 +00:00
|
|
|
ut_a(err == DB_SUCCESS);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-04-11 12:42:54 +00:00
|
|
|
/* Replace this index with another equivalent index for all
|
|
|
|
foreign key constraints on this table where this index is used */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-04-11 12:42:54 +00:00
|
|
|
dict_table_replace_index_in_foreign_list(table, index);
|
|
|
|
dict_index_remove_from_cache(table, index);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
|
|
|
trx->op_info = "";
|
2007-06-04 07:49:31 +00:00
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2008-10-10 11:44:27 +00:00
|
|
|
Drop those indexes which were created before an error occurred when
|
|
|
|
building an index. The data dictionary must have been locked
|
|
|
|
exclusively by the caller, because the transaction will not be
|
|
|
|
committed. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-06-04 07:49:31 +00:00
|
|
|
void
|
|
|
|
row_merge_drop_indexes(
|
|
|
|
/*===================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
trx_t* trx, /*!< in: transaction */
|
|
|
|
dict_table_t* table, /*!< in: table containing the indexes */
|
|
|
|
dict_index_t** index, /*!< in: indexes to drop */
|
|
|
|
ulint num_created) /*!< in: number of elements in index[] */
|
2007-06-04 07:49:31 +00:00
|
|
|
{
|
|
|
|
ulint key_num;
|
|
|
|
|
|
|
|
for (key_num = 0; key_num < num_created; key_num++) {
|
|
|
|
row_merge_drop_index(index[key_num], table, trx);
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2007-09-05 10:18:03 +00:00
|
|
|
Drop all partially created indexes during crash recovery. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-05 10:18:03 +00:00
|
|
|
void
|
|
|
|
row_merge_drop_temp_indexes(void)
|
|
|
|
/*=============================*/
|
|
|
|
{
|
|
|
|
trx_t* trx;
|
|
|
|
ulint err;
|
|
|
|
|
|
|
|
/* We use the private SQL parser of Innobase to generate the
|
|
|
|
query graphs needed in deleting the dictionary data from system
|
|
|
|
tables in Innobase. Deleting a row from SYS_INDEXES table also
|
|
|
|
frees the file segments of the B-tree associated with the index. */
|
|
|
|
static const char drop_temp_indexes[] =
|
|
|
|
"PROCEDURE DROP_TEMP_INDEXES_PROC () IS\n"
|
|
|
|
"indexid CHAR;\n"
|
|
|
|
"DECLARE CURSOR c IS SELECT ID FROM SYS_INDEXES\n"
|
2009-05-25 08:42:47 +00:00
|
|
|
"WHERE SUBSTR(NAME,0,1)='" TEMP_INDEX_PREFIX_STR "';\n"
|
2007-09-05 10:18:03 +00:00
|
|
|
"BEGIN\n"
|
|
|
|
"\tOPEN c;\n"
|
2008-11-26 08:00:28 +00:00
|
|
|
"\tWHILE 1=1 LOOP\n"
|
2007-09-05 10:18:03 +00:00
|
|
|
"\t\tFETCH c INTO indexid;\n"
|
|
|
|
"\t\tIF (SQL % NOTFOUND) THEN\n"
|
|
|
|
"\t\t\tEXIT;\n"
|
|
|
|
"\t\tEND IF;\n"
|
|
|
|
"\t\tDELETE FROM SYS_FIELDS WHERE INDEX_ID = indexid;\n"
|
2009-01-07 14:42:42 +00:00
|
|
|
"\t\tDELETE FROM SYS_INDEXES WHERE ID = indexid;\n"
|
2007-09-05 10:18:03 +00:00
|
|
|
"\tEND LOOP;\n"
|
|
|
|
"\tCLOSE c;\n"
|
2007-10-29 15:25:46 +00:00
|
|
|
"\tCOMMIT WORK;\n"
|
2007-09-05 10:18:03 +00:00
|
|
|
"END;\n";
|
|
|
|
|
|
|
|
trx = trx_allocate_for_background();
|
|
|
|
trx->op_info = "dropping partially created indexes";
|
|
|
|
row_mysql_lock_data_dictionary(trx);
|
|
|
|
|
2009-01-07 14:42:42 +00:00
|
|
|
/* Incomplete transactions may be holding some locks on the
|
|
|
|
data dictionary tables. However, they should never have been
|
|
|
|
able to lock the records corresponding to the partially
|
|
|
|
created indexes that we are attempting to delete, because the
|
|
|
|
table was locked when the indexes were being created. We will
|
|
|
|
drop the partially created indexes before the rollback of
|
|
|
|
incomplete transactions is initiated. Thus, this should not
|
|
|
|
interfere with the incomplete transactions. */
|
|
|
|
trx->isolation_level = TRX_ISO_READ_UNCOMMITTED;
|
2007-09-05 10:18:03 +00:00
|
|
|
err = que_eval_sql(NULL, drop_temp_indexes, FALSE, trx);
|
|
|
|
ut_a(err == DB_SUCCESS);
|
|
|
|
|
|
|
|
row_mysql_unlock_data_dictionary(trx);
|
|
|
|
trx_free_for_background(trx);
|
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2007-06-08 07:37:07 +00:00
|
|
|
Create a merge file. */
|
|
|
|
static
|
2007-04-11 08:16:14 +00:00
|
|
|
void
|
|
|
|
row_merge_file_create(
|
|
|
|
/*==================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
merge_file_t* merge_file) /*!< out: merge file structure */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
2007-06-08 07:37:07 +00:00
|
|
|
merge_file->fd = innobase_mysql_tmpfile();
|
2007-04-12 10:32:16 +00:00
|
|
|
merge_file->offset = 0;
|
branches/zip: Fix a critical bug in fast index creation that could
corrupt the created indexes.
row_merge(): Make "half" an in/out parameter. Determine the offset of
half the output file. Copy the last blocks record-by-record instead of
block-by-block, so that the records can be counted. Check that the
input and output have matching n_rec.
row_merge_sort(): Do not assume that two blocks of size N are merged
into a block of size 2*N. The output block can be shorter than the
input if the last page of each input block is almost empty. Use an
accurate termination condition, based on the "half" computed by
row_merge().
row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output.
merge_file_t, row_merge_file_create(): Add n_rec, the number of records
in the merge file.
row_merge_read_clustered_index(): Update n_rec.
row_merge_blocks(): Update and check n_rec.
row_merge_blocks_copy(): New function, for copying the last blocks in
row_merge(). Update and check n_rec.
This bug was discovered with a user-supplied test case that creates an
index where the initial temporary file is 249 one-megabyte blocks and
the merged files become smaller. In the test, possible merge record
sizes are 10, 18, and 26 bytes.
rb://150 approved by Sunny Bains. This addresses Issue #320.
2009-08-27 07:31:17 +00:00
|
|
|
merge_file->n_rec = 0;
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2007-06-08 07:37:07 +00:00
|
|
|
Destroy a merge file. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
row_merge_file_destroy(
|
|
|
|
/*===================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
merge_file_t* merge_file) /*!< out: merge file structure */
|
2007-06-08 07:37:07 +00:00
|
|
|
{
|
|
|
|
if (merge_file->fd != -1) {
|
|
|
|
close(merge_file->fd);
|
|
|
|
merge_file->fd = -1;
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2007-08-10 15:52:09 +00:00
|
|
|
Determine the precise type of a column that is added to a tem
|
2009-05-25 05:30:14 +00:00
|
|
|
if a column must be constrained NOT NULL.
|
|
|
|
@return col->prtype, possibly ORed with DATA_NOT_NULL */
|
2007-08-10 15:52:09 +00:00
|
|
|
UNIV_INLINE
|
|
|
|
ulint
|
|
|
|
row_merge_col_prtype(
|
|
|
|
/*=================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
const dict_col_t* col, /*!< in: column */
|
|
|
|
const char* col_name, /*!< in: name of the column */
|
|
|
|
const merge_index_def_t*index_def) /*!< in: the index definition
|
2007-08-10 15:52:09 +00:00
|
|
|
of the primary key */
|
|
|
|
{
|
|
|
|
ulint prtype = col->prtype;
|
|
|
|
ulint i;
|
|
|
|
|
|
|
|
ut_ad(index_def->ind_type & DICT_CLUSTERED);
|
|
|
|
|
|
|
|
if (prtype & DATA_NOT_NULL) {
|
|
|
|
|
|
|
|
return(prtype);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* All columns that are included
|
|
|
|
in the PRIMARY KEY must be NOT NULL. */
|
|
|
|
|
|
|
|
for (i = 0; i < index_def->n_fields; i++) {
|
|
|
|
if (!strcmp(col_name, index_def->fields[i].field_name)) {
|
|
|
|
return(prtype | DATA_NOT_NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(prtype);
|
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2007-08-10 15:52:09 +00:00
|
|
|
Create a temporary table for creating a primary key, using the definition
|
2009-05-25 05:30:14 +00:00
|
|
|
of an existing table.
|
|
|
|
@return table, or NULL on error */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-04-04 11:05:33 +00:00
|
|
|
dict_table_t*
|
|
|
|
row_merge_create_temporary_table(
|
|
|
|
/*=============================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
const char* table_name, /*!< in: new table name */
|
|
|
|
const merge_index_def_t*index_def, /*!< in: the index definition
|
2007-08-10 15:52:09 +00:00
|
|
|
of the primary key */
|
2009-05-25 05:30:14 +00:00
|
|
|
const dict_table_t* table, /*!< in: old table definition */
|
|
|
|
trx_t* trx) /*!< in/out: transaction
|
2007-08-10 15:52:09 +00:00
|
|
|
(sets error_state) */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
|
|
|
ulint i;
|
|
|
|
dict_table_t* new_table = NULL;
|
|
|
|
ulint n_cols = dict_table_get_n_user_cols(table);
|
2007-06-06 20:25:35 +00:00
|
|
|
ulint error;
|
2007-09-05 10:18:03 +00:00
|
|
|
mem_heap_t* heap = mem_heap_create(1000);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-08-02 09:46:28 +00:00
|
|
|
ut_ad(table_name);
|
2007-08-10 15:52:09 +00:00
|
|
|
ut_ad(index_def);
|
2007-08-02 09:46:28 +00:00
|
|
|
ut_ad(table);
|
2007-04-04 11:05:33 +00:00
|
|
|
ut_ad(mutex_own(&dict_sys->mutex));
|
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
new_table = dict_mem_table_create(table_name, 0, n_cols, table->flags);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
for (i = 0; i < n_cols; i++) {
|
|
|
|
const dict_col_t* col;
|
|
|
|
const char* col_name;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
col = dict_table_get_nth_col(table, i);
|
|
|
|
col_name = dict_table_get_col_name(table, i);
|
2007-06-06 20:25:35 +00:00
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
dict_mem_table_add_col(new_table, heap, col_name, col->mtype,
|
|
|
|
row_merge_col_prtype(col, col_name,
|
|
|
|
index_def),
|
|
|
|
col->len);
|
2007-06-06 20:25:35 +00:00
|
|
|
}
|
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
error = row_create_table_for_mysql(new_table, trx);
|
|
|
|
mem_heap_free(heap);
|
|
|
|
|
2007-06-06 20:25:35 +00:00
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
trx->error_state = error;
|
2007-09-05 10:18:03 +00:00
|
|
|
new_table = NULL;
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return(new_table);
|
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2008-10-10 11:44:27 +00:00
|
|
|
Rename the temporary indexes in the dictionary to permanent ones. The
|
|
|
|
data dictionary must have been locked exclusively by the caller,
|
2009-05-25 05:30:14 +00:00
|
|
|
because the transaction will not be committed.
|
|
|
|
@return DB_SUCCESS if all OK */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-04-04 11:05:33 +00:00
|
|
|
ulint
|
2007-09-05 10:18:03 +00:00
|
|
|
row_merge_rename_indexes(
|
|
|
|
/*=====================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
trx_t* trx, /*!< in/out: transaction */
|
|
|
|
dict_table_t* table) /*!< in/out: table with new indexes */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
|
|
|
ulint err = DB_SUCCESS;
|
2007-04-11 12:42:54 +00:00
|
|
|
pars_info_t* info = pars_info_create();
|
2007-04-04 11:05:33 +00:00
|
|
|
|
|
|
|
/* We use the private SQL parser of Innobase to generate the
|
2007-09-05 10:18:03 +00:00
|
|
|
query graphs needed in renaming indexes. */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
static const char rename_indexes[] =
|
|
|
|
"PROCEDURE RENAME_INDEXES_PROC () IS\n"
|
2007-04-04 11:05:33 +00:00
|
|
|
"BEGIN\n"
|
2007-09-05 10:18:03 +00:00
|
|
|
"UPDATE SYS_INDEXES SET NAME=SUBSTR(NAME,1,LENGTH(NAME)-1)\n"
|
2009-05-25 08:42:47 +00:00
|
|
|
"WHERE TABLE_ID = :tableid AND SUBSTR(NAME,0,1)='"
|
|
|
|
TEMP_INDEX_PREFIX_STR "';\n"
|
2007-04-04 11:05:33 +00:00
|
|
|
"END;\n";
|
|
|
|
|
2008-10-11 18:58:47 +00:00
|
|
|
ut_ad(table);
|
2008-10-10 11:44:27 +00:00
|
|
|
ut_ad(trx);
|
|
|
|
ut_a(trx->dict_operation_lock_mode == RW_X_LATCH);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
trx->op_info = "renaming indexes";
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-04-11 12:42:54 +00:00
|
|
|
pars_info_add_dulint_literal(info, "tableid", table->id);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
err = que_eval_sql(info, rename_indexes, FALSE, trx);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
|
|
|
if (err == DB_SUCCESS) {
|
2007-09-05 10:18:03 +00:00
|
|
|
dict_index_t* index = dict_table_get_first_index(table);
|
|
|
|
do {
|
|
|
|
if (*index->name == TEMP_INDEX_PREFIX) {
|
|
|
|
index->name++;
|
|
|
|
}
|
|
|
|
index = dict_table_get_next_index(index);
|
|
|
|
} while (index);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
trx->op_info = "";
|
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2008-10-10 11:44:27 +00:00
|
|
|
Rename the tables in the data dictionary. The data dictionary must
|
|
|
|
have been locked exclusively by the caller, because the transaction
|
2009-05-25 05:30:14 +00:00
|
|
|
will not be committed.
|
|
|
|
@return error code or DB_SUCCESS */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-08-20 11:40:00 +00:00
|
|
|
ulint
|
|
|
|
row_merge_rename_tables(
|
|
|
|
/*====================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
dict_table_t* old_table, /*!< in/out: old table, renamed to
|
2007-08-20 11:40:00 +00:00
|
|
|
tmp_name */
|
2009-05-25 05:30:14 +00:00
|
|
|
dict_table_t* new_table, /*!< in/out: new table, renamed to
|
2007-08-20 11:40:00 +00:00
|
|
|
old_table->name */
|
2009-05-25 05:30:14 +00:00
|
|
|
const char* tmp_name, /*!< in: new name for old_table */
|
|
|
|
trx_t* trx) /*!< in: transaction handle */
|
2007-08-20 11:40:00 +00:00
|
|
|
{
|
|
|
|
ulint err = DB_ERROR;
|
|
|
|
pars_info_t* info;
|
|
|
|
const char* old_name= old_table->name;
|
|
|
|
|
|
|
|
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
|
|
|
|
ut_ad(old_table != new_table);
|
2007-08-29 08:45:34 +00:00
|
|
|
ut_ad(mutex_own(&dict_sys->mutex));
|
2007-08-20 11:40:00 +00:00
|
|
|
|
2008-10-10 11:44:27 +00:00
|
|
|
ut_a(trx->dict_operation_lock_mode == RW_X_LATCH);
|
|
|
|
|
2007-08-20 11:40:00 +00:00
|
|
|
trx->op_info = "renaming tables";
|
|
|
|
|
|
|
|
/* We use the private SQL parser of Innobase to generate the query
|
|
|
|
graphs needed in updating the dictionary data in system tables. */
|
|
|
|
|
|
|
|
info = pars_info_create();
|
|
|
|
|
|
|
|
pars_info_add_str_literal(info, "new_name", new_table->name);
|
|
|
|
pars_info_add_str_literal(info, "old_name", old_name);
|
|
|
|
pars_info_add_str_literal(info, "tmp_name", tmp_name);
|
|
|
|
|
|
|
|
err = que_eval_sql(info,
|
|
|
|
"PROCEDURE RENAME_TABLES () IS\n"
|
|
|
|
"BEGIN\n"
|
|
|
|
"UPDATE SYS_TABLES SET NAME = :tmp_name\n"
|
|
|
|
" WHERE NAME = :old_name;\n"
|
|
|
|
"UPDATE SYS_TABLES SET NAME = :old_name\n"
|
|
|
|
" WHERE NAME = :new_name;\n"
|
|
|
|
"END;\n", FALSE, trx);
|
|
|
|
|
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
|
|
|
|
goto err_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The following calls will also rename the .ibd data files if
|
|
|
|
the tables are stored in a single-table tablespace */
|
|
|
|
|
|
|
|
if (!dict_table_rename_in_cache(old_table, tmp_name, FALSE)
|
|
|
|
|| !dict_table_rename_in_cache(new_table, old_name, FALSE)) {
|
|
|
|
|
|
|
|
err = DB_ERROR;
|
|
|
|
goto err_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = dict_load_foreigns(old_name, TRUE);
|
|
|
|
|
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
err_exit:
|
|
|
|
trx->error_state = DB_SUCCESS;
|
2009-08-11 10:42:37 +00:00
|
|
|
trx_general_rollback_for_mysql(trx, NULL);
|
2007-08-20 11:40:00 +00:00
|
|
|
trx->error_state = DB_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
trx->op_info = "";
|
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Create and execute a query graph for creating an index.
|
|
|
|
@return DB_SUCCESS or error code */
|
2007-12-19 15:05:13 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
row_merge_create_index_graph(
|
|
|
|
/*=========================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
trx_t* trx, /*!< in: trx */
|
|
|
|
dict_table_t* table, /*!< in: table */
|
|
|
|
dict_index_t* index) /*!< in: index */
|
2007-12-19 15:05:13 +00:00
|
|
|
{
|
2009-05-26 12:28:49 +00:00
|
|
|
ind_node_t* node; /*!< Index creation node */
|
|
|
|
mem_heap_t* heap; /*!< Memory heap */
|
|
|
|
que_thr_t* thr; /*!< Query thread */
|
2007-12-19 15:05:13 +00:00
|
|
|
ulint err;
|
|
|
|
|
|
|
|
ut_ad(trx);
|
|
|
|
ut_ad(table);
|
|
|
|
ut_ad(index);
|
|
|
|
|
|
|
|
heap = mem_heap_create(512);
|
|
|
|
|
|
|
|
index->table = table;
|
|
|
|
node = ind_create_graph_create(index, heap);
|
|
|
|
thr = pars_complete_graph_for_exec(node, trx, heap);
|
|
|
|
|
|
|
|
ut_a(thr == que_fork_start_command(que_node_get_parent(thr)));
|
|
|
|
|
|
|
|
que_run_threads(thr);
|
|
|
|
|
|
|
|
err = trx->error_state;
|
|
|
|
|
|
|
|
que_graph_free((que_t*) que_node_get_parent(thr));
|
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Create the index and load in to the dictionary.
|
|
|
|
@return index, or NULL on error */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-06-06 20:25:35 +00:00
|
|
|
dict_index_t*
|
2007-04-04 11:05:33 +00:00
|
|
|
row_merge_create_index(
|
|
|
|
/*===================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
trx_t* trx, /*!< in/out: trx (sets error_state) */
|
|
|
|
dict_table_t* table, /*!< in: the index is on this table */
|
2009-05-20 08:19:40 +00:00
|
|
|
const merge_index_def_t*index_def)
|
2009-05-25 05:30:14 +00:00
|
|
|
/*!< in: the index definition */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
2007-06-06 20:25:35 +00:00
|
|
|
dict_index_t* index;
|
2007-09-05 10:18:03 +00:00
|
|
|
ulint err;
|
2007-04-04 11:05:33 +00:00
|
|
|
ulint n_fields = index_def->n_fields;
|
2007-09-05 10:18:03 +00:00
|
|
|
ulint i;
|
2007-04-04 11:05:33 +00:00
|
|
|
|
|
|
|
/* Create the index prototype, using the passed in def, this is not
|
|
|
|
a persistent operation. We pass 0 as the space id, and determine at
|
2007-06-08 07:37:07 +00:00
|
|
|
a lower level the space id where to store the table. */
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-06 20:25:35 +00:00
|
|
|
index = dict_mem_index_create(table->name, index_def->name,
|
|
|
|
0, index_def->ind_type, n_fields);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-06-06 20:25:35 +00:00
|
|
|
ut_a(index);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
for (i = 0; i < n_fields; i++) {
|
|
|
|
merge_index_field_t* ifield = &index_def->fields[i];
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
dict_mem_index_add_field(index, ifield->field_name,
|
|
|
|
ifield->prefix_len);
|
|
|
|
}
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2008-08-29 09:13:16 +00:00
|
|
|
/* Add the index to SYS_INDEXES, using the index prototype. */
|
2007-12-19 15:05:13 +00:00
|
|
|
err = row_merge_create_index_graph(trx, table, index);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
if (err == DB_SUCCESS) {
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
index = row_merge_dict_table_get_index(
|
|
|
|
table, index_def);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
ut_a(index);
|
2007-04-04 11:05:33 +00:00
|
|
|
|
2007-09-05 10:18:03 +00:00
|
|
|
/* Note the id of the transaction that created this
|
|
|
|
index, we use it to restrict readers from accessing
|
|
|
|
this index, to ensure read consistency. */
|
2009-04-02 12:23:12 +00:00
|
|
|
index->trx_id = (ib_uint64_t)
|
|
|
|
ut_conv_dulint_to_longlong(trx->id);
|
2007-09-05 10:18:03 +00:00
|
|
|
} else {
|
|
|
|
index = NULL;
|
2007-06-06 20:25:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return(index);
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2007-06-08 07:37:07 +00:00
|
|
|
Check if a transaction can use an index. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-04-04 11:05:33 +00:00
|
|
|
ibool
|
|
|
|
row_merge_is_index_usable(
|
|
|
|
/*======================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
const trx_t* trx, /*!< in: transaction */
|
|
|
|
const dict_index_t* index) /*!< in: index to check */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
2009-04-02 12:23:12 +00:00
|
|
|
return(!trx->read_view || read_view_sees_trx_id(
|
|
|
|
trx->read_view,
|
|
|
|
ut_dulint_create((ulint) (index->trx_id >> 32),
|
|
|
|
(ulint) index->trx_id & 0xFFFFFFFF)));
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2009-05-25 05:30:14 +00:00
|
|
|
Drop the old table.
|
|
|
|
@return DB_SUCCESS or error code */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-04-04 11:05:33 +00:00
|
|
|
ulint
|
|
|
|
row_merge_drop_table(
|
|
|
|
/*=================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
trx_t* trx, /*!< in: transaction */
|
|
|
|
dict_table_t* table) /*!< in: table to drop */
|
2007-04-04 11:05:33 +00:00
|
|
|
{
|
branches/zip: Fast index creation: Remove the ROW_PREBUILT_OBSOLETE nonsense.
Active transactions must not switch table or index definitions on the fly,
for several reasons, including the following:
* copied indexes do not carry any history or locking information;
that is, rollbacks, read views, and record locking would be broken
* huge potential for race conditions, inconsistent reads and writes,
loss of data, and corruption
Instead of trying to track down if the table was changed during a transaction,
acquire appropriate locks that protect the creation and dropping of indexes.
innodb-index.test: Test the locking of CREATE INDEX and DROP INDEX. Test
that consistent reads work across dropped indexes.
lock_rec_insert_check_and_lock(): Relax the lock_table_has() assertion.
When inserting a record into an index, the table must be at least IX-locked.
However, when an index is being created, an IS-lock on the table is
sufficient.
row_merge_lock_table(): Add the parameter enum lock_mode mode, which must
be LOCK_X or LOCK_S.
row_merge_drop_table(): Assert that n_mysql_handles_opened == 0.
Unconditionally drop the table.
ha_innobase::add_index(): Acquire an X or S lock on the table, as appropriate.
After acquiring an X lock, assert that n_mysql_handles_opened == 1.
Remove the comments about dropping tables in the background.
ha_innobase::final_drop_index(): Acquire an X lock on the table.
dict_table_t: Remove version_number, to_be_dropped, and prebuilts.
ins_node_t: Remove table_version_number.
enum lock_mode: Move the definition from lock0lock.h to lock0types.h.
ROW_PREBUILT_OBSOLETE, row_update_prebuilt(), row_prebuilt_table_obsolete():
Remove.
row_prebuilt_t: Remove the declaration from row0types.h.
row_drop_table_for_mysql_no_commit(): Always print a warning if a table
was added to the background drop queue.
2007-12-17 15:49:59 +00:00
|
|
|
/* There must be no open transactions on the table. */
|
|
|
|
ut_a(table->n_mysql_handles_opened == 0);
|
|
|
|
|
2008-10-08 08:54:16 +00:00
|
|
|
return(row_drop_table_for_mysql(table->name, trx, FALSE));
|
2007-04-04 11:05:33 +00:00
|
|
|
}
|
2007-06-08 07:37:07 +00:00
|
|
|
|
2009-05-25 09:52:29 +00:00
|
|
|
/*********************************************************************//**
|
2007-06-08 07:37:07 +00:00
|
|
|
Build indexes on a table by reading a clustered index,
|
|
|
|
creating a temporary file containing index entries, merge sorting
|
2009-05-25 05:30:14 +00:00
|
|
|
these index entries and inserting sorted index entries to indexes.
|
|
|
|
@return DB_SUCCESS or error code */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-06-08 07:37:07 +00:00
|
|
|
ulint
|
|
|
|
row_merge_build_indexes(
|
|
|
|
/*====================*/
|
2009-05-25 05:30:14 +00:00
|
|
|
trx_t* trx, /*!< in: transaction */
|
|
|
|
dict_table_t* old_table, /*!< in: table where rows are
|
2007-06-08 07:37:07 +00:00
|
|
|
read from */
|
2009-05-25 05:30:14 +00:00
|
|
|
dict_table_t* new_table, /*!< in: table where indexes are
|
2007-08-10 15:22:47 +00:00
|
|
|
created; identical to old_table
|
|
|
|
unless creating a PRIMARY KEY */
|
2009-05-25 05:30:14 +00:00
|
|
|
dict_index_t** indexes, /*!< in: indexes to be created */
|
|
|
|
ulint n_indexes, /*!< in: size of indexes[] */
|
|
|
|
TABLE* table) /*!< in/out: MySQL table, for
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
reporting erroneous key value
|
|
|
|
if applicable */
|
2007-06-08 07:37:07 +00:00
|
|
|
{
|
|
|
|
merge_file_t* merge_files;
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
row_merge_block_t* block;
|
|
|
|
ulint block_size;
|
2007-06-08 07:37:07 +00:00
|
|
|
ulint i;
|
|
|
|
ulint error;
|
|
|
|
int tmpfd;
|
|
|
|
|
|
|
|
ut_ad(trx);
|
|
|
|
ut_ad(old_table);
|
|
|
|
ut_ad(new_table);
|
|
|
|
ut_ad(indexes);
|
|
|
|
ut_ad(n_indexes);
|
|
|
|
|
|
|
|
trx_start_if_not_started(trx);
|
|
|
|
|
|
|
|
/* Allocate memory for merge file data structure and initialize
|
|
|
|
fields */
|
|
|
|
|
|
|
|
merge_files = mem_alloc(n_indexes * sizeof *merge_files);
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
block_size = 3 * sizeof *block;
|
|
|
|
block = os_mem_alloc_large(&block_size);
|
2007-06-08 07:37:07 +00:00
|
|
|
|
|
|
|
for (i = 0; i < n_indexes; i++) {
|
|
|
|
|
|
|
|
row_merge_file_create(&merge_files[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
tmpfd = innobase_mysql_tmpfile();
|
|
|
|
|
2007-09-26 13:47:32 +00:00
|
|
|
/* Reset the MySQL row buffer that is used when reporting
|
|
|
|
duplicate keys. */
|
|
|
|
innobase_rec_reset(table);
|
|
|
|
|
2007-06-08 07:37:07 +00:00
|
|
|
/* Read clustered index of the table and create files for
|
|
|
|
secondary index entries for merge sort */
|
|
|
|
|
|
|
|
error = row_merge_read_clustered_index(
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 11:56:26 +00:00
|
|
|
trx, table, old_table, new_table, indexes,
|
2007-08-10 15:52:09 +00:00
|
|
|
merge_files, n_indexes, block);
|
2007-06-08 07:37:07 +00:00
|
|
|
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now we have files containing index entries ready for
|
|
|
|
sorting and inserting. */
|
|
|
|
|
|
|
|
for (i = 0; i < n_indexes; i++) {
|
|
|
|
error = row_merge_sort(indexes[i], &merge_files[i],
|
2007-09-27 08:28:25 +00:00
|
|
|
block, &tmpfd, table);
|
2007-06-08 07:37:07 +00:00
|
|
|
|
|
|
|
if (error == DB_SUCCESS) {
|
|
|
|
error = row_merge_insert_index_tuples(
|
|
|
|
trx, indexes[i], new_table,
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
dict_table_zip_size(old_table),
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
merge_files[i].fd, block);
|
2007-06-08 07:37:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Close the temporary file to free up space. */
|
|
|
|
row_merge_file_destroy(&merge_files[i]);
|
|
|
|
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
trx->error_key_num = i;
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func_exit:
|
|
|
|
close(tmpfd);
|
|
|
|
|
|
|
|
for (i = 0; i < n_indexes; i++) {
|
|
|
|
row_merge_file_destroy(&merge_files[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
mem_free(merge_files);
|
branches/zip: row_merge_build_indexes(): Allocate all buffers with a
single os_mem_alloc_large() call. The function mem_alloc() that was
used previously allocates unaligned memory.
row_merge_blocks(): Replace block1, block2, block3 with a single array.
Replace buf1, buf2, buf3 with buf[3]. Replace b1..b3 with b0..b2.
Replace mrec1,2 with mrec0,1. Replace offsets1,2 with offsets0,1.
row_merge(), row_merge_sort(): Replace block1, block2, block3 with a
single array.
2007-06-08 09:49:50 +00:00
|
|
|
os_mem_free_large(block, block_size);
|
2007-06-08 07:37:07 +00:00
|
|
|
|
|
|
|
return(error);
|
|
|
|
}
|