mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 18:20:07 +01:00
5099033c26
Added argument to maria_end_bulk_insert() to know if the table will be deleted after the operation
Fixed wrong call to strmake
Don't call bulk insert in case of inserting only one row (speed optimization as starting/stopping bulk insert
Allow storing year 2155 in year field
When running with purify/valgrind avoid copying structures over themself
Added hook 'trnnam_end_trans_hook' that is called when transaction ends
Added trn->used_tables that is used to an entry for all tables used by transaction
Fixed that ndb doesn't crash on duplicate key error when start_bulk_insert/end_bulk_insert are not called
include/maria.h:
Added argument to maria_end_bulk_insert() to know if the table will be deleted after the operation
include/my_tree.h:
Added macro 'reset_free_element()' to be able to ignore calls to the external free function.
Is used to optimize end-bulk-insert in case of failures, in which case we don't want write the remaining keys in the tree
mysql-test/install_test_db.sh:
Upgrade to new mysql_install_db options
mysql-test/r/maria-mvcc.result:
New tests
mysql-test/r/maria.result:
New tests
mysql-test/suite/ndb/r/ndb_auto_increment.result:
Fixed error message now when bulk insert is not always called
mysql-test/suite/ndb/t/ndb_auto_increment.test:
Fixed error message now when bulk insert is not always called
mysql-test/t/maria-mvcc.test:
Added testing of versioning of count(*)
mysql-test/t/maria-page-checksum.test:
Added comment
mysql-test/t/maria.test:
More tests
mysys/hash.c:
Code style change
sql/field.cc:
Allow storing year 2155 in year field
sql/ha_ndbcluster.cc:
Added new argument to end_bulk_insert() to signal if the bulk insert should ignored
sql/ha_ndbcluster.h:
Added new argument to end_bulk_insert() to signal if the bulk insert should ignored
sql/ha_partition.cc:
Added new argument to end_bulk_insert() to signal if the bulk insert should ignored
sql/ha_partition.h:
Added new argument to end_bulk_insert() to signal if the bulk insert should ignored
sql/handler.cc:
Don't call get_dup_key() if there is no table object. This can happen if the handler generates a duplicate key error on commit
sql/handler.h:
Added new argument to end_bulk_insert() to signal if the bulk insert should ignored (ie, the table will be deleted)
sql/item.cc:
Style fix
Removed compiler warning
sql/log_event.cc:
Added new argument to ha_end_bulk_insert()
sql/log_event_old.cc:
Added new argument to ha_end_bulk_insert()
sql/mysqld.cc:
Removed compiler warning
sql/protocol.cc:
Added DBUG
sql/sql_class.cc:
Added DBUG
Fixed wrong call to strmake
sql/sql_insert.cc:
Don't call bulk insert in case of inserting only one row (speed optimization as starting/stopping bulk insert involves a lot of if's)
Added new argument to ha_end_bulk_insert()
sql/sql_load.cc:
Added new argument to ha_end_bulk_insert()
sql/sql_parse.cc:
Style fixes
Avoid goto in common senario
sql/sql_select.cc:
When running with purify/valgrind avoid copying structures over themself. This is not a real bug in itself, but it's a waste of cycles and causes valgrind warnings
sql/sql_select.h:
Avoid copying structures over themself. This is not a real bug in itself, but it's a waste of cycles and causes valgrind warnings
sql/sql_table.cc:
Call HA_EXTRA_PREPARE_FOR_DROP if table created by ALTER TABLE is going to be dropped
Added new argument to ha_end_bulk_insert()
storage/archive/ha_archive.cc:
Added new argument to end_bulk_insert()
storage/archive/ha_archive.h:
Added new argument to end_bulk_insert()
storage/federated/ha_federated.cc:
Added new argument to end_bulk_insert()
storage/federated/ha_federated.h:
Added new argument to end_bulk_insert()
storage/maria/Makefile.am:
Added ma_state.c and ma_state.h
storage/maria/ha_maria.cc:
Versioning of count(*) and checksum
- share->state.state is now assumed to be correct, not handler->state
- Call _ma_setup_live_state() in external lock to get count(*)/checksum versioning. In case of
not versioned and not concurrent insertable table, file->s->state.state contains the correct state information
Other things:
- file->s -> share
- Added DBUG_ASSERT() for unlikely case
- Optimized end_bulk_insert() to not write anything if table is going to be deleted (as in failed alter table)
- Indentation changes in external_lock becasue of removed 'goto' caused a big conflict even if very little was changed
storage/maria/ha_maria.h:
New argument to end_bulk_insert()
storage/maria/ma_blockrec.c:
Update for versioning of count(*) and checksum
Keep share->state.state.data_file_length up to date (not info->state->data_file_length)
Moved _ma_block_xxxx_status() and maria_versioning() functions to ma_state.c
storage/maria/ma_check.c:
Update and use share->state.state instead of info->state
info->s to share
Update info->state at end of repair
Call _ma_reset_state() to update share->state_history at end of repair
storage/maria/ma_checkpoint.c:
Call _ma_remove_not_visible_states() on checkpoint to clean up not visible state history from tables
storage/maria/ma_close.c:
Remember state history for running transaction even if table is closed
storage/maria/ma_commit.c:
Ensure we always call trnman_commit_trn() even if other calls fails. If we don't do that, the translog and state structures will not be freed
storage/maria/ma_delete.c:
Versioning of count(*) and checksum:
- Always update info->state->checksum and info->state->records
storage/maria/ma_delete_all.c:
Versioning of count(*) and checksum:
- Ensure that share->state.state is updated, as here is where we store the primary information
storage/maria/ma_dynrec.c:
Use lock_key_trees instead of concurrent_insert to check if trees should be locked.
This allows us to lock trees both for concurrent_insert and for index versioning.
storage/maria/ma_extra.c:
Versioning of count(*) and checksum:
- Use share->state.state instead of info->state
- share->concurrent_insert -> share->non_transactional_concurrent_insert
- Don't update share->state.state from info->state if transactional table
Optimization:
- Don't flush io_cache or bitmap if we are using FLUSH_IGNORE_CHANGED
storage/maria/ma_info.c:
Get most state information from current state
storage/maria/ma_init.c:
Add hash table and free function to store states for closed tables
Install hook for transaction commit/rollback to update history state
storage/maria/ma_key_recover.c:
Versioning of count(*) and checksum:
- Use share->state.state instead of info->state
storage/maria/ma_locking.c:
Versioning of count(*) and checksum:
- Call virtual functions (if exists) to restore/update status
- Move _ma_xxx_status() functions to ma_state.c
info->s -> share
storage/maria/ma_open.c:
Versioning of count(*) and checksum:
- For not transactional tables, set info->state to point to new allocated state structure.
- Initialize new info->state_start variable that points to state at start of transaction
- Copy old history states from hash table (maria_stored_states) first time the table is opened
- Split flag share->concurrent_insert to non_transactional_concurrent_insert & lock_key_tree
- For now, only enable versioning of tables without keys (to be fixed in soon!)
- Added new virtual function to restore status in maria_lock_database)
More DBUG
storage/maria/ma_page.c:
Versioning of count(*) and checksum:
- Use share->state.state instead of info->state
- Modify share->state.state.key_file_length under share->intern_lock
storage/maria/ma_range.c:
Versioning of count(*) and checksum:
- Lock trees based on share->lock_key_trees
info->s -> share
storage/maria/ma_recovery.c:
Versioning of count(*) and checksum:
- Use share->state.state instead of info->state
- Update state information on close and when reenabling logging
storage/maria/ma_rkey.c:
Versioning of count(*) and checksum:
- Lock trees based on share->lock_key_trees
storage/maria/ma_rnext.c:
Versioning of count(*) and checksum:
- Lock trees based on share->lock_key_trees
storage/maria/ma_rnext_same.c:
Versioning of count(*) and checksum:
- Lock trees based on share->lock_key_trees
- Only skip rows based on file length if non_transactional_concurrent_insert is set
storage/maria/ma_rprev.c:
Versioning of count(*) and checksum:
- Lock trees based on share->lock_key_trees
storage/maria/ma_rsame.c:
Versioning of count(*) and checksum:
- Lock trees based on share->lock_key_trees
storage/maria/ma_sort.c:
Use share->state.state instead of info->state
Fixed indentation
storage/maria/ma_static.c:
Added maria_stored_state
storage/maria/ma_update.c:
Versioning of count(*) and checksum:
- Always update info->state->checksum and info->state->records
- Remove optimization for index file update as it doesn't work for transactional tables
storage/maria/ma_write.c:
Versioning of count(*) and checksum:
- Always update info->state->checksum and info->state->records
storage/maria/maria_def.h:
Move MARIA_STATUS_INFO to ma_state.h
Changes to MARIA_SHARE:
- Added state_history to store count(*)/checksum states
- Added in_trans as counter if table is used by running transactions
- Split concurrent_insert into lock_key_trees and on_transactional_concurrent_insert.
- Added virtual function lock_restore_status
Changes to MARIA_HA:
- save_state -> state_save
- Added state_start to store state at start of transaction
storage/maria/maria_pack.c:
Versioning of count(*) and checksum:
- Use share->state.state instead of info->state
Indentation fixes
storage/maria/trnman.c:
Added hook 'trnnam_end_trans_hook' that is called when transaction ends
Added trn->used_tables that is used to an entry for all tables used by transaction
More DBUG
Changed return type of trnman_end_trn() to my_bool
Added trnman_get_min_trid() to get minimum trid in use.
Added trnman_exists_active_transactions() to check if there exist a running transaction started between two commit id
storage/maria/trnman.h:
Added 'used_tables'
Moved all pointers into same groups to get better memory alignment
storage/maria/trnman_public.h:
Added prototypes for new functions and variables
Chagned return type of trnman_end_trn() to my_bool
storage/myisam/ha_myisam.cc:
Added argument to end_bulk_insert() if operation should be aborted
storage/myisam/ha_myisam.h:
Added argument to end_bulk_insert() if operation should be aborted
storage/maria/ma_state.c:
Functions to handle state of count(*) and checksum
storage/maria/ma_state.h:
Structures and declarations to handle state of count(*) and checksum
197 lines
8.1 KiB
Makefile
197 lines
8.1 KiB
Makefile
# Copyright (C) 2000-2008 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
|
|
# the Free Software Foundation; version 2 of the License.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
MYSQLDATAdir = $(localstatedir)
|
|
MYSQLSHAREdir = $(pkgdatadir)
|
|
MYSQLBASEdir= $(prefix)
|
|
MYSQLLIBdir= $(pkglibdir)
|
|
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
|
|
-I$(top_srcdir)/regex \
|
|
-I$(top_srcdir)/sql \
|
|
-I$(srcdir)
|
|
WRAPLIBS=
|
|
|
|
LDADD =
|
|
|
|
DEFS = @DEFS@
|
|
|
|
# "." is needed first because tests in unittest need libmaria
|
|
SUBDIRS = . unittest
|
|
|
|
EXTRA_DIST = ma_test_all.sh ma_test_all.res ma_test_big.sh \
|
|
ma_ft_stem.c CMakeLists.txt plug.in ma_test_recovery
|
|
pkgdata_DATA = ma_test_all ma_test_all.res ma_test_recovery
|
|
pkglib_LIBRARIES = libmaria.a
|
|
bin_PROGRAMS = maria_chk maria_pack maria_ftdump maria_read_log \
|
|
maria_dump_log
|
|
maria_chk_DEPENDENCIES= $(LIBRARIES)
|
|
# Only reason to link with libmyisam.a here is that it's where some fulltext
|
|
# pieces are (but soon we'll remove fulltext dependencies from Maria).
|
|
# For now, it imposes that storage/myisam be built before storage/maria.
|
|
maria_chk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
|
maria_pack_DEPENDENCIES=$(LIBRARIES)
|
|
maria_pack_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
|
maria_read_log_DEPENDENCIES=$(LIBRARIES)
|
|
maria_read_log_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
|
maria_dump_log_DEPENDENCIES=$(LIBRARIES) ma_loghandler.c
|
|
maria_dump_log_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
|
maria_dump_log_SOURCES= ma_loghandler.c
|
|
maria_dump_log_CPPFLAGS= -DMARIA_DUMP_LOG
|
|
noinst_PROGRAMS = ma_test1 ma_test2 ma_test3 ma_rt_test ma_sp_test
|
|
noinst_HEADERS = maria_def.h ma_rt_index.h ma_rt_key.h ma_rt_mbr.h \
|
|
ma_sp_defs.h ma_fulltext.h ma_ftdefs.h ma_ft_test1.h \
|
|
ma_ft_eval.h trnman.h lockman.h tablockman.h \
|
|
ma_control_file.h ha_maria.h ma_blockrec.h \
|
|
ma_loghandler.h ma_loghandler_lsn.h ma_pagecache.h \
|
|
ma_checkpoint.h ma_recovery.h ma_commit.h ma_state.h \
|
|
trnman_public.h ma_check_standalone.h \
|
|
ma_key_recover.h ma_recovery_util.h
|
|
ma_test1_DEPENDENCIES= $(LIBRARIES)
|
|
ma_test1_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
|
ma_test2_DEPENDENCIES= $(LIBRARIES)
|
|
ma_test2_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
|
ma_test3_DEPENDENCIES= $(LIBRARIES)
|
|
ma_test3_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
|
#ma_ft_test1_DEPENDENCIES= $(LIBRARIES)
|
|
#ma_ft_eval_DEPENDENCIES= $(LIBRARIES)
|
|
maria_ftdump_DEPENDENCIES= $(LIBRARIES)
|
|
maria_ftdump_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
|
ma_rt_test_DEPENDENCIES= $(LIBRARIES)
|
|
ma_rt_test_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
|
ma_sp_test_DEPENDENCIES= $(LIBRARIES)
|
|
ma_sp_test_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmaria.a \
|
|
$(top_builddir)/storage/myisam/libmyisam.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
|
|
libmaria_a_SOURCES = ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c \
|
|
ma_rnext.c ma_rnext_same.c \
|
|
ma_search.c ma_page.c ma_key_recover.c ma_key.c \
|
|
ma_locking.c ma_state.c \
|
|
ma_rrnd.c ma_scan.c ma_cache.c \
|
|
ma_statrec.c ma_packrec.c ma_dynrec.c \
|
|
ma_blockrec.c ma_bitmap.c \
|
|
ma_update.c ma_write.c ma_unique.c \
|
|
ma_delete.c \
|
|
ma_rprev.c ma_rfirst.c ma_rlast.c ma_rsame.c \
|
|
ma_rsamepos.c ma_panic.c ma_close.c ma_create.c\
|
|
ma_range.c ma_dbug.c ma_checksum.c \
|
|
ma_changed.c ma_static.c ma_delete_all.c \
|
|
ma_delete_table.c ma_rename.c ma_check.c \
|
|
ma_keycache.c ma_preload.c ma_ft_parser.c \
|
|
ma_ft_update.c ma_ft_boolean_search.c \
|
|
ma_ft_nlq_search.c ft_maria.c ma_sort.c \
|
|
trnman.c lockman.c tablockman.c \
|
|
ma_rt_index.c ma_rt_key.c ma_rt_mbr.c ma_rt_split.c \
|
|
ma_sp_key.c ma_control_file.c ma_loghandler.c \
|
|
ma_pagecache.c ma_pagecaches.c \
|
|
ma_checkpoint.c ma_recovery.c ma_commit.c \
|
|
ma_pagecrc.c ma_recovery_util.c \
|
|
ha_maria.cc
|
|
CLEANFILES = test?.MA? FT?.MA? isam.log ma_test_all ma_rt_test.MA? sp_test.MA?
|
|
|
|
SUFFIXES = .sh
|
|
|
|
.sh:
|
|
@RM@ -f $@ $@-t
|
|
@SED@ \
|
|
-e 's!@''bindir''@!$(bindir)!g' \
|
|
-e 's!@''scriptdir''@!$(bindir)!g' \
|
|
-e 's!@''prefix''@!$(prefix)!g' \
|
|
-e 's!@''datadir''@!$(datadir)!g' \
|
|
-e 's!@''localstatedir''@!$(localstatedir)!g' \
|
|
-e 's!@''libexecdir''@!$(libexecdir)!g' \
|
|
-e 's!@''CC''@!@CC@!'\
|
|
-e 's!@''CXX''@!@CXX@!'\
|
|
-e 's!@''GXX''@!@GXX@!'\
|
|
-e 's!@''PERL''@!@PERL@!' \
|
|
-e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\
|
|
-e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
|
|
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
|
-e 's!@''VERSION''@!@VERSION@!' \
|
|
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
|
|
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
|
|
-e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
|
|
-e 's!@''HOSTNAME''@!@HOSTNAME@!' \
|
|
-e 's!@''SYSTEM_TYPE''@!@SYSTEM_TYPE@!' \
|
|
-e 's!@''CHECK_PID''@!@CHECK_PID@!' \
|
|
-e 's!@''FIND_PROC''@!@FIND_PROC@!' \
|
|
-e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
|
|
-e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
|
|
-e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \
|
|
-e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
|
|
-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
|
|
-e 's!@''sysconfdir''@!@sysconfdir@!' \
|
|
-e 's!@''SHORT_MYSQL_INTRO''@!@SHORT_MYSQL_INTRO@!' \
|
|
-e 's!@''SHARED_LIB_VERSION''@!@SHARED_LIB_VERSION@!' \
|
|
-e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
|
|
-e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \
|
|
-e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
|
|
-e 's!@''PERL_DBI_VERSION''@!@PERL_DBI_VERSION@!' \
|
|
-e 's!@''PERL_DBD_VERSION''@!@PERL_DBD_VERSION@!' \
|
|
-e 's!@''PERL_DATA_DUMPER''@!@PERL_DATA_DUMPER@!' \
|
|
$< > $@-t
|
|
@CHMOD@ +x $@-t
|
|
@MV@ $@-t $@
|
|
|
|
tags:
|
|
etags *.h *.c *.cc
|
|
|
|
unittests = unittest
|
|
|
|
test:
|
|
perl $(top_srcdir)/unittest/unit.pl run $(unittests)
|
|
|
|
test-verbose:
|
|
HARNESS_VERBOSE=1 perl $(top_srcdir)/unittest/unit.pl run $(unittests)
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|