close source objects after use

Daniel Kinzler · Daniel Kinzler · commit 8bfa563216c0 · 2012-01-04T16:54:35.000Z
git-svn-id: https://svn.toolserver.org/svnroot/daniel/duesenstuff/trunk/gpClient@582 9f2c43bc-b3c0-43f4-b155-41619b16f219
diff --git a/python/gp/mediawiki.py b/python/gp/mediawiki.py
@@ -79,6 +79,7 @@ def add_arcs_from_category_structure ( self, ) :
         src = self.make_source( MySQLSelect( sql ) )
         
         self.add_arcs( src )
+        src.close()
     
      
     def get_subcategories ( self, cat, depth, without = None, without_depth = None ) :
@@ -283,17 +284,23 @@ def capture_ids ( self, ns = None, data = None ) :
 
     def copy_to_sink ( self, ns, sink ) :
         src = self.make_source(ns)
-        return self.glue.copy(src, sink, "~")
+        c = self.glue.copy(src, sink, "~")
+        src.close()
+        return c
     
 
     def copy_ids_to_sink ( self, ns, sink ) :
         src = self.make_id_source(ns)
-        return self.glue.copy(src, sink, "~")
+        c = self.glue.copy(src, sink, "~")
+        src.close()
+        return c
     
 
     def add_source ( self, src ) :
         sink = self.make_sink()
-        return self.glue.copy( src, sink, "+" )
+        c = self.glue.copy( src, sink, "+" )
+        sink.close()
+        return c
     
 
     def add_page_set ( self, set ) :
@@ -316,6 +323,8 @@ def subtract_source ( self, src ): #XXX: must be a 1 column id source...
         ok = self.subtract_table(t, "page_id")
         
         self.glue.drop_temp_table(t)
+        sink.close()
+        
         return ok
     
 
@@ -334,6 +343,8 @@ def retain_source ( self, src ) : #XXX: must be a 1 column id source...
         ok = self.retain_table(t, "page_id")
         
         self.glue.drop_temp_table(t)
+        sink.close()
+        
         return ok
     
 
diff --git a/python/gp/mysql.py b/python/gp/mysql.py
@@ -628,7 +628,7 @@ def make_sink (self, table ):
 	def make_source (self, table, big = False ):
 		sql = table._get_select()
 		
-		if not re.search(r'\s+ORDER\s+BY\s+', sql, flags = re.IGNORECASE) :
+		if not re.search(r'\s+ORDER\s+BY\s+', sql, flags = re.IGNORECASE | re.DOTALL ) :
 			sql += ' ' + table.get_order_by()
 		
 		
