bzr commit into mysql-6.0-falcon-team branch (klewis:2871) Bug#40123

[Kevin Lewis]

  2871 Kevin Lewis	2008-10-20
       Bug#40123 - Make the upper limit of falcon-serial-log-buffer=1000
       Since the minimum value is referenced in a number of places,
       make a #define SRL_MIN_WINDOWS
modified:
   storage/falcon/Configuration.cpp
   storage/falcon/SerialLog.cpp
   storage/falcon/SerialLog.h
   storage/falcon/StorageParameters.h

=== modified file 'storage/falcon/Configuration.cpp'
--- a/storage/falcon/Configuration.cpp	2008-09-11 11:10:22 +0000
+++ b/storage/falcon/Configuration.cpp	2008-10-20 21:28:11 +0000
@@ -146,7 +146,7 @@ Configuration::Configuration(const char
  	recordScavengeFloorPct		= 33;
  	recordScavengeThreshold		= (recordMemoryMax * 100) / 
recordScavengeThresholdPct;
  	recordScavengeFloor			= (recordMemoryMax * 100) / recordScavengeFloorPct;
-	serialLogWindows			= 10;
+	serialLogWindows			= 10;	// same as SRL_MIN_WINDOWS
  	allocationExtent			= 10;
  	pageCacheSize				= getMemorySize(PAGE_CACHE_MEMORY);
  	indexChillThreshold			= 4 * ONE_MB;

=== modified file 'storage/falcon/SerialLog.cpp'
--- a/storage/falcon/SerialLog.cpp	2008-10-14 13:00:31 +0000
+++ b/storage/falcon/SerialLog.cpp	2008-10-20 21:28:11 +0000
@@ -117,7 +117,7 @@ SerialLog::SerialLog(Database *db, JStri
  	recovering = false;
  	blocking = false;
  	writeError = false;
-	windowBuffers = MAX(database->configuration->serialLogWindows, 10);
+	windowBuffers = MAX(database->configuration->serialLogWindows, 
SRL_MIN_WINDOWS);
  	tableSpaceInfo = NULL;
  	memset(tableSpaces, 0, sizeof(tableSpaces));
  	syncWrite.setName("SerialLog::syncWrite");

=== modified file 'storage/falcon/SerialLog.h'
--- a/storage/falcon/SerialLog.h	2008-10-14 13:00:31 +0000
+++ b/storage/falcon/SerialLog.h	2008-10-20 21:28:11 +0000
@@ -34,6 +34,7 @@ static const unsigned int altLogFlag	= 0
  static const int srlSignature			= 123456789;
  static const int SLT_HASH_SIZE			= 1001;
  static const int SRL_WINDOW_SIZE		= 1048576;
+#define SRL_MIN_WINDOWS   10

  // States for recovery objects


=== modified file 'storage/falcon/StorageParameters.h'
--- a/storage/falcon/StorageParameters.h	2008-09-28 11:32:52 +0000
+++ b/storage/falcon/StorageParameters.h	2008-10-20 21:28:11 +0000
@@ -10,6 +10,9 @@
  // #define PLUGIN_VAR_NOCMDARG     0x1000 = No argument for cmd line
  // #define PLUGIN_VAR_OPCMDARG     0x2000 = Argument optional for cmd line
  // #define PLUGIN_VAR_MEMALLOC     0x8000 = String needs memory allocated
+#ifndef SRL_MIN_WINDOWS
+#define SRL_MIN_WINDOWS  10
+#endif

  PARAMETER_BOOL(checksums, "Enable Falcon checksum validation", 1, 
0x200, NULL)
  PARAMETER_UINT(debug_mask, "Falcon message type mask for logged 
messages.", 0, 0, INT_MAX, 0, StorageInterface::updateDebugMask)
@@ -26,7 +29,7 @@ PARAMETER_UINT(record_chill_threshold, "
  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)
  PARAMETER_UINT(record_scavenge_threshold, "The percentage of 
falcon_record_memory_max that will cause the scavenger thread to start 
scavenging records from the record cache.", 10, 67, 100, 0x2000, 
&StorageInterface::updateRecordScavengeThreshold)
  PARAMETER_UINT(serial_log_block_size, "Minimum block size for serial 
log.", 0, 0, 4096, 0, NULL)
-PARAMETER_UINT(serial_log_buffers, "The number of buffers allocated for 
Falcon serial log.", 10, 20, 32768, 0x0200, NULL)
+PARAMETER_UINT(serial_log_buffers, "The number of buffers allocated for 
Falcon serial log.", SRL_MIN_WINDOWS, 20, 1000, 0x0200, NULL)
  PARAMETER_UINT(serial_log_priority, "Whether or not serial log has 
write priority over other writes.", 0, 1, 1, 0, NULL)
  PARAMETER_BOOL(use_deferred_index_hash, "Use Deferred Index hash 
lookup", 0, 0, NULL)
  PARAMETER_BOOL(support_xa, "Enable XA two phase commit", 0, 0x0200, NULL)


-- 
MySQL Code Commits Mailing List
For list archives: http://lists.mysql.com/commits
To unsubscribe:    http://lists.mysql.com/commits?unsub=1