bk commit into 5.1-falcon tree (jas:1.2583)

[Jim Starkey]

Below is the list of changes that have just been committed into a local
5.1-falcon repository of jas. When jas 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-04-11 17:05:06-04:00, jas@stripped +2 -0
  Merge jstarkey@stripped:/home/bk/mysql-5.1-falcon
  into  fluffy.netfrastructure.com:/home/mysql/mysql-5.1-falcon
  MERGE: 1.2580.1.2

  storage/falcon/MemMgr.h@stripped, 2007-04-11 17:04:31-04:00, jas@stripped
+4 -4
    Reverting to prior version.
    MERGE: 1.3.1.1

  storage/falcon/ha_falcon.cpp@stripped, 2007-04-11 17:04:55-04:00,
jas@stripped +0 -1
    Reverted to earlier version.
    MERGE: 1.139.1.1

# 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:	fluffy.netfrastructure.com
# Root:	/home/mysql/mysql-5.1-falcon/RESYNC

--- 1.4/storage/falcon/MemMgr.h	2007-04-11 17:05:12 -04:00
+++ 1.5/storage/falcon/MemMgr.h	2007-04-11 17:05:12 -04:00
@@ -28,41 +28,7 @@
 #endif
 #endif
 
-enum StatMode {
-    StatSystemMemory,			// memory manager
-	StatRecordMemory			// record manager
-	};
-
-struct MemClient {
-	const char	*fileName;
-	MemClient	*collision;
-	short		line;
-	short		blocks;
-	long		objectsInUse;
-	long		objectsDeleted;
-	long		spaceInUse;
-	long		spaceDeleted;
-	// Summary data
-	long		uniqueSize;
-	long		bigHunks;
-	long		smallHunks;
-	long		orderedSpace;
-	long		freeSegments;
-	long		freeSpace;
-	};
-
-struct IOAnalysis {
-	char	name[120]; //cwp tbd: move this
-	int32	reads;
-	int32	writes;
-	int32	fetches;
-	int32	fakes;
-	int32	pageSize;
-	};
-	
-
 void  MemMgrLogDump();
-void  MemMgrAnalyzeExt(StatMode mode, int mask, MemClient **clients, int *count,
MemClient **summary);
 
 static const int defaultRounding = 8;
 static const int defaultCutoff = 4096;
@@ -71,14 +37,15 @@
 
 class MemMgr;
 class Stream;
+class InfoTable;
 
 class MemHeader 
 {
 public:
 	MemMgr		*pool;
-	int32		length;
+	INT32		length;
 #ifdef MEM_DEBUG
-	int32		lineNumber;
+	INT32		lineNumber;
 	const char	*fileName;
 #endif
 };
@@ -86,7 +53,7 @@
 class MemBlock : public MemHeader 
 {
 public:
-	unsigned char	body;
+	UCHAR		body;
 };
 
 class MemBigObject;
@@ -120,7 +87,7 @@
 public:
 	MemSmallHunk	*nextHunk;
 	int				length;
-	unsigned char	*memory;
+	UCHAR			*memory;
 	int				spaceRemaining;
 };
 	
@@ -168,9 +135,7 @@
 	void*		allocateDebug(int size, const char* fileName, int line);
 	void		releaseBlock(MemBlock *block);
 	void		validateBlock(MemBlock *block);
-	void		analyze (int mask, Stream *stream, int *count);
-	void		analyze (int mask, MemClient **clients, int *count, MemClient **summary);
-	void		analyze (int mask, Stream *stream, MemClient *clients, int *count, MemClient
*summary);
+	void		analyze (int mask, Stream *stream, InfoTable *summaryTable, InfoTable
*detailTable);
 	void		validate();
 	void		releaseDebug (void *object);
 	void		remove(MemFreeBlock* block);

--- 1.140/storage/falcon/ha_falcon.cpp	2007-04-11 17:05:12 -04:00
+++ 1.141/storage/falcon/ha_falcon.cpp	2007-04-11 17:05:12 -04:00
@@ -26,7 +26,8 @@
 #include "StorageTableShare.h"
 #include "StorageHandler.h"
 #include "CmdGen.h"
-#include "MemMgr.h"
+#include "InfoTable.h"
+//#include "MemMgr.h"
 //#include "TimeTest.h"
 
 typedef longlong	int64;
@@ -2244,9 +2245,14 @@
 //*****************************************************************************
 int NfsPluginHandler::call_fillSystemMemoryDetailTable(THD *thd, TABLE_LIST *tables, COND
*cond)
 {
-	return(pluginHandler->fillSystemMemoryDetailTable(thd, tables, cond));
+	//return(pluginHandler->fillSystemMemoryDetailTable(thd, tables, cond));
+	InfoTable infoTable(thd, tables, system_charset_info);
+	storageHandler->getMemoryDetailInfo(&infoTable);
+	
+	return infoTable.error;
 }
 
+/***
 int NfsPluginHandler::fillSystemMemoryDetailTable(THD *thd, TABLE_LIST *tables, COND
*cond)
 {
 	CHARSET_INFO *scs= system_charset_info;
@@ -2300,6 +2306,7 @@
 		
 	DBUG_RETURN(rc);
 }
+***/
 
 ST_FIELD_INFO systemMemoryDetailFieldInfo[]=
 {
@@ -2338,9 +2345,14 @@
 //*****************************************************************************
 int NfsPluginHandler::call_fillSystemMemorySummaryTable(THD *thd, TABLE_LIST *tables,
COND *cond)
 {
-	return(pluginHandler->fillSystemMemorySummaryTable(thd, tables, cond));
+	//return(pluginHandler->fillSystemMemorySummaryTable(thd, tables, cond));
+	InfoTable infoTable(thd, tables, system_charset_info);
+	storageHandler->getMemorySummaryInfo(&infoTable);
+	
+	return infoTable.error;
 }
 
+/***
 int NfsPluginHandler::fillSystemMemorySummaryTable(THD *thd, TABLE_LIST *tables, COND
*cond)
 {
 	CHARSET_INFO *scs= system_charset_info;
@@ -2382,6 +2394,7 @@
 		
 	DBUG_RETURN(rc);
 }
+***/
 
 ST_FIELD_INFO systemMemorySummaryFieldInfo[]=
 {
@@ -2420,9 +2433,14 @@
 //*****************************************************************************
 int NfsPluginHandler::call_fillRecordCacheDetailTable(THD *thd, TABLE_LIST *tables, COND
*cond)
 {
-	return(pluginHandler->fillRecordCacheDetailTable(thd, tables, cond));
+	//return(pluginHandler->fillRecordCacheDetailTable(thd, tables, cond));
+	InfoTable infoTable(thd, tables, system_charset_info);
+	storageHandler->getRecordCacheDetailInfo(&infoTable);
+	
+	return infoTable.error;
 }
 
+/***
 int NfsPluginHandler::fillRecordCacheDetailTable(THD *thd, TABLE_LIST *tables, COND
*cond)
 {
 	CHARSET_INFO *scs= system_charset_info;
@@ -2476,6 +2494,7 @@
 
 	DBUG_RETURN(rc);
 }
+***/
 
 ST_FIELD_INFO recordCacheDetailFieldInfo[]=
 {
@@ -2515,9 +2534,14 @@
 //*****************************************************************************
 int NfsPluginHandler::call_fillRecordCacheSummaryTable(THD *thd, TABLE_LIST *tables, COND
*cond)
 {
-	return(pluginHandler->fillRecordCacheSummaryTable(thd, tables, cond));
+	//return(pluginHandler->fillRecordCacheDetailTable(thd, tables, cond));
+	InfoTable infoTable(thd, tables, system_charset_info);
+	storageHandler->getRecordCacheSummaryInfo(&infoTable);	
+	
+	return infoTable.error;
 }
 
+/***
 int NfsPluginHandler::fillRecordCacheSummaryTable(THD *thd, TABLE_LIST *tables, COND
*cond)
 {
 	CHARSET_INFO *scs= system_charset_info;
@@ -2559,6 +2583,7 @@
 			
 	DBUG_RETURN(rc);
 }
+***/
 
 ST_FIELD_INFO recordCacheSummaryFieldInfo[]=
 {
@@ -2597,9 +2622,14 @@
 //*****************************************************************************
 int NfsPluginHandler::call_fillDatabaseIOTable(THD *thd, TABLE_LIST *tables, COND *cond)
 {
-	return(pluginHandler->fillDatabaseIOTable(thd, tables, cond));
+	//return(pluginHandler->fillDatabaseIOTable(thd, tables, cond));
+	InfoTable infoTable(thd, tables, system_charset_info);
+	storageHandler->getIOInfo(&infoTable);
+
+	return infoTable.error;
 }
 
+/***
 int NfsPluginHandler::fillDatabaseIOTable(THD *thd, TABLE_LIST *tables, COND *cond)
 {
 	CHARSET_INFO *scs= system_charset_info;
@@ -2642,24 +2672,23 @@
 	
 	DBUG_RETURN(rc);
 }
+***/
 
 ST_FIELD_INFO databaseIOFieldInfo[]=
 {
-	{"DATABSE",		  120, MYSQL_TYPE_STRING,	0, 0, "Database"},
-	{"READS",			4, MYSQL_TYPE_LONG,		0, 0, "Reads"},
-	{"WRITES",			4, MYSQL_TYPE_LONG,		0, 0, "Writes"},
-	{"FETCHES",			4, MYSQL_TYPE_LONG,		0, 0, "Fetches"},
-	{"FAKES",			4, MYSQL_TYPE_LONG,		0, 0, "Fakes"},
-	{0,					0, MYSQL_TYPE_STRING,	0, 0, 0}
+	{"DATABASE",		  120, MYSQL_TYPE_STRING,	0, 0, "Database"},
+	{"READS",			4, MYSQL_TYPE_LONG,			0, 0, "Reads"},
+	{"WRITES",			4, MYSQL_TYPE_LONG,			0, 0, "Writes"},
+	{"FETCHES",			4, MYSQL_TYPE_LONG,			0, 0, "Fetches"},
+	{"FAKES",			4, MYSQL_TYPE_LONG,			0, 0, "Fakes"},
+	{0,					0, MYSQL_TYPE_STRING,		0, 0, 0}
 };
 
 int NfsPluginHandler::initDatabaseIO(void *p)
 {
 	DBUG_ENTER("initDatabaseIO");
 	ST_SCHEMA_TABLE *schema = (ST_SCHEMA_TABLE *)p;
-
-	struct st_plugin_int *plugin= (struct st_plugin_int *)p;
-
+	//struct st_plugin_int *plugin= (struct st_plugin_int *)p;
 	schema->fields_info = databaseIOFieldInfo;
 	schema->fill_table = NfsPluginHandler::call_fillDatabaseIOTable;
 	DBUG_RETURN(0);
@@ -2680,7 +2709,7 @@
 struct st_mysql_information_schema falcon_database_io			=	{
MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION};
 
 mysql_declare_plugin(falcon)
-{
+	{
 	MYSQL_STORAGE_ENGINE_PLUGIN,
 	&falcon_storage_engine,
 	falcon_hton_name,
@@ -2693,8 +2722,8 @@
 	falconStatus,								/* status variables */
 	NULL,										/* system variables */
 	NULL										/* config options */
-},
-{
+	},
+	{
 	MYSQL_INFORMATION_SCHEMA_PLUGIN,
 	&falcon_system_memory_detail,
 	"FALCON_SYSTEM_MEMORY_DETAIL",
@@ -2707,8 +2736,8 @@
 	NULL,										/* status variables */
 	NULL,										/* system variables */
 	NULL										/* config options */
-},
-{
+	},
+	{
 	MYSQL_INFORMATION_SCHEMA_PLUGIN,
 	&falcon_system_memory_summary,
 	"FALCON_SYSTEM_MEMORY_SUMMARY",
@@ -2721,8 +2750,8 @@
 	NULL,										/* status variables */
 	NULL,										/* system variables */
 	NULL										/* config options */
-},
-{
+	},
+	{
 	MYSQL_INFORMATION_SCHEMA_PLUGIN,
 	&falcon_record_cache_detail,
 	"FALCON_RECORD_CACHE_DETAIL",
@@ -2735,8 +2764,8 @@
 	NULL,										/* status variables */
 	NULL,										/* system variables */
 	NULL										/* config options */
-},
-{
+	},
+	{
 	MYSQL_INFORMATION_SCHEMA_PLUGIN,
 	&falcon_record_cache_summary,
 	"FALCON_RECORD_CACHE_SUMMARY",
@@ -2749,8 +2778,8 @@
 	NULL,										/* status variables */
 	NULL,										/* system variables */
 	NULL										/* config options   */
-},
-{
+	},
+	{
 	MYSQL_INFORMATION_SCHEMA_PLUGIN,
 	&falcon_database_io,
 	"FALCON_DATABASE_IO",