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

[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-09-04 18:27:28-04:00, jas@rowvwade. +3 -0
  Add more memory scavenge diagnostics.

  storage/falcon/Database.cpp@stripped, 2007-09-04 18:27:19-04:00, jas@rowvwade. +3 -0
    Add more memory scavenge diagnostics.

  storage/falcon/RecordScavenge.cpp@stripped, 2007-09-04 18:27:20-04:00, jas@rowvwade. +4 -1
    Add more memory scavenge diagnostics.

  storage/falcon/RecordScavenge.h@stripped, 2007-09-04 18:27:20-04:00, jas@rowvwade. +2 -0
    Add more memory scavenge diagnostics.

diff -Nrup a/storage/falcon/Database.cpp b/storage/falcon/Database.cpp
--- a/storage/falcon/Database.cpp	2007-09-04 17:11:13 -04:00
+++ b/storage/falcon/Database.cpp	2007-09-04 18:27:19 -04:00
@@ -71,6 +71,7 @@
 #include "MemoryManager.h"
 #include "MemMgr.h"
 #include "RecordScavenge.h"
+#include "LogStream.h"
 
 #ifndef STORAGE_ENGINE
 #include "Applications.h"
@@ -1712,6 +1713,8 @@ void Database::retireRecords(bool forced
 
 	if (forced || total >  recordScavengeThreshold)
 		{
+		LogStream stream;
+		recordDataPool->analyze(0, &stream, NULL, NULL);
 		Sync syncTbl (&syncTables, "Database::retireRecords");
 		syncTbl.lock (Shared);
 		Table *table;
diff -Nrup a/storage/falcon/RecordScavenge.cpp b/storage/falcon/RecordScavenge.cpp
--- a/storage/falcon/RecordScavenge.cpp	2007-09-04 17:11:22 -04:00
+++ b/storage/falcon/RecordScavenge.cpp	2007-09-04 18:27:20 -04:00
@@ -33,7 +33,8 @@ RecordScavenge::RecordScavenge(Database 
 	spaceReclaimed = 0;
 	spaceRemaining = 0;
 	overflowSpace = 0;
-	
+	numberRecords = 0;
+	recordSpace = 0;
 }
 
 RecordScavenge::~RecordScavenge(void)
@@ -44,6 +45,8 @@ void RecordScavenge::inventoryRecord(Rec
 {
 	for (Record *rec = record; rec; rec = rec->getPriorVersion())
 		{
+		++numberRecords;
+		recordSpace += record->size;
 		int age = baseGeneration - record->generation;
 		
 		if (age >= 0 && age < AGE_GROUPS)
diff -Nrup a/storage/falcon/RecordScavenge.h b/storage/falcon/RecordScavenge.h
--- a/storage/falcon/RecordScavenge.h	2007-09-04 17:11:22 -04:00
+++ b/storage/falcon/RecordScavenge.h	2007-09-04 18:27:20 -04:00
@@ -30,12 +30,14 @@ public:
 	int			baseGeneration;
 	uint		recordsReclaimed;
 	uint		recordsRemaining;
+	uint		numberRecords;
 	uint		versionsRemaining;
 	uint64		spaceReclaimed;
 	uint64		spaceRemaining;
 	uint64		ageGroups[AGE_GROUPS];
 	uint64		overflowSpace;
 	uint64		totalSpace;
+	uint64		recordSpace;
 	
 	RecordScavenge(Database *db, TransId oldestTransaction);
 	~RecordScavenge(void);