Before this changeset findAll and ARBase looked up

and cached the column names each time you accessed a row. So find 100 rows and access a column in each one and you have looked up the columns from the db 100 times and cached them in 100 caches. With this changeset the column name caching moves into the connection, so no matter how many models you have, the table columns will only be cached once.
face · Jan 26, 2009 · 0c39077 · 0c39077
1 parent f38b07d
commit 0c39077
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/Source/ARBase.h b/Source/ARBase.h
@@ -80,7 +80,6 @@ typedef enum {
 	NSMutableDictionary *writeCache;
 	NSMutableArray *addCache;
 	NSMutableArray *removeCache;
-	NSArray *columnCache;
 }
 @property(readwrite, retain) id<ARConnection> connection;
 @property(readwrite, retain) NSMutableArray *relationships;

diff --git a/Source/ARBase.m b/Source/ARBase.m
@@ -343,9 +343,7 @@ - (void)removeRecord:(id)record forKey:(NSString *)key ignoreCache:(BOOL)ignoreC
 #pragma mark Database interface
 - (NSArray *)columns
 {
-	if(!columnCache)
-		columnCache = [[self.connection columnsForTable:[[self class] tableName]] retain];
-	return columnCache;
+  return [[self.connection columnsForTable:[[self class] tableName]] retain];
 }
 + (NSString *)idColumnForModel:(Class)modelClass
 {
@@ -422,8 +420,6 @@ - (void)dealloc
 	[readCache release];
 	[addCache release];
 	[removeCache release];
-	if(columnCache)
-		[columnCache release];
 
   [super dealloc];
 }

diff --git a/Source/Connections/ARMySQLConnection.m b/Source/Connections/ARMySQLConnection.m
@@ -11,6 +11,7 @@
 
 /*! @cond IGNORE */
 @interface ARMySQLConnection ()
+	NSMutableDictionary *columnCache;
 - (NSString *)lastErrorMessage;
 - (BOOL)ping;
 - (BOOL)connectWithHost:(NSString *)host 
@@ -143,6 +144,16 @@ - (MYSQL *)mySQLConnection
 }
 - (NSArray *)columnsForTable:(NSString *)tableName
 {
+  NSMutableArray *fieldNames = nil;
+
+  if (!columnCache)
+		columnCache = [NSMutableDictionary dictionary];
+  else
+    fieldNames = [columnCache objectForKey:tableName];
+
+  if ( fieldNames )
+    return fieldNames;
+
 	MYSQL_RES *result = mysql_list_fields(mySQLConnection, [tableName UTF8String], "%");
 	if(result)
 	{
@@ -152,6 +163,7 @@ - (NSArray *)columnsForTable:(NSString *)tableName
 		{
 			[fieldNames addObject:field.name];
 		}
+    [columnCache setObject:fieldNames forKey:tableName];
 		return fieldNames;
 	}
 	else
@@ -258,6 +270,8 @@ - (void)finalize
 - (void)dealloc
 {
   [self closeConnection];
+	if(columnCache)
+		[columnCache release];
   [super dealloc];
 }
 @end
diff --git a/Source/Connections/ARSQLiteConnection.h b/Source/Connections/ARSQLiteConnection.h
@@ -44,6 +44,8 @@ typedef enum  {
 
 @interface ARSQLiteConnection : NSObject <ARConnection> {
   sqlite3 *database;
+  NSDateFormatter *dateFormatter;
+  NSMutableDictionary *columnCache;
 }
 /*!
  * Returns a ready to use sqlite "connection"\n

diff --git a/Source/Connections/ARSQLiteConnection.m b/Source/Connections/ARSQLiteConnection.m
@@ -13,7 +13,6 @@
 
 /*! @cond IGNORE */
 @interface ARSQLiteConnection ()
-  NSDateFormatter *dateFormatter = nil;
 - (sqlite3_stmt *)prepareQuerySQL:(NSString *)query;
 - (void)finalizeQuery:(sqlite3_stmt *)query;
 - (NSArray *)columnsForQuery:(sqlite3_stmt *)query;
@@ -149,9 +148,22 @@ - (NSUInteger)lastInsertId
 
 - (NSArray *)columnsForTable:(NSString *)tableName
 {
+
+  NSArray *columns = nil;
+
+  if (!columnCache)
+		columnCache = [[NSMutableDictionary dictionary] retain];
+  else
+    columns = [columnCache objectForKey:tableName];
+
+  if ( columns )
+    return columns;
+
   sqlite3_stmt *queryByteCode = [self prepareQuerySQL:[NSString stringWithFormat:@"SELECT * FROM %@", tableName]];
-  NSArray *columns = [self columnsForQuery:queryByteCode];
+  columns = [self columnsForQuery:queryByteCode];
   [self finalizeQuery:queryByteCode];
+
+  [columnCache setObject:columns forKey:tableName];
   return columns;
 }