2002-10-28 14:44:19 +01:00
|
|
|
/* Copyright (C) 2000 MySQL AB
|
|
|
|
|
|
|
|
|
|
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
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2002-10-28 14:44:19 +01:00
|
|
|
|
|
|
|
|
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 */
|
|
|
|
|
|
|
|
|
|
#include "mysql_priv.h"
|
|
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
struct st_find_field
|
|
|
|
|
{
|
|
|
|
|
const char *table_name, *field_name;
|
|
|
|
|
Field *field;
|
|
|
|
|
};
|
2002-10-28 14:44:19 +01:00
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
/* Used fields */
|
|
|
|
|
|
|
|
|
|
static struct st_find_field init_used_fields[]=
|
|
|
|
|
{
|
2003-05-29 23:47:31 +02:00
|
|
|
{ "help_topic", "help_topic_id", 0},
|
|
|
|
|
{ "help_topic", "name", 0},
|
|
|
|
|
{ "help_topic", "help_category_id", 0},
|
|
|
|
|
{ "help_topic", "description", 0},
|
|
|
|
|
{ "help_topic", "example", 0},
|
|
|
|
|
|
|
|
|
|
{ "help_category", "help_category_id", 0},
|
|
|
|
|
{ "help_category", "parent_category_id", 0},
|
|
|
|
|
{ "help_category", "name", 0},
|
|
|
|
|
|
|
|
|
|
{ "help_keyword", "help_keyword_id", 0},
|
|
|
|
|
{ "help_keyword", "name", 0},
|
|
|
|
|
|
|
|
|
|
{ "help_relation", "help_topic_id", 0},
|
|
|
|
|
{ "help_relation", "help_keyword_id", 0}
|
2003-02-12 20:55:37 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum enum_used_fields
|
|
|
|
|
{
|
2003-05-29 23:47:31 +02:00
|
|
|
help_topic_help_topic_id= 0,
|
2004-06-23 12:29:05 +02:00
|
|
|
help_topic_name,
|
2003-05-29 23:47:31 +02:00
|
|
|
help_topic_help_category_id,
|
2004-06-23 12:29:05 +02:00
|
|
|
help_topic_description,
|
2003-05-29 23:47:31 +02:00
|
|
|
help_topic_example,
|
|
|
|
|
|
|
|
|
|
help_category_help_category_id,
|
|
|
|
|
help_category_parent_category_id,
|
|
|
|
|
help_category_name,
|
|
|
|
|
|
|
|
|
|
help_keyword_help_keyword_id,
|
|
|
|
|
help_keyword_name,
|
|
|
|
|
|
2004-06-23 12:29:05 +02:00
|
|
|
help_relation_help_topic_id,
|
2003-05-29 23:47:31 +02:00
|
|
|
help_relation_help_keyword_id
|
2003-02-12 20:55:37 +01:00
|
|
|
};
|
2002-12-20 14:57:24 +01:00
|
|
|
|
2003-06-24 11:10:35 +02:00
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
/*
|
2004-06-23 12:29:05 +02:00
|
|
|
Fill st_find_field structure with pointers to fields
|
2003-05-29 23:47:31 +02:00
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
init_fields()
|
|
|
|
|
thd Thread handler
|
|
|
|
|
tables list of all tables for fields
|
|
|
|
|
find_fields array of structures
|
|
|
|
|
count size of previous array
|
|
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
|
0 all ok
|
2005-08-12 16:57:19 +02:00
|
|
|
1 one of the fileds was not found
|
2003-05-29 23:47:31 +02:00
|
|
|
*/
|
2003-02-12 20:55:37 +01:00
|
|
|
|
|
|
|
|
static bool init_fields(THD *thd, TABLE_LIST *tables,
|
2003-05-29 23:47:31 +02:00
|
|
|
struct st_find_field *find_fields, uint count)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2005-07-01 06:05:42 +02:00
|
|
|
Name_resolution_context *context= &thd->lex->select_lex.context;
|
2003-05-29 23:47:31 +02:00
|
|
|
DBUG_ENTER("init_fields");
|
2005-07-01 06:05:42 +02:00
|
|
|
context->resolve_in_table_list_only(tables);
|
2003-05-29 23:47:31 +02:00
|
|
|
for (; count-- ; find_fields++)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2003-02-12 20:55:37 +01:00
|
|
|
/* We have to use 'new' here as field will be re_linked on free */
|
2005-07-01 06:05:42 +02:00
|
|
|
Item_field *field= new Item_field(context,
|
|
|
|
|
"mysql", find_fields->table_name,
|
2003-05-29 23:47:31 +02:00
|
|
|
find_fields->field_name);
|
2005-08-12 16:57:19 +02:00
|
|
|
if (!(find_fields->field= find_field_in_tables(thd, field, tables, NULL,
|
2005-07-02 23:51:02 +02:00
|
|
|
0, REPORT_ALL_ERRORS, 1,
|
|
|
|
|
TRUE)))
|
2003-05-29 23:47:31 +02:00
|
|
|
DBUG_RETURN(1);
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
bitmap_set_bit(find_fields->field->table->read_set,
|
|
|
|
|
find_fields->field->field_index);
|
|
|
|
|
/* To make life easier when setting values in keys */
|
|
|
|
|
bitmap_set_bit(find_fields->field->table->write_set,
|
|
|
|
|
find_fields->field->field_index);
|
2002-10-28 14:44:19 +01:00
|
|
|
}
|
2003-05-29 23:47:31 +02:00
|
|
|
DBUG_RETURN(0);
|
2002-10-28 14:44:19 +01:00
|
|
|
}
|
|
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
|
2003-06-24 11:10:35 +02:00
|
|
|
/*
|
2003-05-29 23:47:31 +02:00
|
|
|
Returns variants of found topic for help (if it is just single topic,
|
|
|
|
|
returns description and example, or else returns only names..)
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
memorize_variant_topic()
|
|
|
|
|
|
|
|
|
|
thd Thread handler
|
|
|
|
|
topics Table of topics
|
|
|
|
|
count number of alredy found topics
|
|
|
|
|
find_fields Filled array of information for work with fields
|
|
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
|
names array of names of found topics (out)
|
2002-10-28 14:44:19 +01:00
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
name name of found topic (out)
|
|
|
|
|
description description of found topic (out)
|
|
|
|
|
example example for found topic (out)
|
|
|
|
|
|
|
|
|
|
NOTE
|
|
|
|
|
Field 'names' is set only if more than one topic is found.
|
2004-06-23 12:29:05 +02:00
|
|
|
Fields 'name', 'description', 'example' are set only if
|
2003-05-29 23:47:31 +02:00
|
|
|
found exactly one topic.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void memorize_variant_topic(THD *thd, TABLE *topics, int count,
|
2004-06-23 12:29:05 +02:00
|
|
|
struct st_find_field *find_fields,
|
2003-05-29 23:47:31 +02:00
|
|
|
List<String> *names,
|
|
|
|
|
String *name, String *description, String *example)
|
|
|
|
|
{
|
|
|
|
|
DBUG_ENTER("memorize_variant_topic");
|
2004-11-08 00:13:54 +01:00
|
|
|
MEM_ROOT *mem_root= thd->mem_root;
|
2003-05-29 23:47:31 +02:00
|
|
|
if (count==0)
|
|
|
|
|
{
|
|
|
|
|
get_field(mem_root,find_fields[help_topic_name].field, name);
|
|
|
|
|
get_field(mem_root,find_fields[help_topic_description].field, description);
|
|
|
|
|
get_field(mem_root,find_fields[help_topic_example].field, example);
|
|
|
|
|
}
|
2004-06-23 12:29:05 +02:00
|
|
|
else
|
2003-05-29 23:47:31 +02:00
|
|
|
{
|
2003-06-24 11:10:35 +02:00
|
|
|
if (count == 1)
|
2003-05-29 23:47:31 +02:00
|
|
|
names->push_back(name);
|
2004-11-08 00:13:54 +01:00
|
|
|
String *new_name= new (thd->mem_root) String;
|
2003-05-29 23:47:31 +02:00
|
|
|
get_field(mem_root,find_fields[help_topic_name].field,new_name);
|
|
|
|
|
names->push_back(new_name);
|
|
|
|
|
}
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
|
}
|
2002-10-28 14:44:19 +01:00
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
/*
|
|
|
|
|
Look for topics by mask
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
search_topics()
|
2003-05-29 23:47:31 +02:00
|
|
|
thd Thread handler
|
|
|
|
|
topics Table of topics
|
|
|
|
|
find_fields Filled array of info for fields
|
|
|
|
|
select Function to test for matching help topic.
|
|
|
|
|
Normally 'help_topic.name like 'bit%'
|
|
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
RETURN VALUES
|
2003-05-29 23:47:31 +02:00
|
|
|
# number of topics found
|
|
|
|
|
|
|
|
|
|
names array of names of found topics (out)
|
|
|
|
|
name name of found topic (out)
|
|
|
|
|
description description of found topic (out)
|
|
|
|
|
example example for found topic (out)
|
|
|
|
|
|
|
|
|
|
NOTE
|
|
|
|
|
Field 'names' is set only if more than one topic was found.
|
2004-06-23 12:29:05 +02:00
|
|
|
Fields 'name', 'description', 'example' are set only if
|
2003-05-29 23:47:31 +02:00
|
|
|
exactly one topic was found.
|
|
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
*/
|
|
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
int search_topics(THD *thd, TABLE *topics, struct st_find_field *find_fields,
|
|
|
|
|
SQL_SELECT *select, List<String> *names,
|
|
|
|
|
String *name, String *description, String *example)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2003-05-29 23:47:31 +02:00
|
|
|
DBUG_ENTER("search_topics");
|
2002-10-28 14:44:19 +01:00
|
|
|
int count= 0;
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
READ_RECORD read_record_info;
|
2008-07-15 16:13:21 +02:00
|
|
|
init_read_record(&read_record_info, thd, topics, select, 1, 0, FALSE);
|
2003-02-12 20:55:37 +01:00
|
|
|
while (!read_record_info.read_record(&read_record_info))
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2004-06-23 12:29:05 +02:00
|
|
|
if (!select->cond->val_int()) // Doesn't match like
|
2002-10-28 14:44:19 +01:00
|
|
|
continue;
|
2003-05-29 23:47:31 +02:00
|
|
|
memorize_variant_topic(thd,topics,count,find_fields,
|
|
|
|
|
names,name,description,example);
|
2003-02-12 20:55:37 +01:00
|
|
|
count++;
|
2002-10-28 14:44:19 +01:00
|
|
|
}
|
2003-02-12 20:55:37 +01:00
|
|
|
end_read_record(&read_record_info);
|
2003-05-29 23:47:31 +02:00
|
|
|
|
2002-10-28 14:44:19 +01:00
|
|
|
DBUG_RETURN(count);
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
/*
|
2003-05-29 23:47:31 +02:00
|
|
|
Look for keyword by mask
|
2003-02-12 20:55:37 +01:00
|
|
|
|
|
|
|
|
SYNOPSIS
|
2003-05-29 23:47:31 +02:00
|
|
|
search_keyword()
|
|
|
|
|
thd Thread handler
|
|
|
|
|
keywords Table of keywords
|
|
|
|
|
find_fields Filled array of info for fields
|
|
|
|
|
select Function to test for matching keyword.
|
|
|
|
|
Normally 'help_keyword.name like 'bit%'
|
|
|
|
|
|
|
|
|
|
key_id help_keyword_if of found topics (out)
|
2003-02-12 20:55:37 +01:00
|
|
|
|
|
|
|
|
RETURN VALUES
|
2003-05-29 23:47:31 +02:00
|
|
|
0 didn't find any topics matching the mask
|
|
|
|
|
1 found exactly one topic matching the mask
|
|
|
|
|
2 found more then one topic matching the mask
|
2003-02-12 20:55:37 +01:00
|
|
|
*/
|
|
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
int search_keyword(THD *thd, TABLE *keywords, struct st_find_field *find_fields,
|
|
|
|
|
SQL_SELECT *select, int *key_id)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2003-05-29 23:47:31 +02:00
|
|
|
DBUG_ENTER("search_keyword");
|
2002-10-28 14:44:19 +01:00
|
|
|
int count= 0;
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
READ_RECORD read_record_info;
|
2008-07-15 16:13:21 +02:00
|
|
|
init_read_record(&read_record_info, thd, keywords, select, 1, 0, FALSE);
|
2003-05-29 23:47:31 +02:00
|
|
|
while (!read_record_info.read_record(&read_record_info) && count<2)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2003-05-29 23:47:31 +02:00
|
|
|
if (!select->cond->val_int()) // Dosn't match like
|
2003-02-12 20:55:37 +01:00
|
|
|
continue;
|
2003-05-29 23:47:31 +02:00
|
|
|
|
2003-06-04 05:59:32 +02:00
|
|
|
*key_id= (int)find_fields[help_keyword_help_keyword_id].field->val_int();
|
2003-05-29 23:47:31 +02:00
|
|
|
|
|
|
|
|
count++;
|
2002-10-28 14:44:19 +01:00
|
|
|
}
|
2003-02-12 20:55:37 +01:00
|
|
|
end_read_record(&read_record_info);
|
2003-05-29 23:47:31 +02:00
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
DBUG_RETURN(count);
|
|
|
|
|
}
|
2002-10-28 14:44:19 +01:00
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
/*
|
2003-05-29 23:47:31 +02:00
|
|
|
Look for all topics with keyword
|
2002-10-28 14:44:19 +01:00
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
SYNOPSIS
|
2003-05-29 23:47:31 +02:00
|
|
|
get_topics_for_keyword()
|
|
|
|
|
thd Thread handler
|
|
|
|
|
topics Table of topics
|
|
|
|
|
relations Table of m:m relation "topic/keyword"
|
|
|
|
|
find_fields Filled array of info for fields
|
|
|
|
|
key_id Primary index to use to find for keyword
|
2002-10-28 14:44:19 +01:00
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
RETURN VALUES
|
2003-05-29 23:47:31 +02:00
|
|
|
# number of topics found
|
2002-10-28 14:44:19 +01:00
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
names array of name of found topics (out)
|
2002-10-28 14:44:19 +01:00
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
name name of found topic (out)
|
|
|
|
|
description description of found topic (out)
|
|
|
|
|
example example for found topic (out)
|
2002-10-28 14:44:19 +01:00
|
|
|
|
2004-06-23 12:29:05 +02:00
|
|
|
NOTE
|
2003-05-29 23:47:31 +02:00
|
|
|
Field 'names' is set only if more than one topic was found.
|
2004-06-23 12:29:05 +02:00
|
|
|
Fields 'name', 'description', 'example' are set only if
|
2003-05-29 23:47:31 +02:00
|
|
|
exactly one topic was found.
|
2003-02-12 20:55:37 +01:00
|
|
|
*/
|
2002-10-28 14:44:19 +01:00
|
|
|
|
2004-06-23 12:29:05 +02:00
|
|
|
int get_topics_for_keyword(THD *thd, TABLE *topics, TABLE *relations,
|
2003-05-29 23:47:31 +02:00
|
|
|
struct st_find_field *find_fields, int16 key_id,
|
|
|
|
|
List<String> *names,
|
|
|
|
|
String *name, String *description, String *example)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar buff[8]; // Max int length
|
2003-05-29 23:47:31 +02:00
|
|
|
int count= 0;
|
2003-02-12 20:55:37 +01:00
|
|
|
int iindex_topic, iindex_relations;
|
2003-05-29 23:47:31 +02:00
|
|
|
Field *rtopic_id, *rkey_id;
|
|
|
|
|
DBUG_ENTER("get_topics_for_keyword");
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2004-01-14 13:01:55 +01:00
|
|
|
if ((iindex_topic= find_type((char*) primary_key_name,
|
2005-01-06 12:00:13 +01:00
|
|
|
&topics->s->keynames, 1+2)-1)<0 ||
|
2004-01-14 13:01:55 +01:00
|
|
|
(iindex_relations= find_type((char*) primary_key_name,
|
2005-01-06 12:00:13 +01:00
|
|
|
&relations->s->keynames, 1+2)-1)<0)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2004-11-12 13:34:00 +01:00
|
|
|
my_message(ER_CORRUPT_HELP_DB, ER(ER_CORRUPT_HELP_DB), MYF(0));
|
2003-02-12 20:55:37 +01:00
|
|
|
DBUG_RETURN(-1);
|
|
|
|
|
}
|
|
|
|
|
rtopic_id= find_fields[help_relation_help_topic_id].field;
|
2003-05-29 23:47:31 +02:00
|
|
|
rkey_id= find_fields[help_relation_help_keyword_id].field;
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2005-07-18 13:31:02 +02:00
|
|
|
topics->file->ha_index_init(iindex_topic,1);
|
|
|
|
|
relations->file->ha_index_init(iindex_relations,1);
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2005-09-14 00:41:44 +02:00
|
|
|
rkey_id->store((longlong) key_id, TRUE);
|
2004-12-06 01:00:37 +01:00
|
|
|
rkey_id->get_key_image(buff, rkey_id->pack_length(), Field::itRAW);
|
2007-08-13 15:11:25 +02:00
|
|
|
int key_res= relations->file->index_read_map(relations->record[0],
|
|
|
|
|
buff, (key_part_map) 1,
|
|
|
|
|
HA_READ_KEY_EXACT);
|
2004-06-23 12:29:05 +02:00
|
|
|
|
|
|
|
|
for ( ;
|
2003-05-29 23:47:31 +02:00
|
|
|
!key_res && key_id == (int16) rkey_id->val_int() ;
|
2003-02-12 20:55:37 +01:00
|
|
|
key_res= relations->file->index_next(relations->record[0]))
|
|
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar topic_id_buff[8];
|
2003-02-12 20:55:37 +01:00
|
|
|
longlong topic_id= rtopic_id->val_int();
|
|
|
|
|
Field *field= find_fields[help_topic_help_topic_id].field;
|
2005-09-14 00:41:44 +02:00
|
|
|
field->store((longlong) topic_id, TRUE);
|
2004-12-06 01:00:37 +01:00
|
|
|
field->get_key_image(topic_id_buff, field->pack_length(), Field::itRAW);
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2007-08-13 15:11:25 +02:00
|
|
|
if (!topics->file->index_read_map(topics->record[0], topic_id_buff,
|
|
|
|
|
(key_part_map)1, HA_READ_KEY_EXACT))
|
2003-05-29 23:47:31 +02:00
|
|
|
{
|
|
|
|
|
memorize_variant_topic(thd,topics,count,find_fields,
|
|
|
|
|
names,name,description,example);
|
|
|
|
|
count++;
|
|
|
|
|
}
|
2002-10-28 14:44:19 +01:00
|
|
|
}
|
2004-06-23 12:29:05 +02:00
|
|
|
topics->file->ha_index_end();
|
|
|
|
|
relations->file->ha_index_end();
|
2003-05-29 23:47:31 +02:00
|
|
|
DBUG_RETURN(count);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Look for categories by mask
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
search_categories()
|
|
|
|
|
thd THD for init_read_record
|
|
|
|
|
categories Table of categories
|
|
|
|
|
find_fields Filled array of info for fields
|
|
|
|
|
select Function to test for if matching help topic.
|
|
|
|
|
Normally 'help_vategory.name like 'bit%'
|
|
|
|
|
names List of found categories names (out)
|
|
|
|
|
res_id Primary index of found category (only if
|
|
|
|
|
found exactly one category)
|
|
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
|
# Number of categories found
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
int search_categories(THD *thd, TABLE *categories,
|
|
|
|
|
struct st_find_field *find_fields,
|
|
|
|
|
SQL_SELECT *select, List<String> *names, int16 *res_id)
|
|
|
|
|
{
|
|
|
|
|
Field *pfname= find_fields[help_category_name].field;
|
|
|
|
|
Field *pcat_id= find_fields[help_category_help_category_id].field;
|
|
|
|
|
int count= 0;
|
2004-06-23 12:29:05 +02:00
|
|
|
READ_RECORD read_record_info;
|
2003-05-29 23:47:31 +02:00
|
|
|
|
|
|
|
|
DBUG_ENTER("search_categories");
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2008-07-15 16:13:21 +02:00
|
|
|
init_read_record(&read_record_info, thd, categories, select,1,0,FALSE);
|
2003-05-29 23:47:31 +02:00
|
|
|
while (!read_record_info.read_record(&read_record_info))
|
|
|
|
|
{
|
|
|
|
|
if (select && !select->cond->val_int())
|
|
|
|
|
continue;
|
2004-11-08 00:13:54 +01:00
|
|
|
String *lname= new (thd->mem_root) String;
|
|
|
|
|
get_field(thd->mem_root,pfname,lname);
|
2003-05-29 23:47:31 +02:00
|
|
|
if (++count == 1 && res_id)
|
|
|
|
|
*res_id= (int16) pcat_id->val_int();
|
|
|
|
|
names->push_back(lname);
|
|
|
|
|
}
|
|
|
|
|
end_read_record(&read_record_info);
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
DBUG_RETURN(count);
|
2002-10-28 14:44:19 +01:00
|
|
|
}
|
|
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
/*
|
|
|
|
|
Look for all topics or subcategories of category
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
get_all_items_for_category()
|
|
|
|
|
thd Thread handler
|
|
|
|
|
items Table of items
|
|
|
|
|
pfname Field "name" in items
|
|
|
|
|
select "where" part of query..
|
|
|
|
|
res list of finded names
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void get_all_items_for_category(THD *thd, TABLE *items, Field *pfname,
|
|
|
|
|
SQL_SELECT *select, List<String> *res)
|
|
|
|
|
{
|
|
|
|
|
DBUG_ENTER("get_all_items_for_category");
|
|
|
|
|
|
|
|
|
|
READ_RECORD read_record_info;
|
2008-07-15 16:13:21 +02:00
|
|
|
init_read_record(&read_record_info, thd, items, select,1,0,FALSE);
|
2003-05-29 23:47:31 +02:00
|
|
|
while (!read_record_info.read_record(&read_record_info))
|
|
|
|
|
{
|
2004-06-23 12:29:05 +02:00
|
|
|
if (!select->cond->val_int())
|
2003-05-29 23:47:31 +02:00
|
|
|
continue;
|
2004-11-08 00:13:54 +01:00
|
|
|
String *name= new (thd->mem_root) String();
|
|
|
|
|
get_field(thd->mem_root,pfname,name);
|
2003-05-29 23:47:31 +02:00
|
|
|
res->push_back(name);
|
|
|
|
|
}
|
|
|
|
|
end_read_record(&read_record_info);
|
|
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
|
}
|
2003-02-12 20:55:37 +01:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Send to client answer for help request
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
SYNOPSIS
|
|
|
|
|
send_answer_1()
|
|
|
|
|
protocol - protocol for sending
|
|
|
|
|
s1 - value of column "Name"
|
2003-05-29 23:47:31 +02:00
|
|
|
s2 - value of column "Description"
|
|
|
|
|
s3 - value of column "Example"
|
2003-02-12 20:55:37 +01:00
|
|
|
|
|
|
|
|
IMPLEMENTATION
|
|
|
|
|
Format used:
|
2003-05-29 23:47:31 +02:00
|
|
|
+----------+------------+------------+
|
|
|
|
|
|name |description |example |
|
|
|
|
|
+----------+------------+------------+
|
|
|
|
|
|String(64)|String(1000)|String(1000)|
|
|
|
|
|
+----------+------------+------------+
|
2003-02-12 20:55:37 +01:00
|
|
|
with exactly one row!
|
|
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
|
1 Writing of head failed
|
|
|
|
|
-1 Writing of row failed
|
|
|
|
|
0 Successeful send
|
|
|
|
|
*/
|
|
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
int send_answer_1(Protocol *protocol, String *s1, String *s2, String *s3)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
|
|
|
|
DBUG_ENTER("send_answer_1");
|
|
|
|
|
List<Item> field_list;
|
2003-05-29 23:47:31 +02:00
|
|
|
field_list.push_back(new Item_empty_string("name",64));
|
|
|
|
|
field_list.push_back(new Item_empty_string("description",1000));
|
|
|
|
|
field_list.push_back(new Item_empty_string("example",1000));
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2004-08-03 12:32:21 +02:00
|
|
|
if (protocol->send_fields(&field_list,
|
|
|
|
|
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
|
2002-10-28 14:44:19 +01:00
|
|
|
DBUG_RETURN(1);
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2002-12-11 08:17:51 +01:00
|
|
|
protocol->prepare_for_resend();
|
2003-05-29 23:47:31 +02:00
|
|
|
protocol->store(s1);
|
|
|
|
|
protocol->store(s2);
|
|
|
|
|
protocol->store(s3);
|
2002-12-11 08:17:51 +01:00
|
|
|
if (protocol->write())
|
2002-10-28 14:44:19 +01:00
|
|
|
DBUG_RETURN(-1);
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
}
|
|
|
|
|
|
2002-12-11 08:17:51 +01:00
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
/*
|
|
|
|
|
Send to client help header
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
send_header_2()
|
2003-05-29 23:47:31 +02:00
|
|
|
protocol - protocol for sending
|
|
|
|
|
is_it_category - need column 'source_category_name'
|
2003-02-12 20:55:37 +01:00
|
|
|
|
|
|
|
|
IMPLEMENTATION
|
2003-05-29 23:47:31 +02:00
|
|
|
+- -+
|
|
|
|
|
|+-------------------- | +----------+--------------+
|
|
|
|
|
||source_category_name | |name |is_it_category|
|
|
|
|
|
|+-------------------- | +----------+--------------+
|
|
|
|
|
||String(64) | |String(64)|String(1) |
|
|
|
|
|
|+-------------------- | +----------+--------------+
|
|
|
|
|
+- -+
|
2003-02-12 20:55:37 +01:00
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
|
result of protocol->send_fields
|
|
|
|
|
*/
|
|
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
int send_header_2(Protocol *protocol, bool for_category)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2003-05-29 23:47:31 +02:00
|
|
|
DBUG_ENTER("send_header_2");
|
2002-10-28 14:44:19 +01:00
|
|
|
List<Item> field_list;
|
2003-05-29 23:47:31 +02:00
|
|
|
if (for_category)
|
|
|
|
|
field_list.push_back(new Item_empty_string("source_category_name",64));
|
|
|
|
|
field_list.push_back(new Item_empty_string("name",64));
|
|
|
|
|
field_list.push_back(new Item_empty_string("is_it_category",1));
|
2004-08-03 12:32:21 +02:00
|
|
|
DBUG_RETURN(protocol->send_fields(&field_list, Protocol::SEND_NUM_ROWS |
|
|
|
|
|
Protocol::SEND_EOF));
|
2002-10-28 14:44:19 +01:00
|
|
|
}
|
|
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
/*
|
|
|
|
|
strcmp for using in qsort
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
strptrcmp()
|
|
|
|
|
ptr1 (const void*)&str1
|
|
|
|
|
ptr2 (const void*)&str2
|
|
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
|
same as strcmp
|
|
|
|
|
*/
|
|
|
|
|
|
2003-11-28 11:18:13 +01:00
|
|
|
extern "C" int string_ptr_cmp(const void* ptr1, const void* ptr2)
|
2003-05-29 23:47:31 +02:00
|
|
|
{
|
|
|
|
|
String *str1= *(String**)ptr1;
|
|
|
|
|
String *str2= *(String**)ptr2;
|
|
|
|
|
return strcmp(str1->c_ptr(),str2->c_ptr());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Send to client rows in format:
|
|
|
|
|
column1 : <name>
|
|
|
|
|
column2 : <is_it_category>
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
send_variant_2_list()
|
|
|
|
|
protocol Protocol for sending
|
2004-06-23 12:29:05 +02:00
|
|
|
names List of names
|
2003-05-29 23:47:31 +02:00
|
|
|
cat Value of the column <is_it_category>
|
|
|
|
|
source_name name of category for all items..
|
|
|
|
|
|
|
|
|
|
RETURN VALUES
|
|
|
|
|
-1 Writing fail
|
|
|
|
|
0 Data was successefully send
|
|
|
|
|
*/
|
|
|
|
|
|
2004-06-23 12:29:05 +02:00
|
|
|
int send_variant_2_list(MEM_ROOT *mem_root, Protocol *protocol,
|
|
|
|
|
List<String> *names,
|
2003-05-29 23:47:31 +02:00
|
|
|
const char *cat, String *source_name)
|
|
|
|
|
{
|
|
|
|
|
DBUG_ENTER("send_variant_2_list");
|
|
|
|
|
|
|
|
|
|
String **pointers= (String**)alloc_root(mem_root,
|
|
|
|
|
sizeof(String*)*names->elements);
|
2003-06-05 22:19:54 +02:00
|
|
|
String **pos;
|
|
|
|
|
String **end= pointers + names->elements;
|
2003-05-29 23:47:31 +02:00
|
|
|
|
|
|
|
|
List_iterator<String> it(*names);
|
2009-06-10 16:04:07 +02:00
|
|
|
for (pos= pointers; pos!=end; (*pos++= it++)) ;
|
2003-05-29 23:47:31 +02:00
|
|
|
|
2007-10-17 18:08:58 +02:00
|
|
|
my_qsort(pointers,names->elements,sizeof(String*),string_ptr_cmp);
|
2003-05-29 23:47:31 +02:00
|
|
|
|
2003-06-04 05:59:32 +02:00
|
|
|
for (pos= pointers; pos!=end; pos++)
|
2003-05-29 23:47:31 +02:00
|
|
|
{
|
|
|
|
|
protocol->prepare_for_resend();
|
|
|
|
|
if (source_name)
|
|
|
|
|
protocol->store(source_name);
|
|
|
|
|
protocol->store(*pos);
|
|
|
|
|
protocol->store(cat,1,&my_charset_latin1);
|
|
|
|
|
if (protocol->write())
|
|
|
|
|
DBUG_RETURN(-1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Prepare simple SQL_SELECT table.* WHERE <Item>
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
prepare_simple_select()
|
|
|
|
|
thd Thread handler
|
|
|
|
|
cond WHERE part of select
|
|
|
|
|
table goal table
|
|
|
|
|
|
|
|
|
|
error code of error (out)
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
RETURN VALUES
|
2004-06-23 12:29:05 +02:00
|
|
|
# created SQL_SELECT
|
2003-05-29 23:47:31 +02:00
|
|
|
*/
|
|
|
|
|
|
2005-07-01 06:05:42 +02:00
|
|
|
SQL_SELECT *prepare_simple_select(THD *thd, Item *cond,
|
2003-05-29 23:47:31 +02:00
|
|
|
TABLE *table, int *error)
|
|
|
|
|
{
|
2004-12-14 01:36:19 +01:00
|
|
|
if (!cond->fixed)
|
2005-07-01 06:05:42 +02:00
|
|
|
cond->fix_fields(thd, &cond); // can never fail
|
2005-01-26 13:02:19 +01:00
|
|
|
|
|
|
|
|
/* Assume that no indexes cover all required fields */
|
2007-03-05 18:08:41 +01:00
|
|
|
table->covering_keys.clear_all();
|
2005-01-26 13:02:19 +01:00
|
|
|
|
2005-03-16 15:11:01 +01:00
|
|
|
SQL_SELECT *res= make_select(table, 0, 0, cond, 0, error);
|
2005-01-26 12:11:55 +01:00
|
|
|
if (*error || (res && res->check_quick(thd, 0, HA_POS_ERROR)) ||
|
2006-01-03 17:54:54 +01:00
|
|
|
(res && res->quick && res->quick->reset()))
|
2004-06-23 12:29:05 +02:00
|
|
|
{
|
|
|
|
|
delete res;
|
|
|
|
|
res=0;
|
|
|
|
|
}
|
|
|
|
|
return res;
|
2003-05-29 23:47:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Prepare simple SQL_SELECT table.* WHERE table.name LIKE mask
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
prepare_select_for_name()
|
|
|
|
|
thd Thread handler
|
|
|
|
|
mask mask for compare with name
|
|
|
|
|
mlen length of mask
|
|
|
|
|
tables list of tables, used in WHERE
|
|
|
|
|
table goal table
|
|
|
|
|
pfname field "name" in table
|
|
|
|
|
|
|
|
|
|
error code of error (out)
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2003-05-29 23:47:31 +02:00
|
|
|
RETURN VALUES
|
2004-06-23 12:29:05 +02:00
|
|
|
# created SQL_SELECT
|
2003-05-29 23:47:31 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
SQL_SELECT *prepare_select_for_name(THD *thd, const char *mask, uint mlen,
|
|
|
|
|
TABLE_LIST *tables, TABLE *table,
|
|
|
|
|
Field *pfname, int *error)
|
|
|
|
|
{
|
2004-03-20 12:36:26 +01:00
|
|
|
Item *cond= new Item_func_like(new Item_field(pfname),
|
2003-05-29 23:47:31 +02:00
|
|
|
new Item_string(mask,mlen,pfname->charset()),
|
2005-10-21 03:01:52 +02:00
|
|
|
new Item_string("\\",1,&my_charset_latin1),
|
|
|
|
|
FALSE);
|
2003-10-15 21:40:36 +02:00
|
|
|
if (thd->is_fatal_error)
|
|
|
|
|
return 0; // OOM
|
2005-07-01 06:05:42 +02:00
|
|
|
return prepare_simple_select(thd, cond, table, error);
|
2003-05-29 23:47:31 +02:00
|
|
|
}
|
2002-12-11 08:17:51 +01:00
|
|
|
|
2003-06-24 11:10:35 +02:00
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
/*
|
|
|
|
|
Server-side function 'help'
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
|
mysqld_help()
|
|
|
|
|
thd Thread handler
|
|
|
|
|
|
|
|
|
|
RETURN VALUES
|
2004-10-20 03:04:37 +02:00
|
|
|
FALSE Success
|
|
|
|
|
TRUE Error and send_error already commited
|
2003-02-12 20:55:37 +01:00
|
|
|
*/
|
|
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
bool mysqld_help(THD *thd, const char *mask)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2002-12-11 08:17:51 +01:00
|
|
|
Protocol *protocol= thd->protocol;
|
2004-06-23 12:29:05 +02:00
|
|
|
SQL_SELECT *select;
|
2003-02-12 20:55:37 +01:00
|
|
|
st_find_field used_fields[array_elements(init_used_fields)];
|
2004-09-14 18:28:29 +02:00
|
|
|
TABLE_LIST *leaves= 0;
|
2003-05-29 23:47:31 +02:00
|
|
|
TABLE_LIST tables[4];
|
2005-08-18 02:12:42 +02:00
|
|
|
List<String> topics_list, categories_list, subcategories_list;
|
|
|
|
|
String name, description, example;
|
|
|
|
|
int count_topics, count_categories, error;
|
|
|
|
|
uint mlen= strlen(mask);
|
|
|
|
|
size_t i;
|
|
|
|
|
MEM_ROOT *mem_root= thd->mem_root;
|
|
|
|
|
DBUG_ENTER("mysqld_help");
|
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
bzero((uchar*)tables,sizeof(tables));
|
2005-01-06 12:00:13 +01:00
|
|
|
tables[0].alias= tables[0].table_name= (char*) "help_topic";
|
2003-02-12 20:55:37 +01:00
|
|
|
tables[0].lock_type= TL_READ;
|
2005-08-18 02:12:42 +02:00
|
|
|
tables[0].next_global= tables[0].next_local=
|
|
|
|
|
tables[0].next_name_resolution_table= &tables[1];
|
2005-01-06 12:00:13 +01:00
|
|
|
tables[1].alias= tables[1].table_name= (char*) "help_category";
|
2003-02-12 20:55:37 +01:00
|
|
|
tables[1].lock_type= TL_READ;
|
2005-08-18 02:12:42 +02:00
|
|
|
tables[1].next_global= tables[1].next_local=
|
|
|
|
|
tables[1].next_name_resolution_table= &tables[2];
|
2005-01-06 12:00:13 +01:00
|
|
|
tables[2].alias= tables[2].table_name= (char*) "help_relation";
|
2003-02-12 20:55:37 +01:00
|
|
|
tables[2].lock_type= TL_READ;
|
2005-08-18 02:12:42 +02:00
|
|
|
tables[2].next_global= tables[2].next_local=
|
|
|
|
|
tables[2].next_name_resolution_table= &tables[3];
|
2005-01-06 12:00:13 +01:00
|
|
|
tables[3].alias= tables[3].table_name= (char*) "help_keyword";
|
2003-05-29 23:47:31 +02:00
|
|
|
tables[3].lock_type= TL_READ;
|
2004-04-04 02:05:44 +02:00
|
|
|
tables[0].db= tables[1].db= tables[2].db= tables[3].db= (char*) "mysql";
|
2004-06-23 12:29:05 +02:00
|
|
|
|
BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be locked
The problem was that some facilities (like CONVERT_TZ() function or
server HELP statement) may require implicit access to some tables in
'mysql' database. This access was done by ordinary means of adding
such tables to the list of tables the query is going to open.
However, if we issued LOCK TABLES before that, we would get "table
was not locked" error trying to open such implicit tables.
The solution is to treat certain tables as MySQL system tables, like
we already do for mysql.proc. Such tables may be opened for reading
at any moment regardless of any locks in effect. The cost of this is
that system table may be locked for writing only together with other
system tables, it is disallowed to lock system tables for writing and
have any other lock on any other table.
After this patch the following tables are treated as MySQL system
tables:
mysql.help_category
mysql.help_keyword
mysql.help_relation
mysql.help_topic
mysql.proc (it already was)
mysql.time_zone
mysql.time_zone_leap_second
mysql.time_zone_name
mysql.time_zone_transition
mysql.time_zone_transition_type
These tables are now opened with open_system_tables_for_read() and
closed with close_system_tables(), or one table may be opened with
open_system_table_for_update() and closed with close_thread_tables()
(the latter is used for mysql.proc table, which is updated as part of
normal MySQL server operation). These functions may be used when
some tables were opened and locked already.
NOTE: online update of time zone tables is not possible during
replication, because there's no time zone cache flush neither on LOCK
TABLES, nor on FLUSH TABLES, so the master may serve stale time zone
data from cache, while on slave updated data will be loaded from the
time zone tables.
2007-03-09 11:12:31 +01:00
|
|
|
Open_tables_state open_tables_state_backup;
|
|
|
|
|
if (open_system_tables_for_read(thd, tables, &open_tables_state_backup))
|
|
|
|
|
goto error2;
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
|
2004-07-16 00:15:55 +02:00
|
|
|
/*
|
|
|
|
|
Init tables and fields to be usable from items
|
|
|
|
|
tables do not contain VIEWs => we can pass 0 as conds
|
|
|
|
|
*/
|
2007-02-26 12:54:43 +01:00
|
|
|
thd->lex->select_lex.context.table_list=
|
2007-02-19 13:39:37 +01:00
|
|
|
thd->lex->select_lex.context.first_name_resolution_table= &tables[0];
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
if (setup_tables(thd, &thd->lex->select_lex.context,
|
|
|
|
|
&thd->lex->select_lex.top_join_list,
|
|
|
|
|
tables, &leaves, FALSE))
|
|
|
|
|
goto error;
|
2004-06-23 12:29:05 +02:00
|
|
|
memcpy((char*) used_fields, (char*) init_used_fields, sizeof(used_fields));
|
2003-02-12 20:55:37 +01:00
|
|
|
if (init_fields(thd, tables, used_fields, array_elements(used_fields)))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
2003-06-04 05:59:32 +02:00
|
|
|
for (i=0; i<sizeof(tables)/sizeof(TABLE_LIST); i++)
|
2003-05-29 23:47:31 +02:00
|
|
|
tables[i].table->file->init_table_handle_for_HANDLER();
|
2004-06-23 12:29:05 +02:00
|
|
|
|
|
|
|
|
if (!(select=
|
2003-05-29 23:47:31 +02:00
|
|
|
prepare_select_for_name(thd,mask,mlen,tables,tables[0].table,
|
2004-06-23 12:29:05 +02:00
|
|
|
used_fields[help_topic_name].field,&error)))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
2003-02-12 20:55:37 +01:00
|
|
|
|
2004-06-23 12:29:05 +02:00
|
|
|
count_topics= search_topics(thd,tables[0].table,used_fields,
|
|
|
|
|
select,&topics_list,
|
2003-05-29 23:47:31 +02:00
|
|
|
&name, &description, &example);
|
2004-06-23 12:29:05 +02:00
|
|
|
delete select;
|
2003-05-29 23:47:31 +02:00
|
|
|
|
|
|
|
|
if (count_topics == 0)
|
2004-06-23 12:29:05 +02:00
|
|
|
{
|
|
|
|
|
int key_id;
|
|
|
|
|
if (!(select=
|
|
|
|
|
prepare_select_for_name(thd,mask,mlen,tables,tables[3].table,
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
used_fields[help_keyword_name].field,
|
|
|
|
|
&error)))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
|
|
|
|
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
count_topics= search_keyword(thd,tables[3].table, used_fields, select,
|
|
|
|
|
&key_id);
|
2004-06-23 12:29:05 +02:00
|
|
|
delete select;
|
|
|
|
|
count_topics= (count_topics != 1) ? 0 :
|
|
|
|
|
get_topics_for_keyword(thd,tables[0].table,tables[2].table,
|
|
|
|
|
used_fields,key_id,&topics_list,&name,
|
|
|
|
|
&description,&example);
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
if (count_topics == 0)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
|
|
|
|
int16 category_id;
|
2003-05-29 23:47:31 +02:00
|
|
|
Field *cat_cat_id= used_fields[help_category_parent_category_id].field;
|
2004-06-23 12:29:05 +02:00
|
|
|
if (!(select=
|
|
|
|
|
prepare_select_for_name(thd,mask,mlen,tables,tables[1].table,
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
used_fields[help_category_name].field,
|
|
|
|
|
&error)))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
2004-06-23 12:29:05 +02:00
|
|
|
|
2003-02-12 20:55:37 +01:00
|
|
|
count_categories= search_categories(thd, tables[1].table, used_fields,
|
2004-06-23 12:29:05 +02:00
|
|
|
select,
|
2003-05-29 23:47:31 +02:00
|
|
|
&categories_list,&category_id);
|
2004-06-23 12:29:05 +02:00
|
|
|
delete select;
|
2003-05-29 23:47:31 +02:00
|
|
|
if (!count_categories)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2004-03-30 01:32:41 +02:00
|
|
|
if (send_header_2(protocol,FALSE))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
2003-05-29 23:47:31 +02:00
|
|
|
}
|
|
|
|
|
else if (count_categories > 1)
|
|
|
|
|
{
|
2004-03-30 01:32:41 +02:00
|
|
|
if (send_header_2(protocol,FALSE) ||
|
2003-05-29 23:47:31 +02:00
|
|
|
send_variant_2_list(mem_root,protocol,&categories_list,"Y",0))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
2002-10-28 14:44:19 +01:00
|
|
|
}
|
2003-05-29 23:47:31 +02:00
|
|
|
else
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2003-05-29 23:47:31 +02:00
|
|
|
Field *topic_cat_id= used_fields[help_topic_help_category_id].field;
|
2004-03-18 14:14:36 +01:00
|
|
|
Item *cond_topic_by_cat=
|
2004-03-20 12:36:26 +01:00
|
|
|
new Item_func_equal(new Item_field(topic_cat_id),
|
2004-03-18 14:14:36 +01:00
|
|
|
new Item_int((int32)category_id));
|
|
|
|
|
Item *cond_cat_by_cat=
|
2004-03-20 12:36:26 +01:00
|
|
|
new Item_func_equal(new Item_field(cat_cat_id),
|
2004-03-18 14:14:36 +01:00
|
|
|
new Item_int((int32)category_id));
|
2005-07-01 06:05:42 +02:00
|
|
|
if (!(select= prepare_simple_select(thd, cond_topic_by_cat,
|
|
|
|
|
tables[0].table, &error)))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
2003-05-29 23:47:31 +02:00
|
|
|
get_all_items_for_category(thd,tables[0].table,
|
|
|
|
|
used_fields[help_topic_name].field,
|
2004-06-23 12:29:05 +02:00
|
|
|
select,&topics_list);
|
|
|
|
|
delete select;
|
2005-07-01 06:05:42 +02:00
|
|
|
if (!(select= prepare_simple_select(thd, cond_cat_by_cat,
|
|
|
|
|
tables[1].table, &error)))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
2003-05-29 23:47:31 +02:00
|
|
|
get_all_items_for_category(thd,tables[1].table,
|
|
|
|
|
used_fields[help_category_name].field,
|
2004-06-23 12:29:05 +02:00
|
|
|
select,&subcategories_list);
|
|
|
|
|
delete select;
|
2003-05-29 23:47:31 +02:00
|
|
|
String *cat= categories_list.head();
|
2004-10-14 17:03:46 +02:00
|
|
|
if (send_header_2(protocol, TRUE) ||
|
2003-05-29 23:47:31 +02:00
|
|
|
send_variant_2_list(mem_root,protocol,&topics_list, "N",cat) ||
|
|
|
|
|
send_variant_2_list(mem_root,protocol,&subcategories_list,"Y",cat))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
2002-10-28 14:44:19 +01:00
|
|
|
}
|
|
|
|
|
}
|
2003-02-12 20:55:37 +01:00
|
|
|
else if (count_topics == 1)
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2003-05-29 23:47:31 +02:00
|
|
|
if (send_answer_1(protocol,&name,&description,&example))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
2002-10-28 14:44:19 +01:00
|
|
|
}
|
2003-02-12 20:55:37 +01:00
|
|
|
else
|
2002-10-28 14:44:19 +01:00
|
|
|
{
|
2003-02-12 20:55:37 +01:00
|
|
|
/* First send header and functions */
|
2004-03-30 01:32:41 +02:00
|
|
|
if (send_header_2(protocol, FALSE) ||
|
2003-05-29 23:47:31 +02:00
|
|
|
send_variant_2_list(mem_root,protocol, &topics_list, "N", 0))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
2004-06-23 12:29:05 +02:00
|
|
|
if (!(select=
|
|
|
|
|
prepare_select_for_name(thd,mask,mlen,tables,tables[1].table,
|
|
|
|
|
used_fields[help_category_name].field,&error)))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
2004-06-23 12:29:05 +02:00
|
|
|
search_categories(thd, tables[1].table, used_fields,
|
|
|
|
|
select,&categories_list, 0);
|
|
|
|
|
delete select;
|
2003-02-12 20:55:37 +01:00
|
|
|
/* Then send categories */
|
2003-05-29 23:47:31 +02:00
|
|
|
if (send_variant_2_list(mem_root,protocol, &categories_list, "Y", 0))
|
2004-10-20 03:04:37 +02:00
|
|
|
goto error;
|
2002-10-28 14:44:19 +01:00
|
|
|
}
|
2008-02-19 13:58:08 +01:00
|
|
|
my_eof(thd);
|
2003-06-24 11:10:35 +02:00
|
|
|
|
BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be locked
The problem was that some facilities (like CONVERT_TZ() function or
server HELP statement) may require implicit access to some tables in
'mysql' database. This access was done by ordinary means of adding
such tables to the list of tables the query is going to open.
However, if we issued LOCK TABLES before that, we would get "table
was not locked" error trying to open such implicit tables.
The solution is to treat certain tables as MySQL system tables, like
we already do for mysql.proc. Such tables may be opened for reading
at any moment regardless of any locks in effect. The cost of this is
that system table may be locked for writing only together with other
system tables, it is disallowed to lock system tables for writing and
have any other lock on any other table.
After this patch the following tables are treated as MySQL system
tables:
mysql.help_category
mysql.help_keyword
mysql.help_relation
mysql.help_topic
mysql.proc (it already was)
mysql.time_zone
mysql.time_zone_leap_second
mysql.time_zone_name
mysql.time_zone_transition
mysql.time_zone_transition_type
These tables are now opened with open_system_tables_for_read() and
closed with close_system_tables(), or one table may be opened with
open_system_table_for_update() and closed with close_thread_tables()
(the latter is used for mysql.proc table, which is updated as part of
normal MySQL server operation). These functions may be used when
some tables were opened and locked already.
NOTE: online update of time zone tables is not possible during
replication, because there's no time zone cache flush neither on LOCK
TABLES, nor on FLUSH TABLES, so the master may serve stale time zone
data from cache, while on slave updated data will be loaded from the
time zone tables.
2007-03-09 11:12:31 +01:00
|
|
|
close_system_tables(thd, &open_tables_state_backup);
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(FALSE);
|
BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be locked
The problem was that some facilities (like CONVERT_TZ() function or
server HELP statement) may require implicit access to some tables in
'mysql' database. This access was done by ordinary means of adding
such tables to the list of tables the query is going to open.
However, if we issued LOCK TABLES before that, we would get "table
was not locked" error trying to open such implicit tables.
The solution is to treat certain tables as MySQL system tables, like
we already do for mysql.proc. Such tables may be opened for reading
at any moment regardless of any locks in effect. The cost of this is
that system table may be locked for writing only together with other
system tables, it is disallowed to lock system tables for writing and
have any other lock on any other table.
After this patch the following tables are treated as MySQL system
tables:
mysql.help_category
mysql.help_keyword
mysql.help_relation
mysql.help_topic
mysql.proc (it already was)
mysql.time_zone
mysql.time_zone_leap_second
mysql.time_zone_name
mysql.time_zone_transition
mysql.time_zone_transition_type
These tables are now opened with open_system_tables_for_read() and
closed with close_system_tables(), or one table may be opened with
open_system_table_for_update() and closed with close_thread_tables()
(the latter is used for mysql.proc table, which is updated as part of
normal MySQL server operation). These functions may be used when
some tables were opened and locked already.
NOTE: online update of time zone tables is not possible during
replication, because there's no time zone cache flush neither on LOCK
TABLES, nor on FLUSH TABLES, so the master may serve stale time zone
data from cache, while on slave updated data will be loaded from the
time zone tables.
2007-03-09 11:12:31 +01:00
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
error:
|
BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be locked
The problem was that some facilities (like CONVERT_TZ() function or
server HELP statement) may require implicit access to some tables in
'mysql' database. This access was done by ordinary means of adding
such tables to the list of tables the query is going to open.
However, if we issued LOCK TABLES before that, we would get "table
was not locked" error trying to open such implicit tables.
The solution is to treat certain tables as MySQL system tables, like
we already do for mysql.proc. Such tables may be opened for reading
at any moment regardless of any locks in effect. The cost of this is
that system table may be locked for writing only together with other
system tables, it is disallowed to lock system tables for writing and
have any other lock on any other table.
After this patch the following tables are treated as MySQL system
tables:
mysql.help_category
mysql.help_keyword
mysql.help_relation
mysql.help_topic
mysql.proc (it already was)
mysql.time_zone
mysql.time_zone_leap_second
mysql.time_zone_name
mysql.time_zone_transition
mysql.time_zone_transition_type
These tables are now opened with open_system_tables_for_read() and
closed with close_system_tables(), or one table may be opened with
open_system_table_for_update() and closed with close_thread_tables()
(the latter is used for mysql.proc table, which is updated as part of
normal MySQL server operation). These functions may be used when
some tables were opened and locked already.
NOTE: online update of time zone tables is not possible during
replication, because there's no time zone cache flush neither on LOCK
TABLES, nor on FLUSH TABLES, so the master may serve stale time zone
data from cache, while on slave updated data will be loaded from the
time zone tables.
2007-03-09 11:12:31 +01:00
|
|
|
close_system_tables(thd, &open_tables_state_backup);
|
|
|
|
|
|
|
|
|
|
error2:
|
2004-10-20 03:04:37 +02:00
|
|
|
DBUG_RETURN(TRUE);
|
2002-10-28 14:44:19 +01:00
|
|
|
}
|
2003-06-24 11:10:35 +02:00
|
|
|
|