bk commit into 6.0-falcon tree (jas:1.2602)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0-falcon 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-07-06 18:25:50-04:00, jas@rowvwade. +2 -0
  Dead code elimination (mustly obsolete commented out debugging
  code).

  storage/falcon/SerialLog.cpp@stripped, 2007-07-06 18:25:43-04:00, jas@rowvwade. +0 -46
    Dead code elimination (mustly obsolete commented out debugging
    code).

  storage/falcon/SerialLog.h@stripped, 2007-07-06 18:25:43-04:00, jas@rowvwade. +0 -3
    Dead code elimination.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jas
# Host:	rowvwade.
# Root:	D:/MySQL/mysql-5.1-falcon

--- 1.98/storage/falcon/SerialLog.cpp	2007-07-06 18:26:10 -04:00
+++ 1.99/storage/falcon/SerialLog.cpp	2007-07-06 18:26:10 -04:00
@@ -218,7 +218,6 @@
 	Log::log("Recovering database %s ...\n", (const char*) defaultDbb->fileName);
 	Sync sync(&syncWrite, "SerialLog::recover");
 	sync.lock(Exclusive);
-	//defaultDbb->setRecovering(true);
 	recovering = true;
 	recoveryPhase = 0;
 	
@@ -403,7 +402,6 @@
 		if (!(window->inUse == 0 || window == writeWindow))
 			ASSERT(false);
 		
-	//defaultDbb->setRecovering(false);
 	recovering = false;
 	checkpoint(true);
 	
@@ -425,8 +423,6 @@
 	// OK, we're going to do some writing.  Start by locking the serial log
 
 	*writePtr++ = srlEnd | LOW_BYTE_FLAG;
-	//writeBlock->blockNumber = nextBlockNumber++;
-	//writeBlock->creationTime = (uint32) creationTime;
 	writeBlock->length = (int) (writePtr - (UCHAR*) writeBlock);
 	writeWindow->setLastBlock(writeBlock);
 	lastReadBlock = writeBlock->readBlockNumber = getReadBlock();
@@ -509,12 +505,8 @@
 	ASSERT(writer == NULL || writer == thread);
 	writer = thread;
 	*writePtr++ = srlEnd | LOW_BYTE_FLAG;
-	//writeBlock->blockNumber = nextBlockNumber++;
-	//writeBlock->creationTime = (uint32) creationTime;
 	writeBlock->length = (int) (writePtr - (UCHAR*) writeBlock);
-	//ASSERT(writeWindow->validate(writeBlock));
 	lastReadBlock = writeBlock->readBlockNumber = getReadBlock();
-	//ASSERT(writeWindow->validate(writeBlock));
 
 	// Keep track of what needs to be written
 
@@ -525,24 +517,13 @@
 
 	if (!forceNewWindow && (writeBlock =
writeWindow->nextAvailableBlock(writeBlock)))
 		{
-		//ASSERT(flushWindow->validate(flushBlock));
 		initializeWriteBlock(writeBlock);
-		//writePtr = writeBlock->data;
-		//writeBlock->blockNumber = nextBlockNumber;
 		writeBlock->readBlockNumber = lastReadBlock;
-		//writeBlock->creationTime = (uint32) creationTime;
-		//writeBlock->length = (int) (writePtr - (UCHAR*) writeBlock);
-		//writeWindow->currentLength = (int) (writePtr - writeWindow->buffer);
-		//writeWindow->lastBlockNumber = writeBlock->blockNumber;
-		//ASSERT(writeWindow->validate(writeBlock));
-		//ASSERT(flushWindow->validate(flushBlock));
 		}
 	else
 		{
 		flushBlock->length = (int) (writePtr - (UCHAR*) flushBlock);
-		//ASSERT(flushWindow->validate(flushBlock));
 		createNewWindow();
-		//ASSERT(flushWindow->validate(flushBlock));
 		}
 
 	// Everything is ready to go.  Release the locks and start writing
@@ -570,9 +551,6 @@
 
 void SerialLog::createNewWindow(void)
 {
-	//ASSERT(syncWrite.ourExclusiveLock());
-	//ASSERT(!writeBlock || writeWindow->validate(writeBlock));
-
 	// We need a new window.  Start by purging any unused windows
 
 	while (   (firstWindow->lastBlockNumber < lastReadBlock)
@@ -601,9 +579,7 @@
 	writeWindow->deactivateWindow();
 	writeWindow = allocWindow(file, fileOffset);
 	writeWindow->firstBlockNumber = nextBlockNumber;
-	//writeWindow->lastBlockNumber = nextBlockNumber;
 	initializeWriteBlock(writeWindow->firstBlock());
-	//writeWindow->firstBlockNumber = writeBlock->blockNumber;
 	ASSERT(writeWindow->firstBlockNumber == writeBlock->blockNumber);
 	ASSERT(writeWindow->validate(writeBlock));
 }
@@ -628,18 +604,12 @@
 
 void SerialLog::putData(uint32 length, const UCHAR *data)
 {
-	//ASSERT(syncWrite.ourExclusiveLock());
-	//ASSERT(writeWindow->validate(writePtr));
-
 	if ((writePtr + length) < writeWarningTrack)
 		{
 		memcpy(writePtr, data, length);
 		writePtr += length;
 		writeBlock->length = (int) (writePtr - (UCHAR*) writeBlock);
 		writeWindow->currentLength = (int) (writePtr - writeWindow->buffer);
-		//ASSERT(writePtr < writeWindow->warningTrack);
-		//ASSERT(writeWindow->validate(writeBlock));
-		//ASSERT(writeWindow->validate(writePtr));
 
 		return;
 		}
@@ -1245,28 +1215,12 @@
 	recoveryIndexes->setInactive(id, tableSpaceId);
 }
 
-/***
-void SerialLog::extendSectionVector(int newLength, int tableSpaceId)
-{
-	TableSpaceInfo *info = getTableSpaceInfo(tableSpaceId);
-	info->sectionUseVector.extend(newLength);
-}
-***/
-
 bool SerialLog::sectionInUse(int sectionId, int tableSpaceId)
 {
 	TableSpaceInfo *info = getTableSpaceInfo(tableSpaceId);
 
 	return info->sectionUseVector.get(sectionId) > 0;
 }
-
-/***
-void SerialLog::extendIndexVector(int newLength, int tableSpaceId)
-{
-	TableSpaceInfo *info = getTableSpaceInfo(tableSpaceId);
-	info->indexUseVector.extend(newLength);
-}
-***/
 
 bool SerialLog::indexInUse(int indexId, int tableSpaceId)
 {

--- 1.46/storage/falcon/SerialLog.h	2007-07-06 18:26:10 -04:00
+++ 1.47/storage/falcon/SerialLog.h	2007-07-06 18:26:10 -04:00
@@ -66,7 +66,6 @@
 class SerialLogControl;
 class SerialLogWindow;
 class SerialLogTransaction;
-//class SerialLogAction;
 class Bitmap;
 class IO;
 class RecoveryObjects;
@@ -210,8 +209,6 @@
 	uint32				chilledRecords;
 	uint64				chilledBytes;
 	
-	//DenseArray<int, 200>	sectionUseVector;
-	//DenseArray<int, 200>	indexUseVector;
 	TableSpaceInfo		*tableSpaces[SLT_HASH_SIZE];
 	TableSpaceInfo		*tableSpaceInfo;