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

[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-06-02 12:20:56-04:00, jas@rowvwade. +4 -0
  Revert to previous record scavenging scheme to track down
  performance hit.

  storage/falcon/RecordGroup.cpp@stripped, 2007-06-02 12:20:45-04:00, jas@rowvwade. +2 -0
    Revert to previous record scavenging scheme to track down
    performance hit.

  storage/falcon/RecordLeaf.cpp@stripped, 2007-06-02 12:20:45-04:00, jas@rowvwade. +2 -2
    Revert to previous record scavenging scheme to track down
    performance hit.

  storage/falcon/Table.cpp@stripped, 2007-06-02 12:20:46-04:00, jas@rowvwade. +10 -10
    Revert to previous record scavenging scheme to track down
    performance hit.

  storage/falcon/Table.h@stripped, 2007-06-02 12:20:46-04:00, jas@rowvwade. +1 -1
    Revert to previous record scavenging scheme to track down
    performance hit.

# 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.10/storage/falcon/RecordGroup.cpp	2007-06-02 12:21:15 -04:00
+++ 1.11/storage/falcon/RecordGroup.cpp	2007-06-02 12:21:15 -04:00
@@ -125,6 +125,7 @@
 				count += n;
 			else
 				{
+				/***
 				Sync sync(&table->syncObject, "RecordGroup::retireRecords");
 				sync.lock(Exclusive);
 				n = section->retireRecords(table, recordNumber, age, oldestActiveTransaction);
@@ -132,6 +133,7 @@
 				if (n)
 					count += n;
 				else
+				***/
 					{
 					delete section;
 					*ptr = NULL;

--- 1.24/storage/falcon/RecordLeaf.cpp	2007-06-02 12:21:15 -04:00
+++ 1.25/storage/falcon/RecordLeaf.cpp	2007-06-02 12:21:15 -04:00
@@ -111,8 +111,8 @@
 
 int RecordLeaf::retireRecords (Table *table, int base, int age, TransId
oldestActiveTransaction)
 {
-	Sync sync(&syncObject, "RecordLeaf::retireRecords");
-	sync.lock(Exclusive);
+	//Sync sync(&syncObject, "RecordLeaf::retireRecords");
+	//sync.lock(Exclusive);
 	int count = 0;
 
 	for (Record **ptr = records, **end = records + RECORD_SLOTS; ptr < end; ++ptr)

--- 1.111/storage/falcon/Table.cpp	2007-06-02 12:21:15 -04:00
+++ 1.112/storage/falcon/Table.cpp	2007-06-02 12:21:15 -04:00
@@ -981,8 +981,8 @@
 	RecordVersion *record = NULL;
 	bool updated = false;
 	int recordNumber = oldRecord->recordNumber;
-	//Sync scavenge(&syncScavenge, "Table::update(2)");
-	//scavenge.lock(Shared);
+	Sync scavenge(&syncScavenge, "Table::update(2)");
+	scavenge.lock(Shared);
 	
 	try
 		{
@@ -1193,8 +1193,8 @@
 
 void Table::deleteRecord(Transaction * transaction, Record * oldRecord)
 {
-	//Sync scavenge(&syncScavenge, "Table::deleteRecord");
-	//scavenge.lock(Shared);
+	Sync scavenge(&syncScavenge, "Table::deleteRecord");
+	scavenge.lock(Shared);
 	Record *candidate = fetch(oldRecord->recordNumber);
 	checkAncestor(candidate, oldRecord);
 	RecordVersion *record;
@@ -1493,11 +1493,11 @@
 	if (!records)
 		return 0;
 
-	//Sync scavenge(&syncScavenge, "Table::retireRecords");
-	//scavenge.lock(Exclusive);
+	Sync scavenge(&syncScavenge, "Table::retireRecords");
+	scavenge.lock(Exclusive);
 
-	//Sync sync(&syncObject, "Table::retireRecords");
-	//sync.lock(Exclusive);
+	Sync sync(&syncObject, "Table::retireRecords");
+	sync.lock(Exclusive);
 	activeVersions = false;
 	int count = records->retireRecords(this, 0, age, oldestActiveTransaction);
 
@@ -2577,8 +2577,8 @@
 
 	RecordVersion *record = NULL;
 	bool updated = false;
-	//Sync scavenge(&syncScavenge, "Table::update");
-	//scavenge.lock(Shared);
+	Sync scavenge(&syncScavenge, "Table::update");
+	scavenge.lock(Shared);
 	
 	if (candidate->state == recLock && candidate->getTransaction() ==
transaction)
 		{

--- 1.25/storage/falcon/Table.h	2007-06-02 12:21:15 -04:00
+++ 1.26/storage/falcon/Table.h	2007-06-02 12:21:15 -04:00
@@ -197,7 +197,7 @@
 	Dbb				*dbb;
 	SyncObject		syncObject;
 	SyncObject		syncTriggers;
-	//SyncObject	syncScavenge;
+	SyncObject		syncScavenge;
 	Table			*collision;				// Hash collision in database
 	Table			*idCollision;			// mod(id) collision in database
 	Table			*next;					// next in database linked list