Visible improvements in this build:

 - Significantly reduce the queries that have to be performed, improving lag - especially over slow connections (Issue #118; see new controller info under headline code changes).
 - Fix Issue #117 properly (export numeric quoting - we now have access to column types and so can quote appropriately).
 - Fix Issue #145 (loss of unsigned/null/default attributes when reordering columns).
 - Fixes Issue #90 (support for filtering DECIMAL column types)
 - Improve table scrolling speed when the table contains long items. (Added a NSFormatter to automatically truncate strings > 150 chars for display purposes only)
 - Improved SQL compatibility - for example /* C style comments */ are now correctly ignored in imports and custom queries.
 - Add text and symbols emphasising that the table info pane / status view row count is an approximation (partially addresses Issue #141)
 - Fixes a major memory leak whenever opening or scrolling tables containing text/blob data.
 - SQL import is now faster (SQL parsing part is 3x faster).
 - Speed up SQL export (1.5x faster for numeric data; 1.1x faster for string data) and slightly speed up CSV export (~1.1x faster).
 - Display sizes on the status view using the byte size formatter, as per table info pane.
 

Headline code changes:
 - Add a new NSMutableString subclass, SPSQLParser.  See the header file for documentation and overview, but in short it's a centralised place for SQL parsing.  Centralises and improves parsing, improves comment support, improves quoting support.  Despite the improved featureset this is also faster than the previous distributed implementations - for example, when used to replace the old splitQueries:, > 3x speedup.
 - Implement a new controller which handles a structure and status cache for the current table, and provides structure parsing for specified tables.  This cache is now used throughout the code, reducing the queries that have to be performed and providing additional information about the table structure for use; I think it also improves column type format slightly.
 - The table info pane and the status view now draw all their data from the cache.


Tweaks:
 - Table encoding is now detected directly instead of being derived from the collation - increased accuracy and cope with the DEFAULT encoding.
 - Comments and formatting cleaned up in bits I was working on, obviously.
 - A couple of methods - particularly [tablesListInstance table] and [tableDocument encoding] - have been renamed to avoid conflicts and fix code warnings.


Future improvements now possible:
 - As we now have access to column types and other information, we can provide per-type behaviour where desired.
 - The table parsing doesn't currently pull out comments or table indices, together with one or two other attributes.  Some of this would be useful for display; some, such as indices, could be used to draw the table structure view as long as we're happy discarding a couple of columns (ie cardinality!)

1 files changed, 38 insertions, 45 deletions

diff --git a/Source/TableStatus.m b/Source/TableStatus.m
index 5bfd5513..d1a4d45b 100644
--- a/Source/TableStatus.m
+++ b/Source/TableStatus.m
@@ -1,4 +1,6 @@
 #import "TableStatus.h"
+#import "SPTableData.h"
+#import "SPStringAdditions.h"
 
 @implementation TableStatus
 
@@ -13,15 +15,21 @@
 	[mySQLConnection retain];
 }
 
-- (NSString*)getSQLColumnValue:(NSString *)withName usingFields:(NSDictionary*)fields withLabel:(NSString*)label
+- (NSString*)formatValueWithKey:(NSString *)aKey inDictionary:(NSDictionary*)statusDict withLabel:(NSString*)label
 {
-	NSString* value = [fields objectForKey:withName];
-	if([value isKindOfClass:[NSNull class]])
-	{
-	value = @"--";
+	NSString* value = [statusDict objectForKey:aKey];
+	if([value isKindOfClass:[NSNull class]]) {
+		value = @"--";
+	} else {
+
+		// Format size strings
+		if ([aKey isEqualToString:@"Data_length"] || [aKey isEqualToString:@"Max_data_length"]
+			|| [aKey isEqualToString:@"Index_length"] || [aKey isEqualToString:@"Data_free"]) {
+			value = [NSString stringForByteSize:[value intValue]];
+		}
 	}
 	
-	NSString* labelVal = [NSString stringWithFormat:@"%@: %@",label,value];
+	NSString* labelVal = [NSString stringWithFormat:@"%@: %@", label, value];
 	
 	return labelVal;
 }
@@ -31,76 +39,61 @@
 	// Store the table name away for future use...
 	selectedTable = aTable;
 	
-	// Notify any listeners that a query is about to begin...
-	[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryWillBePerformed" object:self];
-	
-	// no table selected
+	// No table selected
 	if([aTable isEqualToString:@""] || !aTable) {
 		[tableName setStringValue:@"Name: --"];
 		[tableType setStringValue:@"Type: --"];
 		[tableCreatedAt setStringValue:@"Created At: --"];
 		[tableUpdatedAt setStringValue:@"Updated At: --"];
-		
+
 		// Assign the row values...
 		[rowsNumber setStringValue:@"Number Of: --"];
 		[rowsFormat setStringValue:@"Format: --"];	
 		[rowsAvgLength setStringValue:@"Avg. Length: --"];
 		[rowsAutoIncrement setStringValue:@"Auto Increment: --"];
-		
+
 		// Assign the size values...
 		[sizeData setStringValue:@"Data: --"]; 
 		[sizeMaxData setStringValue:@"Max Data: --"];	
 		[sizeIndex setStringValue:@"Index: --"]; 
 		[sizeFree setStringValue:@"Free: --"];
-		
+
 		// Finally, set the value of the comments box
 		[commentsBox setStringValue:@"--"];
-		
-		// Tell everyone we've finished with our query...
-		[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:self];
+
 		return;
 	}
-	
-	// Run the query to retrieve the status of the selected table.  We'll then use this information to populate
-	// the associated view's controls.	
-	tableStatusResult = [mySQLConnection queryString:[NSString stringWithFormat:@"SHOW TABLE STATUS LIKE '%@'", selectedTable]];
-	
-	statusFields = [tableStatusResult fetchRowAsDictionary];
-	
+
+	// Retrieve the table status information via the table data cache
+	statusFields = [tableDataInstance statusValues];
+
 	// Assign the table values...
 	[tableName setStringValue:[NSString stringWithFormat:@"Name: %@",selectedTable]];
-	if ( [statusFields objectForKey:@"Type"] ) {
-		[tableType setStringValue:[self getSQLColumnValue:@"Type" usingFields:statusFields withLabel:@"Type"]];
-	} else {
-		// mysql > 4.1
-		[tableType setStringValue:[self getSQLColumnValue:@"Engine" usingFields:statusFields withLabel:@"Type"]];
-	}
-	[tableCreatedAt setStringValue:[self getSQLColumnValue:@"Create_time" usingFields:statusFields withLabel:@"Created At"]];
-	[tableUpdatedAt setStringValue:[self getSQLColumnValue:@"Update_time" usingFields:statusFields withLabel:@"Updated At"]];
-	
+	[tableType setStringValue:[self formatValueWithKey:@"Engine" inDictionary:statusFields withLabel:@"Type"]];
+	[tableCreatedAt setStringValue:[self formatValueWithKey:@"Create_time" inDictionary:statusFields withLabel:@"Created At"]];
+	[tableUpdatedAt setStringValue:[self formatValueWithKey:@"Update_time" inDictionary:statusFields withLabel:@"Updated At"]];
+
 	// Assign the row values...
-	[rowsNumber setStringValue:[self getSQLColumnValue:@"Rows" usingFields:statusFields withLabel:@"Number Of"]];
-	[rowsFormat setStringValue:[self getSQLColumnValue:@"Row_format" usingFields:statusFields withLabel:@"Format"]];	
-	[rowsAvgLength setStringValue:[self getSQLColumnValue:@"Avg_row_length" usingFields:statusFields withLabel:@"Avg. Length"]];
-	[rowsAutoIncrement setStringValue:[self getSQLColumnValue:@"Auto_increment" usingFields:statusFields withLabel:@"Auto Increment"]];
+	[rowsNumber setStringValue:[self formatValueWithKey:@"Rows" inDictionary:statusFields withLabel:@"Approx. Number"]];
+	[rowsFormat setStringValue:[self formatValueWithKey:@"Row_format" inDictionary:statusFields withLabel:@"Format"]];	
+	[rowsAvgLength setStringValue:[self formatValueWithKey:@"Avg_row_length" inDictionary:statusFields withLabel:@"Avg. Length"]];
+	[rowsAutoIncrement setStringValue:[self formatValueWithKey:@"Auto_increment" inDictionary:statusFields withLabel:@"Auto Increment"]];
 
 	// Assign the size values...
-	[sizeData setStringValue:[self getSQLColumnValue:@"Data_length" usingFields:statusFields withLabel:@"Data"]]; 
-	[sizeMaxData setStringValue:[self getSQLColumnValue:@"Max_data_length" usingFields:statusFields withLabel:@"Max Data"]];	
-	[sizeIndex setStringValue:[self getSQLColumnValue:@"Index_length" usingFields:statusFields withLabel:@"Index"]]; 
-	[sizeFree setStringValue:[self getSQLColumnValue:@"Data_free" usingFields:statusFields withLabel:@"Free"]];	 
-	
+	[sizeData setStringValue:[self formatValueWithKey:@"Data_length" inDictionary:statusFields withLabel:@"Data"]]; 
+	[sizeMaxData setStringValue:[self formatValueWithKey:@"Max_data_length" inDictionary:statusFields withLabel:@"Max Data"]];	
+	[sizeIndex setStringValue:[self formatValueWithKey:@"Index_length" inDictionary:statusFields withLabel:@"Index"]]; 
+	[sizeFree setStringValue:[self formatValueWithKey:@"Data_free" inDictionary:statusFields withLabel:@"Free"]];	 
+
 	// Finally, assign the comments...
 	[commentsBox setStringValue:[statusFields objectForKey:@"Comment"]];
-	
-	// Tell everyone we've finished with our query...
-	[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:self];	
-	
+
 	return;
 }
 
 - (IBAction)reloadTable:(id)sender
 {
+	[tableDataInstance resetStatusData];
 	[self loadTable:selectedTable];
 }