bzr push into mysql-6.0-falcon branch (klewis:2731)

[Kevin Lewis]

 2731 Kevin Lewis	2008-07-10
      Set falcon_use_sectorcache default to OFF.  Initial tests
      show a performance drop on DBT2.  Once we have more 
      information and have refined this, we can reconsider.
modified:
  mysql-test/suite/falcon/r/falcon_options.result
  mysql-test/suite/falcon/r/falcon_options2.result
  mysql-test/suite/falcon/t/falcon_options2.test
  storage/falcon/SectorBuffer.cpp
  storage/falcon/StorageHandler.cpp
  storage/falcon/StorageParameters.h

=== modified file 'mysql-test/suite/falcon/r/falcon_options.result'
--- a/mysql-test/suite/falcon/r/falcon_options.result	2008-07-10 12:59:05 +0000
+++ b/mysql-test/suite/falcon/r/falcon_options.result	2008-07-10 19:00:14 +0000
@@ -27,7 +27,7 @@ falcon_serial_log_file_size	10485760
 falcon_serial_log_priority	1
 falcon_support_xa	OFF
 falcon_use_deferred_index_hash	OFF
-falcon_use_sectorcache	ON
+falcon_use_sectorcache	OFF
 falcon_use_supernodes	ON
 SELECT @@GLOBAL.falcon_debug_server;
 @@GLOBAL.falcon_debug_server
@@ -110,7 +110,7 @@ FALCON_SERIAL_LOG_FILE_SIZE	10485760
 FALCON_SERIAL_LOG_PRIORITY	1
 FALCON_SUPPORT_XA	OFF
 FALCON_USE_DEFERRED_INDEX_HASH	OFF
-FALCON_USE_SECTORCACHE	ON
+FALCON_USE_SECTORCACHE	OFF
 FALCON_USE_SUPERNODES	ON
 SET GLOBAL falcon_debug_mask = @previous_falcon_debug_mask;
 SET GLOBAL falcon_record_memory_max =  @previous_falcon_record_memory_max;

=== modified file 'mysql-test/suite/falcon/r/falcon_options2.result'
--- a/mysql-test/suite/falcon/r/falcon_options2.result	2008-07-10 18:23:51 +0000
+++ b/mysql-test/suite/falcon/r/falcon_options2.result	2008-07-10 19:00:14 +0000
@@ -28,7 +28,7 @@ FALCON_SERIAL_LOG_FILE_SIZE	10485760
 FALCON_SERIAL_LOG_PRIORITY	1
 FALCON_SUPPORT_XA	OFF
 FALCON_USE_DEFERRED_INDEX_HASH	OFF
-FALCON_USE_SECTORCACHE	ON
+FALCON_USE_SECTORCACHE	OFF
 FALCON_USE_SUPERNODES	ON
 SELECT @@falcon_checkpoint_schedule;
 @@falcon_checkpoint_schedule
@@ -102,3 +102,9 @@ SELECT @@falcon_serial_log_priority;
 SELECT @@falcon_use_deferred_index_hash;
 @@falcon_use_deferred_index_hash
 0
+SELECT @@falcon_use_sectorcache;
+@@falcon_use_sectorcache
+0
+SELECT @@falcon_use_supernodes;
+@@falcon_use_supernodes
+1

=== modified file 'mysql-test/suite/falcon/t/falcon_options2.test'
--- a/mysql-test/suite/falcon/t/falcon_options2.test	2008-07-03 11:24:12 +0000
+++ b/mysql-test/suite/falcon/t/falcon_options2.test	2008-07-10 19:00:14 +0000
@@ -30,3 +30,5 @@ SELECT @@falcon_serial_log_buffers;
 SELECT @@falcon_serial_log_dir;
 SELECT @@falcon_serial_log_priority;
 SELECT @@falcon_use_deferred_index_hash;
+SELECT @@falcon_use_sectorcache;
+SELECT @@falcon_use_supernodes;

=== modified file 'storage/falcon/SectorBuffer.cpp'
--- a/storage/falcon/SectorBuffer.cpp	2008-07-07 14:00:45 +0000
+++ b/storage/falcon/SectorBuffer.cpp	2008-07-10 19:00:14 +0000
@@ -54,8 +54,6 @@ void SectorBuffer::readPage(Bdb* bdb)
 		page->checksum = NO_CHECKSUM_MAGIC;
 		}
 	memcpy(bdb->buffer, page, pageSize);
-
-
 }
 
 void SectorBuffer::readSector()

=== modified file 'storage/falcon/StorageHandler.cpp'
--- a/storage/falcon/StorageHandler.cpp	2008-04-29 10:34:12 +0000
+++ b/storage/falcon/StorageHandler.cpp	2008-07-10 19:00:14 +0000
@@ -992,7 +992,7 @@ void StorageHandler::initialize(void)
 		
 		if (err == OUT_OF_MEMORY_ERROR || err == FILE_ACCESS_ERROR || err == VERSION_ERROR)
 			throw;
-               
+
 		defaultDatabase->createDatabase();
 		IO::deleteFile(FALCON_USER);
 		IO::deleteFile(FALCON_TEMPORARY);

=== modified file 'storage/falcon/StorageParameters.h'
--- a/storage/falcon/StorageParameters.h	2008-07-10 12:59:05 +0000
+++ b/storage/falcon/StorageParameters.h	2008-07-10 19:00:14 +0000
@@ -31,4 +31,4 @@ PARAMETER_UINT(serial_log_priority, "Whe
 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)
 PARAMETER_BOOL(use_supernodes, "Use supernodes in Falcon index", 1, 0x0000, NULL)
-PARAMETER_BOOL(use_sectorcache, "Use sector cache (on=disk reads are 64KB, off=disk reads are page size)", 1, 0x0000, NULL)
+PARAMETER_BOOL(use_sectorcache, "Use sector cache (on=disk reads are 64KB, off=disk reads are page size)", 0, 0x0000, NULL)