[Checkins] SVN: Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/aoptimizer/aoptimizer.py slight modifications for index bounds

[Adam Groszer]

Log message for revision 89484:
  slight modifications for index bounds

Changed:
  U   Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/aoptimizer/aoptimizer.py

-=-
Modified: Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/aoptimizer/aoptimizer.py
===================================================================
--- Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/aoptimizer/aoptimizer.py	2008-08-07 02:06:05 UTC (rev 89483)
+++ Sandbox/adamg/ocql/branches/optimize-with-index/src/ocql/aoptimizer/aoptimizer.py	2008-08-07 07:58:53 UTC (rev 89484)
@@ -61,14 +61,20 @@
         return tree
     #new algebra objects
     if operator == '==':
-        makeFromIndex = MakeFromIndex(coll , coll, interface, cond.split(".")[1], value, value)
+        makeFromIndex = MakeFromIndex(coll , coll, interface,
+                                      cond.split(".")[1],
+                                      lowerbound=value, upperbound=value)
     elif operator == '>' or operator == '>=':
-        makeFromIndex = MakeFromIndex(coll , coll, interface, cond.split(".")[1], lowerbound=value, upperbound='Z')
+        makeFromIndex = MakeFromIndex(coll , coll, interface,
+                                      cond.split(".")[1],
+                                      lowerbound=value, upperbound=None)
     elif operator == '<' or operator == '<=':
-        makeFromIndex = MakeFromIndex(coll , coll, interface, cond.split(".")[1], lowerbound='A', upperbound=value)
+        makeFromIndex = MakeFromIndex(coll , coll, interface,
+                                      cond.split(".")[1],
+                                      lowerbound=None, upperbound=value)
     else:
         return tree
-    
+
     newlambda = Lambda(var, single)
     newTree = Iter(coll, newlambda, makeFromIndex)
     parent = tree.__parent__
@@ -98,7 +104,7 @@
 
     def __call__(self, metadata):
         results = findItrTreePattern(self.context.tree)
-        
+
         if results is not None:
             alg = iterPatternMatcher(results)
             addMarkerIF(alg, IOptimizedAlgebraObject)