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

[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-08-26 12:55:53-04:00, jas@rowvwade. +4 -0
  Purge the record object pool as a very bad idea.

  storage/falcon/Database.cpp@stripped, 2007-08-26 12:55:45-04:00, jas@rowvwade. +8 -7
    Finish converting record age group accounting to interlocked
    instructions.

  storage/falcon/Database.h@stripped, 2007-08-26 12:55:45-04:00, jas@rowvwade. +1 -1
    Purge the record object pool as a very bad idea.

  storage/falcon/MemMgr.cpp@stripped, 2007-08-26 12:55:46-04:00, jas@rowvwade. +9 -9
    Purge the record object pool as a very bad idea.

  storage/falcon/Table.cpp@stripped, 2007-08-26 12:55:46-04:00, jas@rowvwade. +4 -2
    Purge the record object pool as a very bad idea.

# 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.102/storage/falcon/Database.cpp	2007-08-26 12:56:11 -04:00
+++ 1.103/storage/falcon/Database.cpp	2007-08-26 12:56:11 -04:00
@@ -452,7 +452,7 @@
 	scavengeCycle = 0;
 	longSync = false;
 	recordDataPool = MemMgrGetFixedPool(MemMgrPoolRecordData);
-	recordObjectPool = MemMgrGetFixedPool(MemMgrPoolRecordObject);
+	//recordObjectPool = MemMgrGetFixedPool(MemMgrPoolRecordObject);
 }
 
 
@@ -1769,15 +1769,13 @@
 			
 		total = newTotal;
 		}
-	/***
-	else if ((total - lastRecordMemory) < (int64)recordScavengeThreshold)
+	else if ((total - lastRecordMemory) < (int64) recordScavengeThreshold / 4)
 		{
 		recordScavenge.age = -1;
 		cleanupRecords (&recordScavenge);
 		
 		return;
 		}
-	***/
 	else
 		{
 		recordScavenge.age = -1;
@@ -1787,11 +1785,14 @@
 
 	lastRecordMemory = total;
 	INTERLOCKED_INCREMENT (currentAgeGroup);
-	overflowSize += ageGroupSizes [AGE_GROUPS - 1];
+	INTERLOCKED_ADD(&overflowSize, ageGroupSizes [AGE_GROUPS - 1]);
+	//overflowSize += ageGroupSizes [AGE_GROUPS - 1];
 
 	for (n = AGE_GROUPS - 1; n > 0; --n)
-		//ageGroupSizes [n] = ageGroupSizes [n - 1];
-		INTERLOCKED_EXCHANGE(ageGroupSizes + n, ageGroupSizes [n - 1]);
+		{
+		long size = ageGroupSizes [n - 1];
+		INTERLOCKED_EXCHANGE(ageGroupSizes + n, (size >= 0) ? size : 0);
+		}
 		
 	//ageGroupSizes [0] = 0;
 	INTERLOCKED_EXCHANGE(ageGroupSizes + 0, 0);

--- 1.47/storage/falcon/Database.h	2007-08-26 12:56:11 -04:00
+++ 1.48/storage/falcon/Database.h	2007-08-26 12:56:11 -04:00
@@ -265,7 +265,7 @@
 	PageWriter			*pageWriter;
 	PreparedStatement	*updateCardinality;
 	MemMgr				*recordDataPool;
-	MemMgr				*recordObjectPool;
+	//MemMgr			*recordObjectPool;
 	
 	volatile time_t	timestamp;
 	volatile int	numberQueries;

--- 1.36/storage/falcon/MemMgr.cpp	2007-08-26 12:56:11 -04:00
+++ 1.37/storage/falcon/MemMgr.cpp	2007-08-26 12:56:11 -04:00
@@ -33,7 +33,7 @@
 #include "Interlock.h"
 #include "Stream.h"
 #include "InfoTable.h"
-#include "RecordVersion.h"
+//#include "RecordVersion.h"
 #include "MemControl.h"
 
 #ifdef ENGINE
@@ -72,7 +72,7 @@
 
 static MemMgr		memoryManager(defaultRounding, FREE_OBJECTS_SIZE, HEAP_SIZE); //cwp
 static MemMgr		recordManager(defaultRounding, 2, HEAP_SIZE);
-static MemMgr		recordObjectManager (defaultRounding, sizeof(RecordVersion) + 100, HEAP_SIZE);
+//static MemMgr		recordObjectManager (defaultRounding, sizeof(RecordVersion) + 100, HEAP_SIZE);
 static MemControl	memControl;
 
 static void		*stopAddress;
@@ -181,11 +181,9 @@
 
 void MemMgrValidate ()
 	{
-	//ENTER_CRITICAL_SECTION;
 	memoryManager.validate();
 	recordManager.validate();
-	recordObjectManager.validate();
-	//LEAVE_CRITICAL_SECTION;
+	//recordObjectManager.validate();
 	}
 
 void MemMgrValidate (void *object)
@@ -220,12 +218,12 @@
 			
 		case MemMgrRecordSummary:
 			recordManager.analyze(0, NULL, infoTable, NULL);
-			recordObjectManager.analyze(0, NULL, infoTable, NULL);
+			//recordObjectManager.analyze(0, NULL, infoTable, NULL);
 			break;
 			
 		case MemMgrRecordDetail:
 			recordManager.analyze(0, NULL, NULL, infoTable);
-			recordObjectManager.analyze(0, NULL, NULL, infoTable);
+			//recordObjectManager.analyze(0, NULL, NULL, infoTable);
 			break;
 		}
 	}
@@ -236,7 +234,7 @@
 		{
 		memControl.setMaxSize(size);
 		memControl.addPool(&recordManager);
-		memControl.addPool(&recordObjectManager);
+		//memControl.addPool(&recordObjectManager);
 		}
 	}
 
@@ -249,9 +247,11 @@
 			
 		case MemMgrPoolRecordData:
 			return &recordManager;
-			
+		
+		/***
 		case MemMgrPoolRecordObject:
 			return &recordObjectManager;
+		***/
 		
 		default:
 			return NULL;

--- 1.139/storage/falcon/Table.cpp	2007-08-26 12:56:11 -04:00
+++ 1.140/storage/falcon/Table.cpp	2007-08-26 12:56:11 -04:00
@@ -3183,7 +3183,8 @@
 		try
 			{
 #undef new
-			return POOL_NEW(database->recordObjectPool) RecordVersion(this, format, transaction, priorVersion);
+			//return POOL_NEW(database->recordObjectPool) RecordVersion(this, format, transaction, priorVersion);
+			return POOL_NEW(database->recordDataPool) RecordVersion(this, format, transaction, priorVersion);
 #define new NEW
 			}
 		catch (SQLException& exception)
@@ -3203,7 +3204,8 @@
 		try
 			{
 #undef new
-			return POOL_NEW(database->recordObjectPool) Record (this, recordNumber, stream);
+			//return POOL_NEW(database->recordObjectPool) Record (this, recordNumber, stream);
+			return POOL_NEW(database->recordDataPool) Record (this, recordNumber, stream);
 #define new NEW
 			}
 		catch (SQLException& exception)