Merge lp:~vkolesnikov/pbxt/pbxt-mem-debugger-and-leaks into lp:pbxt

[Vladimir Kolesnikov]

[Paul McCullagh (paul-mccullagh)]

Hi Vlad,

I am wondering why this is necessary!

Surely "fkey->co_name" should be freed by: key->release(self).

key->release(self) should call XTDDConstraint::finalize():

 virtual void finalize(XTThreadPtr self) {
  if (co_name)
   xt_free(self, co_name);
  if (co_ind_name)
   xt_free(self, co_ind_name);
  co_cols.deleteAll(self);
  XTObject::finalize(self);
 }

fkey is a XTDDForeignKey which is a XTDDIndex which is a XTDDConstraint.

On Mar 11, 2009, at 4:45 PM, Vladimir Kolesnikov wrote:

> === modified file 'src/datadic_xt.cc'
> --- src/datadic_xt.cc 2009-01-21 13:55:57 +0000
> +++ src/datadic_xt.cc 2009-03-11 15:38:29 +0000
> @@ -1513,6 +1513,7 @@
> for (i=0; i<ct_curr_table->dt_fkeys.size(); i++) {
> fkey = ct_curr_table->dt_fkeys.itemAt(i);
> if (fkey->co_name && myxt_strcasecmp(con_name, fkey->co_name) ==
> 0) {
> + xt_free(self, fkey->co_name);
> ct_curr_table->dt_fkeys.remove(fkey);
> fkey->release(self);
> }

--
Paul McCullagh
PrimeBase Technologies
www.primebase.org
www.blobstreaming.org
pbxt.blogspot.com

[Vladimir Kolesnikov (vkolesnikov)]

Hi Paul,

please ignore the change to src/datadic_xt.cc. I think I made it prior to making the real fix (in the ha_pbxt.cc) and then forgot to recheck it. I just retested it and no leaks are reported w/o that line.

[lp:~vkolesnikov/pbxt/pbxt-mem-debugger-and-leaks]

582. By Vladimir Kolesnikov on 2009-03-18

merge from upstream

583. By Vladimir Kolesnikov on 2009-03-18

removed unneeded change

=== modified file 'ChangeLog'
--- ChangeLog	2009-03-05 15:28:42 +0000
+++ ChangeLog	2009-03-10 17:43:39 +0000
@@ -3,6 +3,10 @@
 
 ------- 1.0.08 RC - Not yet released
 
+RN226: Fixed bug #340316: Issue with bigint unsigned auto-increment field
+
+RN225: Fixed bug #308557: UPDATE fails to match all rows in a transactional scenario
+
 RN224: Fixed a deadlock which could occur during table scans.
 
 RN223: Index scans now use handles to cache buffers instead of making a copy of the index page. The handles are "copy-on-write".

=== modified file 'src/datadic_xt.cc'
--- src/datadic_xt.cc	2009-01-21 13:55:57 +0000
+++ src/datadic_xt.cc	2009-03-11 15:38:29 +0000
@@ -1513,6 +1513,7 @@
 		for (i=0; i<ct_curr_table->dt_fkeys.size(); i++) {
 			fkey = ct_curr_table->dt_fkeys.itemAt(i);
 			if (fkey->co_name && myxt_strcasecmp(con_name, fkey->co_name) == 0) {
+				xt_free(self, fkey->co_name);
 				ct_curr_table->dt_fkeys.remove(fkey);
 				fkey->release(self);
 			}

=== modified file 'src/ha_pbxt.cc'
--- src/ha_pbxt.cc	2009-02-27 09:22:44 +0000
+++ src/ha_pbxt.cc	2009-03-11 15:38:29 +0000
@@ -2065,7 +2065,7 @@
                                  MX_ULONGLONG_T *nb_reserved_values __attribute__((unused)))
 {
 	register XTTableHPtr	tab;
-	MX_ULONGLONG_T			nr;
+	MX_ULONGLONG_T			nr, nr_plus_inc;
 
 	ASSERT_NS(pb_ex_in_use);
 
@@ -2077,7 +2077,11 @@
 		nr = offset;
 	else if (increment > 1 && ((nr - offset) % increment) != 0)
 		nr += increment - ((nr - offset) % increment);
-	tab->tab_auto_inc = (xtWord8) (nr + increment);
+	nr_plus_inc = nr + increment;
+	if (table->next_number_field->cmp((const unsigned char *)&nr, (const unsigned char *)&nr_plus_inc) < 0)
+		tab->tab_auto_inc = (xtWord8) (nr_plus_inc);
+	else
+		nr = ~0;	/* indicate error to the caller */
 	xt_spinlock_unlock(&tab->tab_ainc_lock);
 
 	*first_value = nr;
@@ -2091,25 +2095,34 @@
  * insert into t1 values (-1);
  * insert into t1 values (NULL);
  */
-void ha_pbxt::set_auto_increment(MX_LONGLONG_T nr)
+void ha_pbxt::set_auto_increment(Field *nr)
 {
 	register XTTableHPtr	tab;
+	MX_ULONGLONG_T			nr_int_val;
+	
+	nr_int_val = nr->val_int();
+	tab = pb_open_tab->ot_table;
 
-	tab = pb_open_tab->ot_table;
-	if ((MX_LONGLONG_T) tab->tab_auto_inc <= nr) {
+	if (nr->cmp((const unsigned char *)&tab->tab_auto_inc) > 0) {
 		xt_spinlock_lock(&tab->tab_ainc_lock);
-		if ((MX_LONGLONG_T) tab->tab_auto_inc <= nr && nr > 0)
-			tab->tab_auto_inc = nr + 1;
+
+		if (nr->cmp((const unsigned char *)&tab->tab_auto_inc) > 0) {
+			MX_ULONGLONG_T nr_int_val_plus_one = nr_int_val + 1;
+			if (nr->cmp((const unsigned char *)&nr_int_val_plus_one) < 0)
+				tab->tab_auto_inc = nr_int_val_plus_one;
+			else
+				tab->tab_auto_inc = nr_int_val;
+		}
 		xt_spinlock_unlock(&tab->tab_ainc_lock);
 	}
 
 	if (xt_db_auto_increment_mode == 1) {
-		if (nr > (MX_LONGLONG_T) tab->tab_dic.dic_min_auto_inc) {
+		if (nr_int_val > (MX_ULONGLONG_T) tab->tab_dic.dic_min_auto_inc) {
 			/* Do this every 100 calls: */
 #ifdef DEBUG
-			tab->tab_dic.dic_min_auto_inc = nr + 5;
+			tab->tab_dic.dic_min_auto_inc = nr_int_val + 5;
 #else
-			tab->tab_dic.dic_min_auto_inc = nr + 100;
+			tab->tab_dic.dic_min_auto_inc = nr_int_val + 100;
 #endif
 			pb_open_tab->ot_thread = xt_get_self();
 			if (!xt_tab_write_min_auto_inc(pb_open_tab))
@@ -2187,8 +2200,12 @@
 		table->timestamp_field->set_time();
 
 	if (table->next_number_field && buf == table->record[0]) {
-		update_auto_increment();
-		set_auto_increment(table->next_number_field->val_int());
+		int err = update_auto_increment();
+		if (err) {
+			ha_log_pbxt_thread_error_for_mysql(pb_ignore_dup_key);
+			return err;
+		}
+		set_auto_increment(table->next_number_field);
 	}
 
 	if (!xt_tab_new_record(pb_open_tab, (xtWord1 *) buf))
@@ -2281,8 +2298,8 @@
 
 		old_map = mx_tmp_use_all_columns(table, table->read_set);
 		nr = table->found_next_number_field->val_int();
+		set_auto_increment(table->found_next_number_field);
 		mx_tmp_restore_column_map(table, old_map);
-		set_auto_increment(nr);
 	}
 
 	if (!xt_tab_update_record(pb_open_tab, (xtWord1 *) old_data, (xtWord1 *) new_data))
@@ -4788,6 +4805,8 @@
 		xt_create_table(self, (XTPathStrPtr) table_path, &dic);
 	}
 	catch_(a) {
+		if (tab_def)
+			tab_def->finalize(self);
 		err = xt_ha_pbxt_thread_error_for_mysql(thd, self, pb_ignore_dup_key);
 	}
 	cont_(a);

=== modified file 'src/ha_pbxt.h'
--- src/ha_pbxt.h	2008-12-10 20:34:30 +0000
+++ src/ha_pbxt.h	2009-03-10 17:43:39 +0000
@@ -171,7 +171,7 @@
                                  MX_ULONGLONG_T nb_desired_values,
                                  MX_ULONGLONG_T *first_value,
                                  MX_ULONGLONG_T *nb_reserved_values);
-	void	set_auto_increment(MX_LONGLONG_T nr);
+	void	set_auto_increment(Field *nr);
 
 	int		write_row(byte * buf);
 	int		update_row(const byte * old_data, byte * new_data);

=== modified file 'src/index_xt.cc'
--- src/index_xt.cc	2009-03-06 13:40:00 +0000
+++ src/index_xt.cc	2009-03-10 08:28:54 +0000
@@ -2327,7 +2327,9 @@
 #endif
 	ASSERT_NS(ot->ot_ind_rhandle);
 	xt_ind_lock_handle(ot->ot_ind_rhandle);
-	if (!ot->ot_ind_state.i_node_ref_size && ot->ot_ind_state.i_item_offset < ot->ot_ind_state.i_total_size) {
+	if (!ot->ot_ind_state.i_node_ref_size && 
+		ot->ot_ind_state.i_item_offset < ot->ot_ind_state.i_total_size && 
+		ot->ot_ind_rhandle->ih_cache_reference) {
 		key_value.sv_key = &ot->ot_ind_rhandle->ih_branch->tb_data[ot->ot_ind_state.i_item_offset];
 		key_value.sv_length = ot->ot_ind_state.i_item_size - XT_RECORD_REF_SIZE;
 

=== modified file 'src/memory_xt.cc'
--- src/memory_xt.cc	2009-02-05 11:30:34 +0000
+++ src/memory_xt.cc	2009-03-11 15:38:29 +0000
@@ -376,7 +376,7 @@
 		/* Not enough space, add more: */
 		MissingMemoryRec *new_addresses;
 
-		new_addresses = (MissingMemoryRec *) malloc(sizeof(MissingMemoryRec) * (mm_total_allocated + ADD_TOTAL_ALLOCS));
+		new_addresses = (MissingMemoryRec *) xt_calloc_ns(sizeof(MissingMemoryRec) * (mm_total_allocated + ADD_TOTAL_ALLOCS));
 		if (!new_addresses)
 			return(-1);
 

=== modified file 'test/mysql-test/r/pbxt_bugs.result'
--- test/mysql-test/r/pbxt_bugs.result	2008-12-16 13:39:34 +0000
+++ test/mysql-test/r/pbxt_bugs.result	2009-03-11 11:18:00 +0000
@@ -986,3 +986,62 @@
 insert into t1 values ("1");
 insert into t2 values ("1");
 DROP TABLE IF EXISTS t2,t1;
+DROP TABLE IF EXISTS t5;
+CREATE TABLE t5 (
+c1 BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, 
+c2 BIGINT SIGNED NULL, 
+c3 BIGINT SIGNED NOT NULL, 
+c4 TINYINT, c5 SMALLINT, 
+c6 MEDIUMINT, 
+c7 INT, 
+c8 INTEGER, 
+PRIMARY KEY(c1,c2), UNIQUE INDEX(c3));
+INSERT INTO t5 VALUES
+(0,-9223372036854775808,1,2,3,4,5,5),
+(255,-2147483648,6,7,8,9,10,10),
+(65535,-8388608,11,12,13,14,15,15),
+(16777215,-32768,16,17,18,19,20,20),
+(4294967295,-128,21,22,23,24,25,25),
+(18446744073709551615,9223372036854775807,26,27,28,29,30,30);
+INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
+ERROR HY000: Failed to read auto-increment value from storage engine
+INSERT INTO t5(c2,c3) VALUES(33,34);
+ERROR HY000: Failed to read auto-increment value from storage engine
+SELECT * FROM t5;
+c1	c2	c3	c4	c5	c6	c7	c8
+1	-9223372036854775808	1	2	3	4	5	5
[phone]	8	9	10	10
[phone]	12	13	14	15	15
[phone]	17	18	19	20	20
[phone]	22	23	24	25	25
+18446744073709551615	9223372036854775807	26	27	28	29	30	30
+DROP TABLE t5;
+/* same test as above with signed bigint */
+CREATE TABLE t5 (
+c1 BIGINT SIGNED NOT NULL AUTO_INCREMENT, 
+c2 BIGINT SIGNED NULL, 
+c3 BIGINT SIGNED NOT NULL, 
+c4 TINYINT, c5 SMALLINT, 
+c6 MEDIUMINT, 
+c7 INT, 
+c8 INTEGER, 
+PRIMARY KEY(c1,c2), UNIQUE INDEX(c3));
+INSERT INTO t5 VALUES
+(0,-9223372036854775808,1,2,3,4,5,5),
+(255,-2147483648,6,7,8,9,10,10),
+(65535,-8388608,11,12,13,14,15,15),
+(16777215,-32768,16,17,18,19,20,20),
+(4294967295,-128,21,22,23,24,25,25),
+(9223372036854775807,9223372036854775807,26,27,28,29,30,30);
+INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
+ERROR HY000: Failed to read auto-increment value from storage engine
+INSERT INTO t5(c2,c3) VALUES(33,34);
+ERROR HY000: Failed to read auto-increment value from storage engine
+SELECT * FROM t5;
+c1	c2	c3	c4	c5	c6	c7	c8
+1	-9223372036854775808	1	2	3	4	5	5
[phone]	8	9	10	10
[phone]	12	13	14	15	15
[phone]	17	18	19	20	20
[phone]	22	23	24	25	25
+9223372036854775807	9223372036854775807	26	27	28	29	30	30

=== modified file 'test/mysql-test/t/pbxt_bugs.test'
--- test/mysql-test/t/pbxt_bugs.test	2008-12-16 13:39:34 +0000
+++ test/mysql-test/t/pbxt_bugs.test	2009-03-11 11:18:00 +0000
@@ -807,3 +807,61 @@
 insert into t2 values ("1");
 
 DROP TABLE IF EXISTS t2,t1;
+
+# bug 340316: Issue with bigint unsigned auto-increment field
+
+--disable_warnings
+DROP TABLE IF EXISTS t5;
+--enable_warnings
+CREATE TABLE t5 (
+	c1 BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, 
+	c2 BIGINT SIGNED NULL, 
+	c3 BIGINT SIGNED NOT NULL, 
+	c4 TINYINT, c5 SMALLINT, 
+	c6 MEDIUMINT, 
+	c7 INT, 
+	c8 INTEGER, 
+	PRIMARY KEY(c1,c2), UNIQUE INDEX(c3));
+
+INSERT INTO t5 VALUES
+	(0,-9223372036854775808,1,2,3,4,5,5),
+	(255,-2147483648,6,7,8,9,10,10),
+	(65535,-8388608,11,12,13,14,15,15),
+	(16777215,-32768,16,17,18,19,20,20),
+	(4294967295,-128,21,22,23,24,25,25),
+	(18446744073709551615,9223372036854775807,26,27,28,29,30,30);
+
+--error 1467
+INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
+--error 1467
+INSERT INTO t5(c2,c3) VALUES(33,34);
+
+SELECT * FROM t5;
+
+DROP TABLE t5;
+
+/* same test as above with signed bigint */
+CREATE TABLE t5 (
+	c1 BIGINT SIGNED NOT NULL AUTO_INCREMENT, 
+	c2 BIGINT SIGNED NULL, 
+	c3 BIGINT SIGNED NOT NULL, 
+	c4 TINYINT, c5 SMALLINT, 
+	c6 MEDIUMINT, 
+	c7 INT, 
+	c8 INTEGER, 
+	PRIMARY KEY(c1,c2), UNIQUE INDEX(c3));
+
+INSERT INTO t5 VALUES
+	(0,-9223372036854775808,1,2,3,4,5,5),
+	(255,-2147483648,6,7,8,9,10,10),
+	(65535,-8388608,11,12,13,14,15,15),
+	(16777215,-32768,16,17,18,19,20,20),
+	(4294967295,-128,21,22,23,24,25,25),
+	(9223372036854775807,9223372036854775807,26,27,28,29,30,30);
+
+--error 1467
+INSERT INTO t5(c2,c3) VALUES(33,34) /* tries to increment out of range */;
+--error 1467
+INSERT INTO t5(c2,c3) VALUES(33,34);
+
+SELECT * FROM t5;