[Checkins] SVN: Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/ added spacing for algebra __repr__

[Adam Groszer]

Log message for revision 88162:
  added spacing for algebra __repr__

Changed:
  U   Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/compiler/optimize_index.txt
  U   Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/rewriter/algebra.py
  U   Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/rewriter/rewriter.txt

-=-
Modified: Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/compiler/optimize_index.txt
===================================================================
--- Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/compiler/optimize_index.txt	2008-07-10 09:18:57 UTC (rev 88161)
+++ Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/compiler/optimize_index.txt	2008-07-10 09:31:11 UTC (rev 88162)
@@ -84,6 +84,13 @@
     map(lambda i: ((i.value==5) and (set([i.name])) or (set())),
     set(metadata.getAll("IUnOptimizedClass"))), set())
 
+Here is the algebra tree:
+
+    >>> run.alg
+    Iter(<type 'set'>,
+    Lambda i: If(i.value==5, Single(<type 'set'>, i.name), Empty(<type 'set'>)),
+    Make(<type 'set'>, <type 'set'>, IUnOptimizedClass))
+
     >>> result = run.execute()
     >>> result
     set([u'5'])
@@ -123,6 +130,8 @@
     map(lambda i: set([i.name]),
     set(metadata.getFromIndex("IUnOptimizedClass", "value", 5, 5))), set())
 
+
+
     >>> result = run.execute()
     >>> result
     set([u'5'])

Modified: Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/rewriter/algebra.py
===================================================================
--- Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/rewriter/algebra.py	2008-07-10 09:18:57 UTC (rev 88161)
+++ Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/rewriter/algebra.py	2008-07-10 09:31:11 UTC (rev 88162)
@@ -60,7 +60,7 @@
         self.children.extend([klass, expr])
 
     def __repr__(self):
-        return 'Single(%s,%s)'%(self.klass, self.expr)
+        return 'Single(%s, %s)'%(self.klass, self.expr)
 
 class Union(BaseAlgebra):
 
@@ -75,7 +75,7 @@
         self.children.extend([coll1, coll2])
 
     def __repr__(self):
-        return 'Union(%s,%s,%s)'%(self.klass, self.coll1, self.coll2)
+        return 'Union(%s, %s, %s)'%(self.klass, self.coll1, self.coll2)
 
 
 #class Differ:
@@ -86,9 +86,9 @@
 #
 #    def compile(self):
 #        if self.klass == set:
-#            return 'set(range(%s,%s))' % (self.start.compile(),self.end.compile())
+#            return 'set(range(%s, %s))' % (self.start.compile(),self.end.compile())
 #        if self.klass == list:
-#            return 'range(%s,%s)' % (self.start.compile(),self.end.compile())
+#            return 'range(%s, %s)' % (self.start.compile(),self.end.compile())
 
 
 class Iter(BaseAlgebra):
@@ -104,7 +104,7 @@
         self.children.extend([func,coll])
 
     def __repr__(self):
-        return "Iter(%s,%s,%s)"%(self.klass, self.func, self.coll)
+        return "Iter(%s, %s, %s)"%(self.klass, self.func, self.coll)
 
 
 class Select(BaseAlgebra):
@@ -120,7 +120,7 @@
         self.children.extend([func,coll])
 
     def __repr__(self):
-        return "Select(%s,%s,%s)"%(self.klass, self.func, self.coll)
+        return "Select(%s, %s, %s)"%(self.klass, self.func, self.coll)
 
 
 class Reduce(BaseAlgebra):
@@ -140,7 +140,7 @@
         self.children.extend([expr, func, aggreg, coll])
 
     def __repr__(self):
-        return "Reduce(%s,%s,%s,%s,%s)"%(self.klass, self.expr, self.func, self.aggreg, self.coll)
+        return "Reduce(%s, %s, %s, %s, %s)"%(self.klass, self.expr, self.func, self.aggreg, self.coll)
 
 
 #class Equal:
@@ -151,9 +151,9 @@
 #
 #    def compile(self):
 #        if self.klass == set:
-#            return 'set(filter(%s,%s))' % (self.coll1.compile(),self.coll1.compile())
+#            return 'set(filter(%s, %s))' % (self.coll1.compile(),self.coll1.compile())
 #        if self.klass == list:
-#            return 'filter(%s,%s)' % (self.coll1.compile(),self.coll2.compile())
+#            return 'filter(%s, %s)' % (self.coll1.compile(),self.coll2.compile())
 #
 class Range(BaseAlgebra):
 
@@ -184,7 +184,7 @@
         self.children.append(expr)
 
     def __repr__(self):
-        return "Make(%s,%s,%s)" %(self.coll1, self.coll2, self.expr)
+        return "Make(%s, %s, %s)" %(self.coll1, self.coll2, self.expr)
 
 
 #class And:
@@ -204,7 +204,7 @@
         self.children.extend([cond, expr1, expr2])
 
     def __repr__(self):
-        return "If(%s,%s,%s)" % (self.cond, self.expr1, self.expr2)
+        return "If(%s, %s, %s)" % (self.cond, self.expr1, self.expr2)
 
 
 #

Modified: Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/rewriter/rewriter.txt
===================================================================
--- Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/rewriter/rewriter.txt	2008-07-10 09:18:57 UTC (rev 88161)
+++ Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/rewriter/rewriter.txt	2008-07-10 09:31:11 UTC (rev 88162)
@@ -17,14 +17,14 @@
     >>> opt = QueryOptimizer(qo)()
     >>> alg = Rewriter(opt)()
     >>> print str(alg)
-    Single(<type 'set'>,`1`)
+    Single(<type 'set'>, `1`)
 
 
     >>> qo = QueryParser("set [ | 1 ] union set [|2]")(TestMetadata())
     >>> opt = QueryOptimizer(qo)()
     >>> alg = Rewriter(opt)()
     >>> print str(alg)
-    Union(<type 'set'>,Single(<type 'set'>,`1`),Single(<type 'set'>,`2`))
+    Union(<type 'set'>, Single(<type 'set'>, `1`), Single(<type 'set'>, `2`))
 
 
     #Differ not implemented
@@ -32,14 +32,14 @@
     #>>> opt = QueryOptimizer(qo)()
     #>>> alg = Rewriter(opt)()
     #>>> print str(alg)
-    #Union(<type 'set'>,Single(<type 'set'>,`1`),Single(<type 'set'>,`2`))
+    #Union(<type 'set'>, Single(<type 'set'>, `1`), Single(<type 'set'>, `2`))
 
 
     >>> qo = QueryParser("set [ i in ICourse | i ]")(TestMetadata())
     >>> opt = QueryOptimizer(qo)()
     >>> alg = Rewriter(opt)()
     >>> print str(alg)
-    Iter(<type 'set'>,Lambda i: Single(<type 'set'>,i),Make(<type 'set'>,<type 'set'>,ICourse))
+    Iter(<type 'set'>, Lambda i: Single(<type 'set'>, i), Make(<type 'set'>, <type 'set'>, ICourse))
 
 
     #bag not implemented
@@ -47,4 +47,4 @@
     #>>> opt = QueryOptimizer(qo)()
     #>>> alg = Rewriter(opt)()
     #>>> print str(alg)
-    #Iter(<type 'set'>,Lambda i: Single(<type 'set'>,i),Make(<type 'set'>,<type 'set'>,ICourse))
\ No newline at end of file
+    #Iter(<type 'set'>, Lambda i: Single(<type 'set'>, i), Make(<type 'set'>, <type 'set'>, ICourse))
\ No newline at end of file