bzr push into mysql-6.0-falcon-team branch (svoj:2830) WL#4515

[Sergey Vojtovich]

 2830 Sergey Vojtovich	2008-09-22
      An addition to
      WL#4515 - Falcon: fill INFORMATION_SCHEMA.FILES
      
      This patch changes the value of I_S.FILES.FILE_TYPE for Falcon
      tablespace data files. The value is changed from "DATAFILE" to
      either "SYSTEM DATAFILE" or "USER DATAFILE" depending on
      tablespace name.
modified:
  storage/falcon/TableSpaceManager.cpp
  storage/falcon/TableSpaceManager.h

=== modified file 'storage/falcon/TableSpaceManager.cpp'
--- a/storage/falcon/TableSpaceManager.cpp	2008-09-03 09:00:56 +0000
+++ b/storage/falcon/TableSpaceManager.cpp	2008-09-22 09:24:39 +0000
@@ -501,6 +501,18 @@ void TableSpaceManager::getTableSpaceInf
 		}
 }
 
+JString TableSpaceManager::tableSpaceFileType(JString name)
+{
+	JString type;
+	
+	if (name == "FALCON_USER" || name == "FALCON_TEMPORARY" || name == "FALCON_SYSTEM_BASE")
+		type = "SYSTEM DATAFILE";
+	else
+		type = "USER DATAFILE";
+	
+	return type;
+}
+
 void TableSpaceManager::getTableSpaceFilesInfo(InfoTable* infoTable)
 {
 	PStatement statement = database->systemConnection->prepareStatement(
@@ -512,7 +524,7 @@ void TableSpaceManager::getTableSpaceFil
 		infoTable->putInt(0, 0);		// FILE_ID NOT NULL, unused for now
 		infoTable->setNotNull(1);		// FILE_NAME
 		infoTable->putString(1, resultSet->getString(2));
-		infoTable->putString(2, "DATAFILE");	// FILE_TYPE NOT NULL
+		infoTable->putString(2, tableSpaceFileType(resultSet->getString(1)));	// FILE_TYPE NOT NULL
 		infoTable->setNotNull(3);		// TABLESPACE_NAME
 		infoTable->putString(3, resultSet->getString(1));
 		infoTable->setNull(4);			// TABLE_CATALOG

=== modified file 'storage/falcon/TableSpaceManager.h'
--- a/storage/falcon/TableSpaceManager.h	2008-07-17 20:38:45 +0000
+++ b/storage/falcon/TableSpaceManager.h	2008-09-22 09:24:39 +0000
@@ -55,6 +55,7 @@ public:
 	JString			tableSpaceType(JString name);
 	void			getIOInfo(InfoTable* infoTable);
 	void			getTableSpaceInfo(InfoTable* infoTable);
+	JString			tableSpaceFileType(JString name);
 	void			getTableSpaceFilesInfo(InfoTable* infoTable);
 	void			validate(int optionMask);
 	void			sync();