TokuDB 7.5.3

storage/tokudb/ha_tokudb.cc

@@ -244,23 +244,20 @@ void TOKUDB_SHARE::destroy(void) {
     tokudb_pthread_mutex_destroy(&mutex);
     rwlock_destroy(&num_DBs_lock);
     tokudb_pthread_cond_destroy(&m_openclose_cond);
+    tokudb_my_free(rec_per_key);
+    rec_per_key = NULL;
 }
 
 // MUST have tokudb_mutex locked on input    
 static TOKUDB_SHARE *get_share(const char *table_name, TABLE_SHARE* table_share) {
     TOKUDB_SHARE *share = NULL;
     int error = 0;
-    uint length;
-
-    length = (uint) strlen(table_name);
-
+    uint length = (uint) strlen(table_name);
     if (!(share = (TOKUDB_SHARE *) my_hash_search(&tokudb_open_tables, (uchar *) table_name, length))) {
         char *tmp_name;
 
-        //
         // create share and fill it with all zeroes
         // hence, all pointers are initialized to NULL
-        //
         share = (TOKUDB_SHARE *) tokudb_my_multi_malloc(MYF(MY_WME | MY_ZEROFILL), 
             &share, sizeof(*share),
             &tmp_name, length + 1, 
@@ -1597,11 +1594,7 @@ bool ha_tokudb::can_replace_into_be_fast(TABLE_SHARE* table_share, KEY_AND_COL_I
     return ret_val;
 }
 
-int ha_tokudb::initialize_share(
-    const char* name,
-    int mode
-    )
-{
+int ha_tokudb::initialize_share(const char* name, int mode) {
     int error = 0;
     uint64_t num_rows = 0;
     DB_TXN* txn = NULL;
@@ -1748,17 +1741,12 @@ int ha_tokudb::initialize_share(
     init_hidden_prim_key_info(txn);
 
     // initialize cardinality info from the status dictionary
-    {
-        uint total_key_parts = tokudb::compute_total_key_parts(table_share);
-        uint64_t rec_per_key[total_key_parts];
-        error = tokudb::get_card_from_status(share->status_block, txn, total_key_parts, rec_per_key);
-        if (error == 0) {
-            tokudb::set_card_in_key_info(table, total_key_parts, rec_per_key);
-        } else {
-            for (uint i = 0; i < total_key_parts; i++)
-                rec_per_key[i] = 0;
-            tokudb::set_card_in_key_info(table, total_key_parts, rec_per_key);
-        }
+    share->n_rec_per_key = tokudb::compute_total_key_parts(table_share);
+    share->rec_per_key = (uint64_t *) tokudb_my_realloc(share->rec_per_key, share->n_rec_per_key * sizeof (uint64_t), MYF(MY_FAE));
+    error = tokudb::get_card_from_status(share->status_block, txn, share->n_rec_per_key, share->rec_per_key);
+    if (error) {
+        for (uint i = 0; i < share->n_rec_per_key; i++)
+            share->rec_per_key[i] = 0;
     }
 
     error = 0;
@@ -5958,6 +5946,7 @@ int ha_tokudb::info(uint flag) {
     }
     if ((flag & HA_STATUS_CONST)) {
         stats.max_data_file_length=  9223372036854775807ULL;
+        tokudb::set_card_in_key_info(table, share->n_rec_per_key, share->rec_per_key);
     }
 
     /* Don't return key if we got an error for the internal primary key */

storage/tokudb/ha_tokudb.h

@@ -184,6 +184,9 @@ class TOKUDB_SHARE {
     enum { CLOSED, OPENING, OPENED, CLOSING, ERROR } m_state;
     int m_error;
     int m_initialize_count;
+
+    uint n_rec_per_key;
+    uint64_t *rec_per_key;
 };
 
 typedef struct st_filter_key_part_info {

storage/tokudb/ha_tokudb_admin.cc

@@ -133,7 +133,7 @@ int ha_tokudb::analyze(THD *thd, HA_CHECK_OPT *check_opt) {
     int result = HA_ADMIN_OK;
 
     // stub out analyze if optimize is remapped to alter recreate + analyze
-    if (thd_sql_command(thd) != SQLCOM_ANALYZE) {
+    if (thd_sql_command(thd) != SQLCOM_ANALYZE && thd_sql_command(thd) != SQLCOM_ALTER_TABLE) {
         TOKUDB_HANDLER_DBUG_RETURN(result);
     }
 

storage/tokudb/ha_tokudb_alter_56.cc

@@ -528,7 +528,7 @@ bool ha_tokudb::inplace_alter_table(TABLE *altered_table, Alter_inplace_info *ha
         error = alter_table_expand_blobs(altered_table, ha_alter_info);
 
     if (error == 0 && ctx->reset_card) {
-        error = tokudb::set_card_from_status(share->status_block, ctx->alter_txn, table->s, altered_table->s);
+        error = tokudb::alter_card(share->status_block, ctx->alter_txn, table->s, altered_table->s);
     }
     if (error == 0 && ctx->optimize_needed) {
         error = do_optimize(ha_thd());

storage/tokudb/hatoku_defines.h

@@ -442,6 +442,8 @@ static inline void *tokudb_my_malloc(size_t s, myf flags) {
 }
 
 static inline void *tokudb_my_realloc(void *p, size_t s, myf flags) {
+    if (s == 0)
+        return p;
 #if 50700 <= MYSQL_VERSION_ID && MYSQL_VERSION_ID <= 50799
     return my_realloc(0, p, s, flags);
 #else
@@ -450,7 +452,8 @@ static inline void *tokudb_my_realloc(void *p, size_t s, myf flags) {
 }
 
 static inline void tokudb_my_free(void *ptr) {
-    my_free(ptr);
+    if (ptr)
+        my_free(ptr);
 }
 
 static inline char *tokudb_my_strdup(const char *p, myf flags) {

storage/tokudb/hatoku_hton.cc

@@ -638,8 +638,8 @@ int tokudb_end(handlerton * hton, ha_panic_function type) {
     if (db_env) {
         if (tokudb_init_flags & DB_INIT_LOG)
             tokudb_cleanup_log_files();
-#if TOKU_INCLUDE_XA
         long total_prepared = 0; // count the total number of prepared txn's that we discard
+#if TOKU_INCLUDE_XA
         while (1) {
             // get xid's 
             const long n_xid = 1;

storage/tokudb/mysql-test/tokudb/t/card_drop_index_2.test

+# test that add index keeps cardinality for older indexes
+
+source include/have_tokudb.inc;
+set default_storage_engine='tokudb';
+
+disable_warnings;
+drop table if exists tt;
+enable_warnings;
+
+create table tt (a int, b int, c int, primary key(a), key(b), key(c));
+let $a=0;
+while ($a < 500) {
+    eval insert into tt values ($a, $a, 0), ($a+1, $a, 0), ($a+2, $a, 0), ($a+3, $a, 0);
+    inc $a; inc $a; inc $a; inc $a;
+}
+select count(*) from tt;
+
+# compute cardinality
+show indexes from tt;
+analyze table tt;
+show indexes from tt;
+
+# drop key b
+alter table tt drop key b;
+show indexes from tt;
+
+# drop key c
+alter table tt drop key c;
+show indexes from tt;
+
+# test that cardinality is persistent
+flush tables;
+show indexes from tt;
+
+drop table tt;

storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash.result

+set default_storage_engine='tokudb';
+drop table if exists t;
+create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	2	NULL	NULL		BTREE		
+t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+insert into t values (1,1),(3,1),(5,1);
+insert into t values (2,1),(4,1),(6,1);
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	6	NULL	NULL		BTREE		
+t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+analyze table t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	6	NULL	NULL		BTREE		
+t	1	x	1	x	A	2	NULL	NULL	YES	BTREE		
+drop table t;

storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1.result

+set default_storage_engine='tokudb';
+drop table if exists t;
+create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	2	NULL	NULL		BTREE		
+t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+insert into t values (1,1),(3,1),(5,1);
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	4	NULL	NULL		BTREE		
+t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+analyze table t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	4	NULL	NULL		BTREE		
+t	1	x	1	x	A	1	NULL	NULL	YES	BTREE		
+drop table t;

storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_1_pick.result

+set default_storage_engine='tokudb';
+drop table if exists t;
+create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	2	NULL	NULL		BTREE		
+t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+insert into t values (1,1),(3,2),(5,3);
+insert into t values (2,1),(4,1),(6,1),(8,1);
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	7	NULL	NULL		BTREE		
+t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+analyze table t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	7	NULL	NULL		BTREE		
+t	1	x	1	x	A	1	NULL	NULL	YES	BTREE		
+drop table t;

storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2.result

+set default_storage_engine='tokudb';
+drop table if exists t;
+create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	2	NULL	NULL		BTREE		
+t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+insert into t values (2,1),(4,1),(6,1);
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	4	NULL	NULL		BTREE		
+t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+analyze table t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	4	NULL	NULL		BTREE		
+t	1	x	1	x	A	1	NULL	NULL	YES	BTREE		
+drop table t;

storage/tokudb/mysql-test/tokudb_bugs/r/db756_card_part_hash_2_pick.result

+set default_storage_engine='tokudb';
+drop table if exists t;
+create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	2	NULL	NULL		BTREE		
+t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+insert into t values (1,1),(3,2),(5,3),(7,4);
+insert into t values (2,1),(4,1),(6,1);
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	7	NULL	NULL		BTREE		
+t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+analyze table t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	7	NULL	NULL		BTREE		
+t	1	x	1	x	A	7	NULL	NULL	YES	BTREE		
+drop table t;

storage/tokudb/mysql-test/tokudb_bugs/r/db757_part_alter_analyze.result

+set default_storage_engine='tokudb';
+drop table if exists t;
+create table t (id int, x int, y int, primary key (id), key (x), key (y)) 
+partition by range(id) 
+( partition p0 values less than (10), partition p1 values less than maxvalue);
+insert into t values (1,1,1),(2,1,2),(3,1,3),(4,1,4);
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	5	NULL	NULL		BTREE		
+t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+t	1	y	1	y	A	NULL	NULL	NULL	YES	BTREE		
+alter table t analyze partition p0;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	5	NULL	NULL		BTREE		
+t	1	x	1	x	A	1	NULL	NULL	YES	BTREE		
+t	1	y	1	y	A	5	NULL	NULL	YES	BTREE		
+alter table t analyze partition p1;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	5	NULL	NULL		BTREE		
+t	1	x	1	x	A	1	NULL	NULL	YES	BTREE		
+t	1	y	1	y	A	5	NULL	NULL	YES	BTREE		
+insert into t values (100,1,1),(200,2,1),(300,3,1),(400,4,1),(500,5,1);
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	9	NULL	NULL		BTREE		
+t	1	x	1	x	A	2	NULL	NULL	YES	BTREE		
+t	1	y	1	y	A	9	NULL	NULL	YES	BTREE		
+alter table t analyze partition p0;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	9	NULL	NULL		BTREE		
+t	1	x	1	x	A	NULL	NULL	NULL	YES	BTREE		
+t	1	y	1	y	A	NULL	NULL	NULL	YES	BTREE		
+alter table t analyze partition p1;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+show indexes from t;
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
+t	0	PRIMARY	1	id	A	9	NULL	NULL		BTREE		
+t	1	x	1	x	A	9	NULL	NULL	YES	BTREE		
+t	1	y	1	y	A	1	NULL	NULL	YES	BTREE		
+drop table t;

storage/tokudb/mysql-test/tokudb_bugs/t/5585.test

 --source include/have_innodb.inc
 --source include/have_tokudb.inc
+--source include/big_test.inc
 
 --disable_warnings
 drop table if exists t1, t2;

storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash.test

+# DB-756 verify that cardinality is picked from SOME partition
+source include/have_tokudb.inc;
+source include/have_partition.inc;
+set default_storage_engine='tokudb';
+disable_warnings;
+drop table if exists t;
+enable_warnings;
+create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
+show indexes from t;
+insert into t values (1,1),(3,1),(5,1);
+insert into t values (2,1),(4,1),(6,1);
+show indexes from t;
+analyze table t;
+show indexes from t;
+drop table t;

storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1.test

+# DB-756 verify that cardinality is picked from the partition where the rows are mapped.  in this case, the last partition.
+source include/have_tokudb.inc;
+source include/have_partition.inc;
+set default_storage_engine='tokudb';
+disable_warnings;
+drop table if exists t;
+enable_warnings;
+create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
+show indexes from t;
+insert into t values (1,1),(3,1),(5,1);
+show indexes from t;
+analyze table t;
+show indexes from t;
+drop table t;

storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_1_pick.test

+# DB-756 verify that cardinality is chosen from the first partition
+source include/have_tokudb.inc;
+source include/have_partition.inc;
+set default_storage_engine='tokudb';
+disable_warnings;
+drop table if exists t;
+enable_warnings;
+create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
+show indexes from t;
+insert into t values (1,1),(3,2),(5,3);
+insert into t values (2,1),(4,1),(6,1),(8,1);
+show indexes from t;
+analyze table t;
+show indexes from t;
+drop table t;

storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_2.test

+# DB-756 verify that cardinality is picked from the partition where the rows are mapped.  in this case, the first partition.
+source include/have_tokudb.inc;
+source include/have_partition.inc;
+set default_storage_engine='tokudb';
+disable_warnings;
+drop table if exists t;
+enable_warnings;
+create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
+show indexes from t;
+insert into t values (2,1),(4,1),(6,1);
+show indexes from t;
+analyze table t;
+show indexes from t;
+drop table t;

storage/tokudb/mysql-test/tokudb_bugs/t/db756_card_part_hash_2_pick.test

+# DB-756 verify that cardinality is chosen from the last partition
+source include/have_tokudb.inc;
+source include/have_partition.inc;
+set default_storage_engine='tokudb';
+disable_warnings;
+drop table if exists t;
+enable_warnings;
+create table t (id int, x int, primary key (id), key (x)) partition by hash(id) partitions 2;
+show indexes from t;
+insert into t values (1,1),(3,2),(5,3),(7,4);
+insert into t values (2,1),(4,1),(6,1);
+show indexes from t;
+analyze table t;
+show indexes from t;
+drop table t;

storage/tokudb/mysql-test/tokudb_bugs/t/db757_part_alter_analyze.test

+source include/have_tokudb.inc;
+source include/have_partition.inc;
+set default_storage_engine='tokudb';
+disable_warnings;
+drop table if exists t;
+enable_warnings;
+
+create table t (id int, x int, y int, primary key (id), key (x), key (y)) 
+partition by range(id) 
+( partition p0 values less than (10), partition p1 values less than maxvalue);
+
+insert into t values (1,1,1),(2,1,2),(3,1,3),(4,1,4);
+show indexes from t;
+alter table t analyze partition p0;
+show indexes from t;
+alter table t analyze partition p1;
+show indexes from t;
+
+insert into t values (100,1,1),(200,2,1),(300,3,1),(400,4,1),(500,5,1);
+show indexes from t;
+alter table t analyze partition p0;
+show indexes from t;
+alter table t analyze partition p1;
+show indexes from t;
+
+drop table t;

storage/tokudb/scripts/make.mysql.bash

@@ -155,6 +155,8 @@ function generate_cmake_cmd () {
         -D BUILD_CONFIG=mysql_release \
         -D CMAKE_BUILD_TYPE=$cmake_build_type \
         -D CMAKE_TOKUDB_REVISION=$ft_revision \
+        -D TOKUDB_VERSION=tokudb-${tokudb_version} \
+        -D WITH_JEMALLOC=bundled \
         -D BUILD_TESTING=OFF \
         -D USE_GTAGS=OFF \
         -D USE_CTAGS=OFF \
@@ -212,8 +214,6 @@ if [ $build_tgz != 0 ] ; then
     mkdir -p build.$cmake_build_type
     pushd build.$cmake_build_type
 
-    export TOKUDB_VERSION=$tokudb_version
-
     # actually build
     cmd=$(generate_cmake_cmd)
     if [ $? != 0 ] ; then exit 1; fi

storage/tokudb/tests/Makefile

@@ -3,6 +3,10 @@ TARGETS = $(patsubst %.cc,%,$(SRCS))
 CHECKS = $(patsubst %,%.check,$(TARGETS))
 CPPFLAGS = -I.. -D__STDC_FORMAT_MACROS
 CXXFLAGS = -g -Wall -Wextra -Wno-missing-field-initializers -Wshadow
+ifdef USE_OPENMP
+CPPFLAGS += -DUSE_OPENMP
+CXXFLAGS += -fopenmp
+endif
 
 FRACTALTREE_BASE_DIR = ../ft-index
 FRACTALTREE_INSTALL_DIR = $(FRACTALTREE_BASE_DIR)/install.debug
@@ -10,6 +14,8 @@ VALGRIND = valgrind -q --leak-check=full --show-reachable=yes --suppressions=$(F
 
 ifeq ($(GCOV),1)
 CXXFLAGS += -fprofile-arcs -ftest-coverage
+else
+CXXFLAGS += -O3
 endif
 
 all: $(TARGETS)
@@ -17,18 +23,29 @@ all: $(TARGETS)
 clean:
 	rm -rf $(TARGETS) *.gcov *.gcno *.gcda *.testdir *.dSYM
 
-check: $(CHECKS)
+%.check: %
+	LD_LIBRARY_PATH=$(FRACTALTREE_INSTALL_DIR)/lib $(VALGRIND) ./$<
+
+card.check: $(patsubst %.cc,%.check,$(wildcard card*.cc))
 	true
 
-%.check: % 
-	LD_LIBRARY_PATH=$(FRACTALTREE_INSTALL_DIR)/lib $(VALGRIND) ./$<
+ifndef USE_OPENMP
+# unravel vlq_test_uint64 8 times
+vlq_test_uint64_%.check:
+	LD_LIBRARY_PATH=$(FRACTALTREE_INSTALL_DIR)/lib $(VALGRIND) ./vlq_test_uint64 $(patsubst vlq_test_uint64_%.check,%,$@) 8
+vlq_test_uint64.check: $(foreach i,0 1 2 3 4 5 6 7,vlq_test_uint64_$(i).check)
+	true
+endif
 
-card.check: card_test.check card_1.check card_inf.check card_inf_1.check card_random_1.check card_etime.check
+vlq.check: $(patsubst %.cc,%.check,$(wildcard vlq*.cc))
 	true
 
 max_test.check: max_test
 	$(VALGRIND) ./$< 1 2
 
+check: $(CHECKS)
+	true
+
 %: %.cc
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -g -o $@ $<
 

storage/tokudb/tests/card_test.cc

@@ -222,6 +222,19 @@ static void test_10(DB_ENV *env) {
         
         error = txn->commit(txn, 0);
         assert(error == 0);
+
+        // test delete card
+        error = env->txn_begin(env, NULL, &txn, 0);
+        assert(error == 0);
+
+        error = tokudb::delete_card_from_status(status_db, txn);
+        assert(error == 0);
+
+        error = tokudb::get_card_from_status(status_db, txn, 0, NULL);
+        assert(error == DB_NOTFOUND);
+
+        error = txn->commit(txn, 0);
+        assert(error == 0);
         
         error = tokudb::close_status(&status_db);
         assert(error == 0);

storage/tokudb/tests/card_test_key_info.cc

+/* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+// vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
+#ident "$Id$"
+/*
+COPYING CONDITIONS NOTICE:
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation, and provided that the
+  following conditions are met:
+
+      * Redistributions of source code must retain this COPYING
+        CONDITIONS NOTICE, the COPYRIGHT NOTICE (below), the
+        DISCLAIMER (below), the UNIVERSITY PATENT NOTICE (below), the
+        PATENT MARKING NOTICE (below), and the PATENT RIGHTS
+        GRANT (below).
+
+      * Redistributions in binary form must reproduce this COPYING
+        CONDITIONS NOTICE, the COPYRIGHT NOTICE (below), the
+        DISCLAIMER (below), the UNIVERSITY PATENT NOTICE (below), the
+        PATENT MARKING NOTICE (below), and the PATENT RIGHTS
+        GRANT (below) in the documentation and/or other materials
+        provided with the distribution.
+
+  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., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+
+COPYRIGHT NOTICE:
+
+  TokuDB, Tokutek Fractal Tree Indexing Library.
+  Copyright (C) 2007-2013 Tokutek, Inc.
+
+DISCLAIMER:
+
+  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.
+
+UNIVERSITY PATENT NOTICE:
+
+  The technology is licensed by the Massachusetts Institute of
+  Technology, Rutgers State University of New Jersey, and the Research
+  Foundation of State University of New York at Stony Brook under
+  United States of America Serial No. 11/760379 and to the patents
+  and/or patent applications resulting from it.
+
+PATENT MARKING NOTICE:
+
+  This software is covered by US Patent No. 8,185,551.
+  This software is covered by US Patent No. 8,489,638.
+
+PATENT RIGHTS GRANT:
+
+  "THIS IMPLEMENTATION" means the copyrightable works distributed by
+  Tokutek as part of the Fractal Tree project.
+
+  "PATENT CLAIMS" means the claims of patents that are owned or
+  licensable by Tokutek, both currently or in the future; and that in
+  the absence of this license would be infringed by THIS
+  IMPLEMENTATION or by using or running THIS IMPLEMENTATION.
+
+  "PATENT CHALLENGE" shall mean a challenge to the validity,
+  patentability, enforceability and/or non-infringement of any of the
+  PATENT CLAIMS or otherwise opposing any of the PATENT CLAIMS.
+
+  Tokutek hereby grants to you, for the term and geographical scope of
+  the PATENT CLAIMS, a non-exclusive, no-charge, royalty-free,
+  irrevocable (except as stated in this section) patent license to
+  make, have made, use, offer to sell, sell, import, transfer, and
+  otherwise run, modify, and propagate the contents of THIS
+  IMPLEMENTATION, where such license applies only to the PATENT
+  CLAIMS.  This grant does not include claims that would be infringed
+  only as a consequence of further modifications of THIS
+  IMPLEMENTATION.  If you or your agent or licensee institute or order
+  or agree to the institution of patent litigation against any entity
+  (including a cross-claim or counterclaim in a lawsuit) alleging that
+  THIS IMPLEMENTATION constitutes direct or contributory patent
+  infringement, or inducement of patent infringement, then any rights
+  granted to you under this License shall terminate as of the date
+  such litigation is filed.  If you or your agent or exclusive
+  licensee institute or order or agree to the institution of a PATENT
+  CHALLENGE, then Tokutek may terminate any rights granted to you
+  under this License.
+*/
+
+#ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
+#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
+// test tokudb cardinality in status dictionary
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <assert.h>
+#include <memory.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <db.h>
+typedef unsigned long long ulonglong;
+#include <tokudb_status.h>
+#include <tokudb_buffer.h>
+
+#include "fake_mysql.h"
+
+#if __APPLE__
+typedef unsigned long ulong;
+#endif
+#include <tokudb_card.h>
+
+static void test_no_keys() {
+    TABLE_SHARE s = { 0, 0, 0, NULL };
+    TABLE t = { &s, NULL };
+    assert(tokudb::compute_total_key_parts(&s) == 0);
+    tokudb::set_card_in_key_info(&t, 0, NULL);
+}
+
+static void test_simple_pk() {
+    const uint keys = 1;
+    const uint key_parts = 1;
+    uint64_t pk_rec_per_key[keys] = { 0 };
+    KEY_INFO pk = { 0, key_parts, pk_rec_per_key, (char *) "PRIMARY" };
+    TABLE_SHARE s = { 0, keys, key_parts, &pk };
+    TABLE t = { &s, &pk };
+    assert(tokudb::compute_total_key_parts(&s) == key_parts);
+    uint64_t computed_rec_per_key[keys] = { 2 };
+    tokudb::set_card_in_key_info(&t, keys, computed_rec_per_key);
+    assert(t.key_info[0].rec_per_key[0] == 1);
+}
+
+static void test_pk_2() {
+    const uint keys = 1;
+    const uint key_parts = 2;
+    uint64_t pk_rec_per_key[keys * key_parts] = { 0 };
+    KEY_INFO pk = { 0, key_parts, pk_rec_per_key, (char *) "PRIMARY" };
+    TABLE_SHARE s = { 0, keys, key_parts, &pk };
+    TABLE t = { &s, &pk };
+    assert(tokudb::compute_total_key_parts(&s) == key_parts);
+    uint64_t computed_rec_per_key[keys * key_parts] = { 2, 3 };
+    tokudb::set_card_in_key_info(&t, keys * key_parts, computed_rec_per_key);
+    assert(t.key_info[0].rec_per_key[0] == 2);
+    assert(t.key_info[0].rec_per_key[1] == 1);
+}
+
+static void test_simple_sk() {
+    const uint keys = 1;
+    const uint key_parts = 1;
+    uint64_t sk_rec_per_key[keys] = { 0 };
+    KEY_INFO sk = { 0, keys, sk_rec_per_key, (char *) "KEY" };
+    TABLE_SHARE s = { MAX_KEY, keys, key_parts, &sk };
+    TABLE t = { &s, &sk };
+    assert(tokudb::compute_total_key_parts(&s) == 1);
+    uint64_t computed_rec_per_key[keys] = { 2 };
+    tokudb::set_card_in_key_info(&t, keys, computed_rec_per_key);
+    assert(t.key_info[0].rec_per_key[0] == 2);
+}
+
+static void test_simple_unique_sk() {
+    const uint keys = 1;
+    uint64_t sk_rec_per_key[keys] = { 0 };
+    KEY_INFO sk = { HA_NOSAME, keys, sk_rec_per_key, (char *) "KEY" };
+    TABLE_SHARE s = { MAX_KEY, keys, keys, &sk };
+    TABLE t = { &s, &sk };
+    assert(tokudb::compute_total_key_parts(&s) == 1);
+    uint64_t computed_rec_per_key[keys] = { 2 };
+    tokudb::set_card_in_key_info(&t, keys, computed_rec_per_key);
+    assert(t.key_info[0].rec_per_key[0] == 1);
+}
+
+static void test_simple_pk_sk() {
+    const uint keys = 2;
+    uint64_t rec_per_key[keys] = { 0 };
+    KEY_INFO key_info[keys] = {
+        { 0, 1, &rec_per_key[0], (char *) "PRIMARY" },
+        { 0, 1, &rec_per_key[1], (char *) "KEY" },
+    };
+    TABLE_SHARE s = { 0, keys, keys, key_info };
+    TABLE t = { &s, key_info };
+    assert(tokudb::compute_total_key_parts(&s) == 2);
+    uint64_t computed_rec_per_key[keys] = { 100, 200 };
+    tokudb::set_card_in_key_info(&t, keys, computed_rec_per_key);
+    assert(t.key_info[0].rec_per_key[0] == 1);
+    assert(t.key_info[1].rec_per_key[0] == 200);
+}
+
+static void test_simple_sk_pk() {
+    const uint keys = 2;
+    uint64_t rec_per_key[keys] = { 0 };
+    KEY_INFO key_info[keys] = {
+        { 0, 1, &rec_per_key[0], (char *) "KEY" },
+        { 0, 1, &rec_per_key[1], (char *) "PRIMARY" },
+    };
+    TABLE_SHARE s = { 1, keys, keys, key_info };
+    TABLE t = { &s, key_info };
+    assert(tokudb::compute_total_key_parts(&s) == 2);
+    uint64_t computed_rec_per_key[keys] = { 100, 200 };
+    tokudb::set_card_in_key_info(&t, keys, computed_rec_per_key);
+    assert(t.key_info[0].rec_per_key[0] == 100);
+    assert(t.key_info[1].rec_per_key[0] == 1);
+}
+
+int main() {
+    test_no_keys();
+    test_simple_pk();
+    test_pk_2();
+    test_simple_sk();
+    test_simple_unique_sk();
+    test_simple_pk_sk();
+    test_simple_sk_pk();
+    return 0;
+}

storage/tokudb/tests/fake_mysql.h

@@ -110,5 +110,6 @@ class TABLE {
 };
 uint get_key_parts(KEY_INFO *key_info) {
     assert(key_info);
-    return 0;
+    return key_info->key_parts;
 }
+#define MAX_KEY (1U << 30)

storage/tokudb/tests/tokudb_math_test.cc → storage/tokudb/tests/math_test_int.cc

@@ -96,113 +96,6 @@ PATENT RIGHTS GRANT:
 #include <tokudb_math.h>
 using namespace tokudb;
 
-static void test_uint_range(uint length_bits) {
-    assert(uint_low_endpoint(length_bits) == 0);
-    if (length_bits == 64)
-        assert(uint_high_endpoint(length_bits) == ~0ULL);
-    else
-        assert(uint_high_endpoint(length_bits) == (1ULL<<length_bits)-1);
-}
-
-static void test_uint8() {
-    printf("%s\n", __FUNCTION__);
-    test_uint_range(8);
-    bool over;
-    uint8_t n;
-    uint64_t m;
-    for (uint64_t x = 0; x <= (1ULL<<8)-1; x++) {
-        for (uint64_t y = 0; y <= (1ULL<<8)-1; y++) {
-            n = uint_add(x, y, 8, &over);
-            m = x + y;
-            if (m > (1ULL<<8)-1)
-                assert(over);
-            else 
-                assert(!over && n == (m % 256));
-            n = uint_sub(x, y, 8, &over);
-            m = x - y;
-            if (m > x)
-                assert(over);
-            else
-                assert(!over && n == (m % 256));
-        }
-    }
-}
-
-static void test_uint16() {
-    printf("%s\n", __FUNCTION__);
-    test_uint_range(16);
-    bool over;
-    uint16_t n;
-    uint64_t m;
-    for (uint64_t x = 0; x <= (1ULL<<16)-1; x++) {
-        for (uint64_t y = 0; y <= (1ULL<<16)-1; y++) {
-            n = uint_add(x, y, 16, &over);
-            m = x + y;
-            if (m > (1ULL<<16)-1)
-                assert(over);
-            else
-                assert(!over && n == (m % (1ULL<<16)));
-            n = uint_sub(x, y, 16, &over);
-            m = x - y;
-            if (m > x)
-                assert(over);
-            else
-                assert(!over && n == (m % (1ULL<<16)));
-        }
-    }
-}
-
-static void test_uint24() {
-    printf("%s\n", __FUNCTION__);
-    test_uint_range(24);
-    bool over;
-    uint64_t s;
-
-    s = uint_add((1ULL<<24)-1, (1ULL<<24)-1, 24, &over); assert(over);
-    s = uint_add((1ULL<<24)-1, 1, 24, &over); assert(over);
-    s = uint_add((1ULL<<24)-1, 0, 24, &over); assert(!over && s == (1ULL<<24)-1);
-    s = uint_add(0, 1, 24, &over); assert(!over && s == 1);
-    s = uint_add(0, 0, 24, &over); assert(!over && s == 0);
-    s = uint_sub(0, 0, 24, &over); assert(!over && s == 0);
-    s = uint_sub(0, 1, 24, &over); assert(over);
-    s = uint_sub(0, (1ULL<<24)-1, 24, &over); assert(over);
-    s = uint_sub((1ULL<<24)-1, (1ULL<<24)-1, 24, &over); assert(!over && s == 0);
-}
-
-static void test_uint32() {
-    printf("%s\n", __FUNCTION__);
-    test_uint_range(32);
-    bool over;
-    uint64_t s;
-
-    s = uint_add((1ULL<<32)-1, (1ULL<<32)-1, 32, &over); assert(over);
-    s = uint_add((1ULL<<32)-1, 1, 32, &over); assert(over);
-    s = uint_add((1ULL<<32)-1, 0, 32, &over); assert(!over && s == (1ULL<<32)-1);
-    s = uint_add(0, 1, 32, &over); assert(!over && s == 1);
-    s = uint_add(0, 0, 32, &over); assert(!over && s == 0);
-    s = uint_sub(0, 0, 32, &over); assert(!over && s == 0);
-    s = uint_sub(0, 1, 32, &over); assert(over);
-    s = uint_sub(0, (1ULL<<32)-1, 32, &over); assert(over);
-    s = uint_sub((1ULL<<32)-1, (1ULL<<32)-1, 32, &over); assert(!over && s == 0);
-}
-
-static void test_uint64() {
-    printf("%s\n", __FUNCTION__);
-    test_uint_range(64);
-    bool over;
-    uint64_t s;
-
-    s = uint_add(~0ULL, ~0ULL, 64, &over); assert(over);
-    s = uint_add(~0ULL, 1, 64, &over); assert(over);
-    s = uint_add(~0ULL, 0, 64, &over); assert(!over && s == ~0ULL);
-    s = uint_add(0, 1, 64, &over); assert(!over && s == 1);
-    s = uint_add(0, 0, 64, &over); assert(!over && s == 0);
-    s = uint_sub(0, 0, 64, &over); assert(!over && s == 0);
-    s = uint_sub(0, 1, 64, &over); assert(over);
-    s = uint_sub(0, ~0ULL, 64, &over); assert(over);
-    s = uint_sub(~0ULL, ~0ULL, 64, &over); assert(!over && s == 0);
-}
-
 static int64_t sign_extend(uint length_bits, int64_t n) {
     return n | ~((1ULL<<(length_bits-1))-1);
 }
@@ -359,18 +252,12 @@ static void test_int_sign() {
 }
 
 int main() {
-    if (1) test_int_sign();
-    if (1) test_int8();
-    if (1) test_int16();
-    if (1) test_int24();
-    if (1) test_int32();
-    if (1) test_int64();
-
-    if (1) test_uint8();
-    if (1) test_uint16();
-    if (1) test_uint24();
-    if (1) test_uint32();
-    if (1) test_uint64();
+    test_int_sign();
+    test_int8();
+    test_int16();
+    test_int24();
+    test_int32();
+    test_int64();
     return 0;
 }
 

storage/tokudb/tests/math_test_uint.cc

+/* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+// vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
+#ident "$Id$"
+/*
+COPYING CONDITIONS NOTICE:
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation, and provided that the
+  following conditions are met:
+
+      * Redistributions of source code must retain this COPYING
+        CONDITIONS NOTICE, the COPYRIGHT NOTICE (below), the
+        DISCLAIMER (below), the UNIVERSITY PATENT NOTICE (below), the
+        PATENT MARKING NOTICE (below), and the PATENT RIGHTS
+        GRANT (below).
+
+      * Redistributions in binary form must reproduce this COPYING
+        CONDITIONS NOTICE, the COPYRIGHT NOTICE (below), the
+        DISCLAIMER (below), the UNIVERSITY PATENT NOTICE (below), the
+        PATENT MARKING NOTICE (below), and the PATENT RIGHTS
+        GRANT (below) in the documentation and/or other materials
+        provided with the distribution.
+
+  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., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+
+COPYRIGHT NOTICE:
+
+  TokuDB, Tokutek Fractal Tree Indexing Library.
+  Copyright (C) 2007-2013 Tokutek, Inc.
+
+DISCLAIMER:
+
+  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.
+
+UNIVERSITY PATENT NOTICE:
+
+  The technology is licensed by the Massachusetts Institute of
+  Technology, Rutgers State University of New Jersey, and the Research
+  Foundation of State University of New York at Stony Brook under
+  United States of America Serial No. 11/760379 and to the patents
+  and/or patent applications resulting from it.
+
+PATENT MARKING NOTICE:
+
+  This software is covered by US Patent No. 8,185,551.
+  This software is covered by US Patent No. 8,489,638.
+
+PATENT RIGHTS GRANT:
+
+  "THIS IMPLEMENTATION" means the copyrightable works distributed by
+  Tokutek as part of the Fractal Tree project.
+
+  "PATENT CLAIMS" means the claims of patents that are owned or
+  licensable by Tokutek, both currently or in the future; and that in
+  the absence of this license would be infringed by THIS
+  IMPLEMENTATION or by using or running THIS IMPLEMENTATION.
+
+  "PATENT CHALLENGE" shall mean a challenge to the validity,
+  patentability, enforceability and/or non-infringement of any of the
+  PATENT CLAIMS or otherwise opposing any of the PATENT CLAIMS.
+
+  Tokutek hereby grants to you, for the term and geographical scope of
+  the PATENT CLAIMS, a non-exclusive, no-charge, royalty-free,
+  irrevocable (except as stated in this section) patent license to
+  make, have made, use, offer to sell, sell, import, transfer, and
+  otherwise run, modify, and propagate the contents of THIS
+  IMPLEMENTATION, where such license applies only to the PATENT
+  CLAIMS.  This grant does not include claims that would be infringed
+  only as a consequence of further modifications of THIS
+  IMPLEMENTATION.  If you or your agent or licensee institute or order
+  or agree to the institution of patent litigation against any entity
+  (including a cross-claim or counterclaim in a lawsuit) alleging that
+  THIS IMPLEMENTATION constitutes direct or contributory patent
+  infringement, or inducement of patent infringement, then any rights
+  granted to you under this License shall terminate as of the date
+  such litigation is filed.  If you or your agent or exclusive
+  licensee institute or order or agree to the institution of a PATENT
+  CHALLENGE, then Tokutek may terminate any rights granted to you
+  under this License.
+*/
+
+#ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
+#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <sys/types.h>
+#include <tokudb_math.h>
+using namespace tokudb;
+
+static void test_uint_range(uint length_bits) {
+    assert(uint_low_endpoint(length_bits) == 0);
+    if (length_bits == 64)
+        assert(uint_high_endpoint(length_bits) == ~0ULL);
+    else
+        assert(uint_high_endpoint(length_bits) == (1ULL<<length_bits)-1);
+}
+
+static void test_uint8() {
+    printf("%s\n", __FUNCTION__);
+    test_uint_range(8);
+    bool over;
+    uint8_t n;
+    uint64_t m;
+    for (uint64_t x = 0; x <= (1ULL<<8)-1; x++) {
+        for (uint64_t y = 0; y <= (1ULL<<8)-1; y++) {
+            n = uint_add(x, y, 8, &over);
+            m = x + y;
+            if (m > (1ULL<<8)-1)
+                assert(over);
+            else 
+                assert(!over && n == (m % 256));
+            n = uint_sub(x, y, 8, &over);
+            m = x - y;
+            if (m > x)
+                assert(over);
+            else
+                assert(!over && n == (m % 256));
+        }
+    }
+}
+
+static void test_uint16() {
+    printf("%s\n", __FUNCTION__);
+    test_uint_range(16);
+    bool over;
+    uint16_t n;
+    uint64_t m;
+    for (uint64_t x = 0; x <= (1ULL<<16)-1; x++) {
+        for (uint64_t y = 0; y <= (1ULL<<16)-1; y++) {
+            n = uint_add(x, y, 16, &over);
+            m = x + y;
+            if (m > (1ULL<<16)-1)
+                assert(over);
+            else
+                assert(!over && n == (m % (1ULL<<16)));
+            n = uint_sub(x, y, 16, &over);
+            m = x - y;
+            if (m > x)
+                assert(over);
+            else
+                assert(!over && n == (m % (1ULL<<16)));
+        }
+    }
+}
+
+static void test_uint24() {
+    printf("%s\n", __FUNCTION__);
+    test_uint_range(24);
+    bool over;
+    uint64_t s;
+
+    s = uint_add((1ULL<<24)-1, (1ULL<<24)-1, 24, &over); assert(over);
+    s = uint_add((1ULL<<24)-1, 1, 24, &over); assert(over);
+    s = uint_add((1ULL<<24)-1, 0, 24, &over); assert(!over && s == (1ULL<<24)-1);
+    s = uint_add(0, 1, 24, &over); assert(!over && s == 1);
+    s = uint_add(0, 0, 24, &over); assert(!over && s == 0);
+    s = uint_sub(0, 0, 24, &over); assert(!over && s == 0);
+    s = uint_sub(0, 1, 24, &over); assert(over);
+    s = uint_sub(0, (1ULL<<24)-1, 24, &over); assert(over);
+    s = uint_sub((1ULL<<24)-1, (1ULL<<24)-1, 24, &over); assert(!over && s == 0);
+}
+
+static void test_uint32() {
+    printf("%s\n", __FUNCTION__);
+    test_uint_range(32);
+    bool over;
+    uint64_t s;
+
+    s = uint_add((1ULL<<32)-1, (1ULL<<32)-1, 32, &over); assert(over);
+    s = uint_add((1ULL<<32)-1, 1, 32, &over); assert(over);
+    s = uint_add((1ULL<<32)-1, 0, 32, &over); assert(!over && s == (1ULL<<32)-1);
+    s = uint_add(0, 1, 32, &over); assert(!over && s == 1);
+    s = uint_add(0, 0, 32, &over); assert(!over && s == 0);
+    s = uint_sub(0, 0, 32, &over); assert(!over && s == 0);
+    s = uint_sub(0, 1, 32, &over); assert(over);
+    s = uint_sub(0, (1ULL<<32)-1, 32, &over); assert(over);
+    s = uint_sub((1ULL<<32)-1, (1ULL<<32)-1, 32, &over); assert(!over && s == 0);
+}
+
+static void test_uint64() {
+    printf("%s\n", __FUNCTION__);
+    test_uint_range(64);
+    bool over;
+    uint64_t s;
+
+    s = uint_add(~0ULL, ~0ULL, 64, &over); assert(over);
+    s = uint_add(~0ULL, 1, 64, &over); assert(over);
+    s = uint_add(~0ULL, 0, 64, &over); assert(!over && s == ~0ULL);
+    s = uint_add(0, 1, 64, &over); assert(!over && s == 1);
+    s = uint_add(0, 0, 64, &over); assert(!over && s == 0);
+    s = uint_sub(0, 0, 64, &over); assert(!over && s == 0);
+    s = uint_sub(0, 1, 64, &over); assert(over);
+    s = uint_sub(0, ~0ULL, 64, &over); assert(over);
+    s = uint_sub(~0ULL, ~0ULL, 64, &over); assert(!over && s == 0);
+}
+
+int main() {
+    test_uint8();
+    test_uint16();
+    test_uint24();
+    test_uint32();
+    test_uint64();
+    return 0;
+}
+

storage/tokudb/tests/vlq_test.cc

@@ -120,98 +120,6 @@ static void test_vlq_uint32_error(void) {
     assert(in_s == 2 && n == 128);
 }
 
-static void test_vlq_uint32(void) {
-    uint32_t n;
-    unsigned char b[5];
-    size_t out_s, in_s;
-
-    printf("%u\n", 0);
-    for (uint32_t v = 0; v < (1<<7); v++) {
-        out_s = tokudb::vlq_encode_ui<uint32_t>(v, b, sizeof b);
-        assert(out_s == 1);
-        in_s = tokudb::vlq_decode_ui<uint32_t>(&n, b, out_s);
-        assert(in_s == 1 && n == v);
-    }
-
-    printf("%u\n", 1<<7);
-    for (uint32_t v = (1<<7); v < (1<<14); v++) {
-        out_s = tokudb::vlq_encode_ui<uint32_t>(v, b, sizeof b);
-        assert(out_s == 2);
-        in_s = tokudb::vlq_decode_ui<uint32_t>(&n, b, out_s);
-        assert(in_s == 2 && n == v);
-    }
-
-    printf("%u\n", 1<<14);
-    for (uint32_t v = (1<<14); v < (1<<21); v++) {
-        out_s = tokudb::vlq_encode_ui<uint32_t>(v, b, sizeof b);
-        assert(out_s == 3);
-        in_s = tokudb::vlq_decode_ui<uint32_t>(&n, b, out_s);
-        assert(in_s == 3 && n == v);
-    }
-
-    printf("%u\n", 1<<21);
-    for (uint32_t v = (1<<21); v < (1<<28); v++) {
-        out_s = tokudb::vlq_encode_ui<uint32_t>(v, b, sizeof b);
-        assert(out_s == 4);
-        in_s = tokudb::vlq_decode_ui<uint32_t>(&n, b, out_s);
-        assert(in_s == 4 && n == v);
-    }
-
-    printf("%u\n", 1<<28);
-    for (uint32_t v = (1<<28); v != 0; v++) {
-        out_s = tokudb::vlq_encode_ui<uint32_t>(v, b, sizeof b);
-        assert(out_s == 5);
-        in_s = tokudb::vlq_decode_ui<uint32_t>(&n, b, out_s);
-        assert(in_s == 5 && n == v);
-    }
-}
-
-static void test_vlq_uint64(void) {
-    uint64_t n;
-    unsigned char b[10];
-    size_t out_s, in_s;
-
-    printf("%u\n", 0);
-    for (uint64_t v = 0; v < (1<<7); v++) {
-        out_s = tokudb::vlq_encode_ui<uint64_t>(v, b, sizeof b);
-        assert(out_s == 1);
-        in_s = tokudb::vlq_decode_ui<uint64_t>(&n, b, out_s);
-        assert(in_s == 1 && n == v);
-    }
-
-    printf("%u\n", 1<<7);
-    for (uint64_t v = (1<<7); v < (1<<14); v++) {
-        out_s = tokudb::vlq_encode_ui<uint64_t>(v, b, sizeof b);
-        assert(out_s == 2);
-        in_s = tokudb::vlq_decode_ui<uint64_t>(&n, b, out_s);
-        assert(in_s == 2 && n == v);
-    }
-
-    printf("%u\n", 1<<14);
-    for (uint64_t v = (1<<14); v < (1<<21); v++) {
-        out_s = tokudb::vlq_encode_ui<uint64_t>(v, b, sizeof b);
-        assert(out_s == 3);
-        in_s = tokudb::vlq_decode_ui<uint64_t>(&n, b, out_s);
-        assert(in_s == 3 && n == v);
-    }
-
-    printf("%u\n", 1<<21);
-    for (uint64_t v = (1<<21); v < (1<<28); v++) {
-        out_s = tokudb::vlq_encode_ui<uint64_t>(v, b, sizeof b);
-        assert(out_s == 4);
-        in_s = tokudb::vlq_decode_ui<uint64_t>(&n, b, out_s);
-        assert(in_s == 4 && n == v);
-    }
-
-    printf("%u\n", 1<<28);
-    for (uint64_t v = (1<<28); v < (1ULL<<35); v++) {
-        out_s = tokudb::vlq_encode_ui<uint64_t>(v, b, sizeof b);
-        assert(out_s == 5);
-        in_s = tokudb::vlq_decode_ui<uint64_t>(&n, b, out_s);
-        assert(in_s == 5 && n == v);
-    }
-}
-
 static void test_80000000(void) {
     uint64_t n;
     unsigned char b[10];
@@ -235,10 +143,8 @@ static void test_100000000(void) {
 }   
 
 int main(void) {
-    if (1) test_vlq_uint32_error();
-    if (1) test_80000000();
-    if (1) test_100000000();
-    if (1) test_vlq_uint32();
-    if (1) test_vlq_uint64();
+    test_vlq_uint32_error();
+    test_80000000();
+    test_100000000();
     return 0;
 }

storage/tokudb/tests/vlq_test_uint32.cc

+/* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+// vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
+#ident "$Id$"
+/*
+COPYING CONDITIONS NOTICE:
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation, and provided that the
+  following conditions are met:
+
+      * Redistributions of source code must retain this COPYING
+        CONDITIONS NOTICE, the COPYRIGHT NOTICE (below), the
+        DISCLAIMER (below), the UNIVERSITY PATENT NOTICE (below), the
+        PATENT MARKING NOTICE (below), and the PATENT RIGHTS
+        GRANT (below).
+
+      * Redistributions in binary form must reproduce this COPYING
+        CONDITIONS NOTICE, the COPYRIGHT NOTICE (below), the
+        DISCLAIMER (below), the UNIVERSITY PATENT NOTICE (below), the
+        PATENT MARKING NOTICE (below), and the PATENT RIGHTS
+        GRANT (below) in the documentation and/or other materials
+        provided with the distribution.
+
+  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., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+
+COPYRIGHT NOTICE:
+
+  TokuDB, Tokutek Fractal Tree Indexing Library.
+  Copyright (C) 2007-2013 Tokutek, Inc.
+
+DISCLAIMER:
+
+  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.
+
+UNIVERSITY PATENT NOTICE:
+
+  The technology is licensed by the Massachusetts Institute of
+  Technology, Rutgers State University of New Jersey, and the Research
+  Foundation of State University of New York at Stony Brook under
+  United States of America Serial No. 11/760379 and to the patents
+  and/or patent applications resulting from it.
+
+PATENT MARKING NOTICE:
+
+  This software is covered by US Patent No. 8,185,551.
+  This software is covered by US Patent No. 8,489,638.
+
+PATENT RIGHTS GRANT:
+
+  "THIS IMPLEMENTATION" means the copyrightable works distributed by
+  Tokutek as part of the Fractal Tree project.
+
+  "PATENT CLAIMS" means the claims of patents that are owned or
+  licensable by Tokutek, both currently or in the future; and that in
+  the absence of this license would be infringed by THIS
+  IMPLEMENTATION or by using or running THIS IMPLEMENTATION.
+
+  "PATENT CHALLENGE" shall mean a challenge to the validity,
+  patentability, enforceability and/or non-infringement of any of the
+  PATENT CLAIMS or otherwise opposing any of the PATENT CLAIMS.
+
+  Tokutek hereby grants to you, for the term and geographical scope of
+  the PATENT CLAIMS, a non-exclusive, no-charge, royalty-free,
+  irrevocable (except as stated in this section) patent license to
+  make, have made, use, offer to sell, sell, import, transfer, and
+  otherwise run, modify, and propagate the contents of THIS
+  IMPLEMENTATION, where such license applies only to the PATENT
+  CLAIMS.  This grant does not include claims that would be infringed
+  only as a consequence of further modifications of THIS
+  IMPLEMENTATION.  If you or your agent or licensee institute or order
+  or agree to the institution of patent litigation against any entity
+  (including a cross-claim or counterclaim in a lawsuit) alleging that
+  THIS IMPLEMENTATION constitutes direct or contributory patent
+  infringement, or inducement of patent infringement, then any rights
+  granted to you under this License shall terminate as of the date
+  such litigation is filed.  If you or your agent or exclusive
+  licensee institute or order or agree to the institution of a PATENT
+  CHALLENGE, then Tokutek may terminate any rights granted to you
+  under this License.
+*/
+
+#ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
+#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <assert.h>
+#include <tokudb_vlq.h>
+
+namespace tokudb {
+    template size_t vlq_encode_ui(uint32_t n, void *p, size_t s);
+    template size_t vlq_decode_ui(uint32_t *np, void *p, size_t s);
+    template size_t vlq_encode_ui(uint64_t n, void *p, size_t s);
+    template size_t vlq_decode_ui(uint64_t *np, void *p, size_t s);
+};
+
+static void test_vlq_uint32(void) {
+    printf("%u\n", 0);
+    for (uint32_t v = 0; v < (1<<7); v++) {
+        unsigned char b[5];
+        size_t out_s = tokudb::vlq_encode_ui<uint32_t>(v, b, sizeof b);
+        assert(out_s == 1);
+        uint32_t n;
+        size_t in_s = tokudb::vlq_decode_ui<uint32_t>(&n, b, out_s);
+        assert(in_s == 1 && n == v);
+    }
+
+    printf("%u\n", 1<<7);
+    for (uint32_t v = (1<<7); v < (1<<14); v++) {
+        unsigned char b[5];
+        size_t out_s = tokudb::vlq_encode_ui<uint32_t>(v, b, sizeof b);
+        assert(out_s == 2);
+        uint32_t n;
+        size_t in_s = tokudb::vlq_decode_ui<uint32_t>(&n, b, out_s);
+        assert(in_s == 2 && n == v);
+    }
+
+    printf("%u\n", 1<<14);
+    for (uint32_t v = (1<<14); v < (1<<21); v++) {
+        unsigned char b[5];
+        size_t out_s = tokudb::vlq_encode_ui<uint32_t>(v, b, sizeof b);
+        assert(out_s == 3);
+        uint32_t n;
+        size_t in_s = tokudb::vlq_decode_ui<uint32_t>(&n, b, out_s);
+        assert(in_s == 3 && n == v);
+    }
+
+    printf("%u\n", 1<<21);
+    for (uint32_t v = (1<<21); v < (1<<28); v++) {
+        unsigned char b[5];
+        size_t out_s = tokudb::vlq_encode_ui<uint32_t>(v, b, sizeof b);
+        assert(out_s == 4);
+        uint32_t n;
+        size_t in_s = tokudb::vlq_decode_ui<uint32_t>(&n, b, out_s);
+        assert(in_s == 4 && n == v);
+    }
+
+    printf("%u\n", 1<<28);
+    for (uint32_t v = (1<<28); v != 0; v++) {
+        unsigned char b[5];
+        size_t out_s = tokudb::vlq_encode_ui<uint32_t>(v, b, sizeof b);
+        assert(out_s == 5);
+        uint32_t n;
+        size_t in_s = tokudb::vlq_decode_ui<uint32_t>(&n, b, out_s);
+        assert(in_s == 5 && n == v);
+    }
+}
+
+int main(void) {
+    test_vlq_uint32();
+    return 0;
+}

storage/tokudb/tests/vlq_test_uint64.cc

+/* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+// vim: ft=cpp:expandtab:ts=8:sw=4:softtabstop=4:
+#ident "$Id$"
+/*
+COPYING CONDITIONS NOTICE:
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of version 2 of the GNU General Public License as
+  published by the Free Software Foundation, and provided that the
+  following conditions are met:
+
+      * Redistributions of source code must retain this COPYING
+        CONDITIONS NOTICE, the COPYRIGHT NOTICE (below), the
+        DISCLAIMER (below), the UNIVERSITY PATENT NOTICE (below), the
+        PATENT MARKING NOTICE (below), and the PATENT RIGHTS
+        GRANT (below).
+
+      * Redistributions in binary form must reproduce this COPYING
+        CONDITIONS NOTICE, the COPYRIGHT NOTICE (below), the
+        DISCLAIMER (below), the UNIVERSITY PATENT NOTICE (below), the
+        PATENT MARKING NOTICE (below), and the PATENT RIGHTS
+        GRANT (below) in the documentation and/or other materials
+        provided with the distribution.
+
+  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., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+
+COPYRIGHT NOTICE:
+
+  TokuDB, Tokutek Fractal Tree Indexing Library.
+  Copyright (C) 2007-2013 Tokutek, Inc.
+
+DISCLAIMER:
+
+  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.
+
+UNIVERSITY PATENT NOTICE:
+
+  The technology is licensed by the Massachusetts Institute of
+  Technology, Rutgers State University of New Jersey, and the Research
+  Foundation of State University of New York at Stony Brook under
+  United States of America Serial No. 11/760379 and to the patents
+  and/or patent applications resulting from it.
+
+PATENT MARKING NOTICE:
+
+  This software is covered by US Patent No. 8,185,551.
+  This software is covered by US Patent No. 8,489,638.
+
+PATENT RIGHTS GRANT:
+
+  "THIS IMPLEMENTATION" means the copyrightable works distributed by
+  Tokutek as part of the Fractal Tree project.
+
+  "PATENT CLAIMS" means the claims of patents that are owned or
+  licensable by Tokutek, both currently or in the future; and that in
+  the absence of this license would be infringed by THIS
+  IMPLEMENTATION or by using or running THIS IMPLEMENTATION.
+
+  "PATENT CHALLENGE" shall mean a challenge to the validity,
+  patentability, enforceability and/or non-infringement of any of the
+  PATENT CLAIMS or otherwise opposing any of the PATENT CLAIMS.
+
+  Tokutek hereby grants to you, for the term and geographical scope of
+  the PATENT CLAIMS, a non-exclusive, no-charge, royalty-free,
+  irrevocable (except as stated in this section) patent license to
+  make, have made, use, offer to sell, sell, import, transfer, and
+  otherwise run, modify, and propagate the contents of THIS
+  IMPLEMENTATION, where such license applies only to the PATENT
+  CLAIMS.  This grant does not include claims that would be infringed
+  only as a consequence of further modifications of THIS
+  IMPLEMENTATION.  If you or your agent or licensee institute or order
+  or agree to the institution of patent litigation against any entity
+  (including a cross-claim or counterclaim in a lawsuit) alleging that
+  THIS IMPLEMENTATION constitutes direct or contributory patent
+  infringement, or inducement of patent infringement, then any rights
+  granted to you under this License shall terminate as of the date
+  such litigation is filed.  If you or your agent or exclusive
+  licensee institute or order or agree to the institution of a PATENT
+  CHALLENGE, then Tokutek may terminate any rights granted to you
+  under this License.
+*/
+
+#ident "Copyright (c) 2007-2013 Tokutek Inc.  All rights reserved."
+#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <assert.h>
+#include <tokudb_vlq.h>
+
+namespace tokudb {
+    template size_t vlq_encode_ui(uint32_t n, void *p, size_t s);
+    template size_t vlq_decode_ui(uint32_t *np, void *p, size_t s);
+    template size_t vlq_encode_ui(uint64_t n, void *p, size_t s);
+    template size_t vlq_decode_ui(uint64_t *np, void *p, size_t s);
+};
+
+// test a slice of the number space where the slice is described by
+// a start number and a stride through the space.
+static void test_vlq_uint64(uint64_t start, uint64_t stride) {
+    printf("%u\n", 0);
+    for (uint64_t v = 0 + start; v < (1<<7); v += stride) {
+        unsigned char b[10];
+        size_t out_s = tokudb::vlq_encode_ui<uint64_t>(v, b, sizeof b);
+        assert(out_s == 1);
+        uint64_t n;
+        size_t in_s = tokudb::vlq_decode_ui<uint64_t>(&n, b, out_s);
+        assert(in_s == 1 && n == v);
+    }
+
+    printf("%u\n", 1<<7);
+    for (uint64_t v = (1<<7) + start; v < (1<<14); v += stride) {
+        unsigned char b[10];
+        size_t out_s = tokudb::vlq_encode_ui<uint64_t>(v, b, sizeof b);
+        assert(out_s == 2);
+        uint64_t n;
+        size_t in_s = tokudb::vlq_decode_ui<uint64_t>(&n, b, out_s);
+        assert(in_s == 2 && n == v);
+    }
+
+    printf("%u\n", 1<<14);
+    for (uint64_t v = (1<<14) + start; v < (1<<21); v += stride) {
+        unsigned char b[10];
+        size_t out_s = tokudb::vlq_encode_ui<uint64_t>(v, b, sizeof b);
+        assert(out_s == 3);
+        uint64_t n;
+        size_t in_s = tokudb::vlq_decode_ui<uint64_t>(&n, b, out_s);
+        assert(in_s == 3 && n == v);
+    }
+
+    printf("%u\n", 1<<21);
+    for (uint64_t v = (1<<21) + start; v < (1<<28); v += stride) {
+        unsigned char b[10];
+        size_t out_s = tokudb::vlq_encode_ui<uint64_t>(v, b, sizeof b);
+        assert(out_s == 4);
+        uint64_t n;
+        size_t in_s = tokudb::vlq_decode_ui<uint64_t>(&n, b, out_s);
+        assert(in_s == 4 && n == v);
+    }
+
+    printf("%u\n", 1<<28);
+#if USE_OPENMP
+#pragma omp parallel num_threads(4)
+#pragma omp for
+#endif
+    for (uint64_t v = (1<<28) + start; v < (1ULL<<35); v += stride) {
+        unsigned char b[10];
+        size_t out_s = tokudb::vlq_encode_ui<uint64_t>(v, b, sizeof b);
+        assert(out_s == 5);
+        uint64_t n;
+        size_t in_s = tokudb::vlq_decode_ui<uint64_t>(&n, b, out_s);
+        assert(in_s == 5 && n == v);
+    }
+}
+
+int main(int argc, char *argv[]) {
+    uint64_t start = 0, stride = 1;
+    if (argc == 3) {
+        start = atoll(argv[1]);
+        stride = atoll(argv[2]);
+    }
+    test_vlq_uint64(start, stride);
+    return 0;
+}

storage/tokudb/tokudb_card.h

@@ -174,9 +174,14 @@ namespace tokudb {
         return false;
     }
 
+    static void copy_card(uint64_t *dest, uint64_t *src, size_t n) {
+        for (size_t i = 0; i < n; i++)
+            dest[i] = src[i];
+    }
+
     // Altered table cardinality = select cardinality data from current table cardinality for keys that exist 
     // in the altered table and the current table.
-    int set_card_from_status(DB *status_db, DB_TXN *txn, TABLE_SHARE *table_share, TABLE_SHARE *altered_table_share) {
+    int alter_card(DB *status_db, DB_TXN *txn, TABLE_SHARE *table_share, TABLE_SHARE *altered_table_share) {
         int error;
         // read existing cardinality data from status
         uint table_total_key_parts = tokudb::compute_total_key_parts(table_share);
@@ -201,7 +206,7 @@ namespace tokudb {
                 uint ith_key_parts = get_key_parts(&altered_table_share->key_info[i]);
                 uint orig_key_index;
                 if (find_index_of_key(altered_table_share->key_info[i].name, table_share, &orig_key_index)) {
-                    memcpy(&altered_rec_per_key[next_key_parts], &rec_per_key[orig_key_offset[orig_key_index]], ith_key_parts);
+                    copy_card(&altered_rec_per_key[next_key_parts], &rec_per_key[orig_key_offset[orig_key_index]], ith_key_parts);
                 }
                 next_key_parts += ith_key_parts;
             }
@@ -217,7 +222,7 @@ namespace tokudb {
     // For each key part, put records per key part in *rec_per_key_part[key_part_index].
     // Returns 0 if success, otherwise an error number.
     // TODO statistical dives into the FT
-    int analyze_card(DB *db, DB_TXN *txn, bool is_unique __attribute__((unused)), uint64_t num_key_parts, uint64_t *rec_per_key_part,
+    int analyze_card(DB *db, DB_TXN *txn, bool is_unique, uint64_t num_key_parts, uint64_t *rec_per_key_part,
                      int (*key_compare)(DB *, const DBT *, const DBT *, uint),
                      int (*analyze_progress)(void *extra, uint64_t rows), void *progress_extra) {
         int error = 0;