bzr commit into mysql-6.0-falcon branch (lars-erik.bjork:2723) Bug#36991

[lars-erik.bjork]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-falcon/

 2723 lars-erik.bjork@stripped	2008-07-03
      bug#36991 falcon_max_transaction_backlog has no effect
      
      I have changed the maxTransactionBacklog to 1000 and have made the value
      unconfigurable.
modified:
  mysql-test/suite/falcon/r/falcon_options.result
  mysql-test/suite/falcon/r/falcon_options2.result
  mysql-test/suite/falcon/t/falcon_options.test
  mysql-test/suite/falcon/t/falcon_options2.test
  storage/falcon/Configuration.cpp
  storage/falcon/StorageParameters.h

per-file messages:
  mysql-test/suite/falcon/r/falcon_options.result
    Removed results regarding falcon_max_transaction_backlog
  mysql-test/suite/falcon/r/falcon_options2.result
    Removed results regarding falcon_max_transaction_backlog
  mysql-test/suite/falcon/t/falcon_options.test
    Removed tests regarding falcon_max_transaction_backlog
  mysql-test/suite/falcon/t/falcon_options2.test
    Removed tests regarding falcon_max_transaction_backlog
  storage/falcon/Configuration.cpp
    Using the same value for maxTransactionBacklog both when STORAGE_ENGINE is defined and
    when it is not. Changing this value from 10000 to 1000
  storage/falcon/StorageParameters.h
    Avoid creating a sysvar for falcon_max_transaction_backlog
=== modified file 'mysql-test/suite/falcon/r/falcon_options.result'
--- a/mysql-test/suite/falcon/r/falcon_options.result	2008-06-26 13:30:24 +0000
+++ b/mysql-test/suite/falcon/r/falcon_options.result	2008-07-03 11:24:12 +0000
@@ -12,7 +12,6 @@ falcon_initial_allocation	0
 falcon_io_threads	2
 falcon_large_blob_threshold	160000
 falcon_lock_wait_timeout	50
-falcon_max_transaction_backlog	150
 falcon_page_cache_size	4194304
 falcon_page_size	4096
 falcon_record_chill_threshold	5242880
@@ -60,14 +59,6 @@ SET GLOBAL falcon_debug_mask = 4096;
 SELECT @@GLOBAL.falcon_debug_mask;
 @@GLOBAL.falcon_debug_mask
 4096
-SELECT @@GLOBAL.falcon_max_transaction_backlog INTO
@previous_falcon_max_transaction_backlog;
-SELECT @@GLOBAL.falcon_max_transaction_backlog;
-@@GLOBAL.falcon_max_transaction_backlog
-150
-SET GLOBAL falcon_max_transaction_backlog = 10001;
-SELECT @@GLOBAL.falcon_max_transaction_backlog;
-@@GLOBAL.falcon_max_transaction_backlog
-10001
 SELECT @@GLOBAL.falcon_record_memory_max INTO @previous_falcon_record_memory_max;
 SELECT @@GLOBAL.falcon_record_memory_max;
 @@GLOBAL.falcon_record_memory_max
@@ -101,7 +92,6 @@ FALCON_INITIAL_ALLOCATION	0
 FALCON_IO_THREADS	2
 FALCON_LARGE_BLOB_THRESHOLD	160000
 FALCON_LOCK_WAIT_TIMEOUT	50
-FALCON_MAX_TRANSACTION_BACKLOG	10001
 FALCON_PAGE_CACHE_SIZE	4194304
 FALCON_PAGE_SIZE	4096
 FALCON_RECORD_CHILL_THRESHOLD	1073741824
@@ -117,7 +107,6 @@ FALCON_SERIAL_LOG_PRIORITY	1
 FALCON_SUPPORT_XA	OFF
 FALCON_USE_DEFERRED_INDEX_HASH	OFF
 SET GLOBAL falcon_debug_mask = @previous_falcon_debug_mask;
-SET GLOBAL falcon_max_transaction_backlog =  @previous_falcon_max_transaction_backlog;
 SET GLOBAL falcon_record_memory_max =  @previous_falcon_record_memory_max;
 SET GLOBAL falcon_index_chill_threshold = @previous_falcon_index_chill_threshold;
 SET GLOBAL falcon_record_chill_threshold = @previous_falcon_record_chill_threshold;

=== modified file 'mysql-test/suite/falcon/r/falcon_options2.result'
--- a/mysql-test/suite/falcon/r/falcon_options2.result	2008-06-26 13:30:24 +0000
+++ b/mysql-test/suite/falcon/r/falcon_options2.result	2008-07-03 11:24:12 +0000
@@ -13,7 +13,6 @@ FALCON_INITIAL_ALLOCATION	0
 FALCON_IO_THREADS	2
 FALCON_LARGE_BLOB_THRESHOLD	160000
 FALCON_LOCK_WAIT_TIMEOUT	50
-FALCON_MAX_TRANSACTION_BACKLOG	150
 FALCON_PAGE_CACHE_SIZE	4194304
 FALCON_PAGE_SIZE	4096
 FALCON_RECORD_CHILL_THRESHOLD	5242880
@@ -64,9 +63,6 @@ SELECT @@falcon_large_blob_threshold;
 SELECT @@falcon_lock_wait_timeout;
 @@falcon_lock_wait_timeout
 50
-SELECT @@falcon_max_transaction_backlog;
-@@falcon_max_transaction_backlog
-150
 SELECT @@falcon_page_cache_size;
 @@falcon_page_cache_size
 4194304

=== modified file 'mysql-test/suite/falcon/t/falcon_options.test'
--- a/mysql-test/suite/falcon/t/falcon_options.test	2008-06-26 13:30:24 +0000
+++ b/mysql-test/suite/falcon/t/falcon_options.test	2008-07-03 11:24:12 +0000
@@ -32,11 +32,6 @@ SELECT @@GLOBAL.falcon_debug_mask;
 SET GLOBAL falcon_debug_mask = 4096;
 SELECT @@GLOBAL.falcon_debug_mask;
 
-SELECT @@GLOBAL.falcon_max_transaction_backlog INTO
@previous_falcon_max_transaction_backlog;
-SELECT @@GLOBAL.falcon_max_transaction_backlog;
-SET GLOBAL falcon_max_transaction_backlog = 10001;
-SELECT @@GLOBAL.falcon_max_transaction_backlog;
-
 SELECT @@GLOBAL.falcon_record_memory_max INTO @previous_falcon_record_memory_max;
 SELECT @@GLOBAL.falcon_record_memory_max;
 SET GLOBAL falcon_record_memory_max = 536870912;
@@ -58,7 +53,6 @@ SELECT * FROM INFORMATION_SCHEMA.global_
 
 # Final cleanup.
 SET GLOBAL falcon_debug_mask = @previous_falcon_debug_mask;
-SET GLOBAL falcon_max_transaction_backlog =  @previous_falcon_max_transaction_backlog;
 SET GLOBAL falcon_record_memory_max =  @previous_falcon_record_memory_max;
 SET GLOBAL falcon_index_chill_threshold = @previous_falcon_index_chill_threshold;
 SET GLOBAL falcon_record_chill_threshold = @previous_falcon_record_chill_threshold;

=== modified file 'mysql-test/suite/falcon/t/falcon_options2.test'
--- a/mysql-test/suite/falcon/t/falcon_options2.test	2008-03-11 16:15:47 +0000
+++ b/mysql-test/suite/falcon/t/falcon_options2.test	2008-07-03 11:24:12 +0000
@@ -18,7 +18,6 @@ SELECT @@falcon_initial_allocation;
 SELECT @@falcon_io_threads;
 SELECT @@falcon_large_blob_threshold;
 SELECT @@falcon_lock_wait_timeout;
-SELECT @@falcon_max_transaction_backlog;
 SELECT @@falcon_page_cache_size;
 SELECT @@falcon_page_size;
 SELECT @@falcon_record_chill_threshold;

=== modified file 'storage/falcon/Configuration.cpp'
--- a/storage/falcon/Configuration.cpp	2008-06-26 13:30:24 +0000
+++ b/storage/falcon/Configuration.cpp	2008-07-03 11:24:12 +0000
@@ -99,7 +99,7 @@ static const uint64 MIN_PAGE_CACHE			= 2
 static const uint64 MIN_RECORD_MEMORY		= 5000000;
 static const int	MIN_SCAVENGE_THRESHOLD	= 10;
 static const int	MIN_SCAVENGE_FLOOR		= 10;
-static const uint64 MAX_TRANSACTION_BACKLOG	= 10000;
+static const uint64 MAX_TRANSACTION_BACKLOG	= 1000;
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -110,6 +110,7 @@ Configuration::Configuration(const char 
 	checkpointSchedule = "7,37 * * * * *";
 	scavengeSchedule = "15,45 * * * * *";
 	serialLogBlockSize			= falcon_serial_log_block_size;
+	maxTransactionBacklog		        = MAX_TRANSACTION_BACKLOG;
 
 #ifdef STORAGE_ENGINE
 	recordMemoryMax				= falcon_record_memory_max;
@@ -121,7 +122,6 @@ Configuration::Configuration(const char 
 	pageCacheSize				= falcon_page_cache_size;
 	indexChillThreshold			= falcon_index_chill_threshold;
 	recordChillThreshold		= falcon_record_chill_threshold;
-	maxTransactionBacklog		= falcon_max_transaction_backlog;
 	useDeferredIndexHash		= (falcon_use_deferred_index_hash != 0);
 	
 	if (falcon_checkpoint_schedule)
@@ -169,7 +169,6 @@ Configuration::Configuration(const char 
 	pageCacheSize				= getMemorySize(PAGE_CACHE_MEMORY);
 	indexChillThreshold			= 4 * ONE_MB;
 	recordChillThreshold		= 5 * ONE_MB;
-	maxTransactionBacklog		= MAX_TRANSACTION_BACKLOG;
 	falcon_lock_wait_timeout	= 0;
 #endif
 

=== modified file 'storage/falcon/StorageParameters.h'
--- a/storage/falcon/StorageParameters.h	2008-06-26 13:30:24 +0000
+++ b/storage/falcon/StorageParameters.h	2008-07-03 11:24:12 +0000
@@ -21,7 +21,6 @@ PARAMETER_UINT(index_chill_threshold, "B
 PARAMETER_UINT(io_threads, "Number of Falcon I/O threads", 2, 2, 20, 0, NULL)
 PARAMETER_UINT(large_blob_threshold, "Threshold for large blobs", 0, 160000, INT_MAX, 0,
NULL)
 PARAMETER_UINT(lock_wait_timeout, "Transaction lock time period (seconds)", 0, 50,
INT_MAX, 0, NULL)
-PARAMETER_UINT(max_transaction_backlog, "Maximum number of backlogged transactions.", 1,
150, 1000000, 0, NULL)
 PARAMETER_UINT(page_size, "The page size used when creating a Falcon tablespace.", 1024,
4096, 32768, 0x0200, NULL)
 PARAMETER_UINT(record_chill_threshold, "Bytes of pending record data that is 'frozen' to
the Falcon serial log.", 1, 5*1024*1024, 1024*1024*1024, 0,
&updateRecordChillThreshold)
 PARAMETER_UINT(record_scavenge_floor, "A percentage of falcon_record_memory_threshold
that defines the amount of record data that will remain in the record cache after a
scavenge run.", 10, 50, 90, 0x2000, &StorageInterface::updateRecordScavengeFloor)