bk commit into 6.0 tree (jas:1.2661)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0 repository of . When  does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-17 11:11:29-04:00, jas@rowvwade. +1 -0
  Tweak page page cache manager to recover page consolidation.

  storage/falcon/Cache.cpp@stripped, 2007-10-17 11:11:23-04:00, jas@rowvwade. +21 -7
    Tweak page page cache manager to recover page consolidation.

diff -Nrup a/storage/falcon/Cache.cpp b/storage/falcon/Cache.cpp
--- a/storage/falcon/Cache.cpp	2007-10-16 16:38:19 -04:00
+++ b/storage/falcon/Cache.cpp	2007-10-17 11:11:23 -04:00
@@ -337,6 +337,10 @@ void Cache::flush(int64 arg)
 	Sync flushLock(&syncFlush, "Cache::ioThread");
 	Sync sync(&syncDirty, "Cache::ioThread");
 	flushLock.lock(Exclusive);
+	
+	if (flushing)
+		return;
+
 	sync.lock(Shared);
 	flushArg = arg;
 	flushPages = 0;
@@ -350,6 +354,9 @@ void Cache::flush(int64 arg)
 		}
 
 	/***
+	char dumpName[256];
+	sprintf(dumpName, "pages-%d.txt", database->deltaTime);
+	FILE *file = fopen(dumpName, "w");
 	int start = 0;
 	int last = 0;
 	int runs = 0;
@@ -362,16 +369,18 @@ void Cache::flush(int64 arg)
 			{
 			if (last - start > 1)
 				{
+				fprintf(file, "\n%d - %d\n", start, last);
 				//Log::debug(" Flush run of %d pages starting at %d\n", last - start, start);
 				++runs;
 				runPages += last - start;
 				}
-				
+			
+			fprintf(file, "%d ", n);
 			last = start = n;
 			}
 	
-	if (runs > 0)
-		Log::debug("Flush: %d runs of %d pages out of %d\n", runs, runPages, flushPages);			
+	fprintf(file, "\n");
+	fclose(file);
 	***/
 			
 	flushStart = database->timestamp;
@@ -964,10 +973,11 @@ void Cache::ioThread(void)
 			// Look for a page to flush
 			
 			for (Bdb *bdb = hashTable [slot]; bdb; bdb = bdb->hash)
-				if (bdb->pageNumber == pageNumber && bdb->flushIt &&
(bdb->flags & BDB_dirty))
+				if (bdb->pageNumber == pageNumber && bdb->flushIt &&
(bdb->flags & (BDB_dirty || BDB_new)))
 					{
 					hit = true;
 					int32 pageNumber = bdb->pageNumber;
+					int count = 0;
 					Dbb *dbb = bdb->dbb;
 					
 					if (!bdb->hash)
@@ -975,6 +985,7 @@ void Cache::ioThread(void)
 					
 					while (p < end)
 						{
+						++count;
 						bdb->syncWrite.lock(NULL, Exclusive);
 						bdb->ioThreadNext = bdbList;
 						bdbList = bdb;
@@ -994,6 +1005,7 @@ void Cache::ioThread(void)
 					
 					sync.unlock();
 					flushLock.unlock();
+					//Log::debug(" Writing %s %d pages: %d - %d\n", dbb->fileName, count, pageNumber,
pageNumber + count - 1);
 					int length = p - buffer;
 					
 					/***
@@ -1027,13 +1039,15 @@ void Cache::ioThread(void)
 			{
 			if (flushing)
 				{
+				int writes = physicalWrites;
+				int pages = flushPages;
+				int delta = database->timestamp - flushStart;
 				flushing = false;
 				flushLock.unlock();
-				int delta = database->timestamp - flushStart;
 				
-				if (delta > 1)
+				if (writes > 0)
 					Log::log(LogInfo, "%d: Cache flush: %d pages, %d writes in %d seconds (%d pps)\n",
-								database->deltaTime, flushPages, physicalWrites, delta, flushPages / delta);
+								database->deltaTime, pages, writes, delta, writes / MAX(delta, 1));
 
 				database->pageCacheFlushed(flushArg);
 				}