[Checkins] SVN: Sandbox/ocql-foliage/src/
Adam Groszer
agroszer at gmail.com
Mon Sep 24 16:38:15 EDT 2007
Log message for revision 79904:
Changed:
U Sandbox/ocql-foliage/src/ocql/engine/queryobject.py
U Sandbox/ocql-foliage/src/ocql/engine/runnablequery.py
U Sandbox/ocql-foliage/src/testdb.py
-=-
Modified: Sandbox/ocql-foliage/src/ocql/engine/queryobject.py
===================================================================
--- Sandbox/ocql-foliage/src/ocql/engine/queryobject.py 2007-09-24 20:23:38 UTC (rev 79903)
+++ Sandbox/ocql-foliage/src/ocql/engine/queryobject.py 2007-09-24 20:38:15 UTC (rev 79904)
@@ -75,16 +75,23 @@
) # FIXME: ?set?
)
elif isinstance(ft,Alias):
- return Query(self.collection, [In(ft.identifier,ft.expression)]+self.terms[1:],
- self.target).rewrite(algebra)
+ return Query(
+ self.collection,
+ [In(ft.identifier,ft.expression)]+self.terms[1:],
+ self.target).rewrite(algebra)
else:
return algebra.If(
ft.rewrite(algebra),
- Query(self.collection,self.terms[1:],self.target).rewrite(algebra),
- algebra.Empty(self.collection,None)
+ Query(
+ self.collection,
+ self.terms[1:],
+ self.target).rewrite(algebra),
+ algebra.Empty(self.collection, None)
)
else:
- return algebra.Single(self.collection,self.target.rewrite(algebra))
+ return algebra.Single(
+ self.collection,
+ self.target.rewrite(algebra))
class In(Term):
def __init__(self, identifier, expression):
Modified: Sandbox/ocql-foliage/src/ocql/engine/runnablequery.py
===================================================================
--- Sandbox/ocql-foliage/src/ocql/engine/runnablequery.py 2007-09-24 20:23:38 UTC (rev 79903)
+++ Sandbox/ocql-foliage/src/ocql/engine/runnablequery.py 2007-09-24 20:38:15 UTC (rev 79904)
@@ -1,3 +1,8 @@
+#
+# Runnable query object
+# This will return the resultset
+#
+
class RunnableQuery:
"""
metadata: ocql.metadata instance
@@ -16,7 +21,9 @@
#return reduce(set.union, map(lambda c: reduce(set.union, map(lambda d: ((d.name=="Computing Science") and (((d==set(filter(lambda i: i.runBy,c))) and (((c.credits<=3) and (((1<=c.credits) and (set([c])) or (set()))) or (set()))) or (set()))) or (set())),set(metadata.getAll("IDepartments"))) , set()),set(metadata.getAll("ICurses"))) , set())
- #return eval(self.code,
- # {},
- # {'metadata': self.engine.metadata})
- return eval(self.code)
+ #TODO: why is the metadata not working in locals?
+ return eval(self.code,
+ {'metadata': self.engine.metadata},
+ {'metadata': self.engine.metadata})
+
+ #return eval(self.code)
Modified: Sandbox/ocql-foliage/src/testdb.py
===================================================================
--- Sandbox/ocql-foliage/src/testdb.py 2007-09-24 20:23:38 UTC (rev 79903)
+++ Sandbox/ocql-foliage/src/testdb.py 2007-09-24 20:38:15 UTC (rev 79904)
@@ -1,6 +1,4 @@
-from ocql.engine.algebraoptimizer import AlgebraOptimizer
-from ocql.engine.algebracompiler import AlgebraCompiler
-from ocql.engine import metadata
+from ocql.engine import metadata
# schema
class ICurses:
More information about the Checkins
mailing list