[Checkins] SVN: Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/
remove wrongly added local changes
Charith Paranaliyanage
paranaliyanage at gmail.com
Tue Jul 22 15:54:36 EDT 2008
Log message for revision 88731:
remove wrongly added local changes
Changed:
U Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/parser/parser.txt
U Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/parser/queryparser.py
U Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/queryobject/queryobject.py
U Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/rewriter/rewriter.py
U Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/tests/test_old.py
U Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/tests/test_zope.py
-=-
Modified: Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/parser/parser.txt
===================================================================
--- Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/parser/parser.txt 2008-07-22 19:15:23 UTC (rev 88730)
+++ Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/parser/parser.txt 2008-07-22 19:54:31 UTC (rev 88731)
@@ -5,26 +5,26 @@
#FAILS, why?
- >>> QueryParser("set [ ]")(None).tree
+ >>> QueryParser("set [ ]")(None)
Query(<type 'set'>, , None)
- >>> QueryParser("set [ | 1 ]")(None).tree
+ >>> QueryParser("set [ | 1 ]")(None)
Query(<type 'set'>, , Constant(1))
#FAILS, why?
- >>> QueryParser("list [ | 1 ]")(None).tree
+ >>> QueryParser("list [ | 1 ]")(None)
Query(<type 'list'>, , Constant(1))
- >>> QueryParser("set [ | 1 ] union set [|2]")(None).tree
+ >>> QueryParser("set [ | 1 ] union set [|2]")(None)
Union(Query(<type 'set'>, , Constant(1)), Query(<type 'set'>, , Constant(2)))
- >>> QueryParser("set [ | 1 ] differ set [|2]")(None).tree
+ >>> QueryParser("set [ | 1 ] differ set [|2]")(None)
Differ(Query(<type 'set'>, , Constant(1)), Query(<type 'set'>, , Constant(2)))
- >>> QueryParser("set [ i in ICourse | i ]")(None).tree
+ >>> QueryParser("set [ i in ICourse | i ]")(None)
Query(<type 'set'>, In(Identifier(i), Identifier(ICourse)), Identifier(i))
- >>> QueryParser("size set [ i in ICourse | i ]")(None).tree
+ >>> QueryParser("size set [ i in ICourse | i ]")(None)
Count(Query(<type 'set'>, In(Identifier(i), Identifier(ICourse)), Identifier(i)))
#FAILS, see raise "Help"
Modified: Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/parser/queryparser.py
===================================================================
--- Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/parser/queryparser.py 2008-07-22 19:15:23 UTC (rev 88730)
+++ Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/parser/queryparser.py 2008-07-22 19:54:31 UTC (rev 88731)
@@ -552,6 +552,5 @@
def __call__(self, metadata):
strg = self.context
tree = parse(strg, metadata)
- head = Head(tree)
- return head
+ return Head(tree)
#return parse(strg, None)
Modified: Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/queryobject/queryobject.py
===================================================================
--- Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/queryobject/queryobject.py 2008-07-22 19:15:23 UTC (rev 88730)
+++ Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/queryobject/queryobject.py 2008-07-22 19:54:31 UTC (rev 88731)
@@ -145,8 +145,8 @@
str(self.name),
)
-# def rewrite(self, algebra):
-# return algebra.Identifier(self.name)
+ def rewrite(self, algebra):
+ return algebra.Identifier(self.name)
class Constant(Expression):
implements(IConstant)
@@ -163,8 +163,8 @@
return "%s(%s)" % (
self.__class__.__name__, self.value)
-# def rewrite(self, algebra):
-# return algebra.Constant(self.value)
+ def rewrite(self, algebra):
+ return algebra.Constant(self.value)
class StringConstant(Constant):
pass
Modified: Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/rewriter/rewriter.py
===================================================================
--- Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/rewriter/rewriter.py 2008-07-22 19:15:23 UTC (rev 88730)
+++ Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/rewriter/rewriter.py 2008-07-22 19:54:31 UTC (rev 88731)
@@ -29,12 +29,10 @@
def __call__(self):
query = self.context.tree
-# import pydevd;pydevd.settrace()
- adapter = IRewriter(query)
- alg = adapter()
- #alg = query.rewrite(target_algebra)
- head = Head(alg)
- return head
+# adapter = IRewriter(query)
+# alg = adapter()
+ alg = query.rewrite(target_algebra)
+ return Head(alg)
class ChildRewriter(object):
@@ -72,7 +70,7 @@
adapts(IBinary)
def __call__(self):
- return IRewriter(self.context.)
+ return IRewriter(self.context.left)
class UnionRewriter(ChildRewriter):
implements(IRewriter)
@@ -132,4 +130,4 @@
provideAdapter(QuentedRewriter)
provideAdapter(EveryRewriter)
provideAdapter(SomeRewriter)
- provideAdapter(ConstantRewriter)
\ No newline at end of file
+ provideAdapter(ConstantRewriter)
Modified: Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/tests/test_old.py
===================================================================
--- Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/tests/test_old.py 2008-07-22 19:15:23 UTC (rev 88730)
+++ Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/tests/test_old.py 2008-07-22 19:54:31 UTC (rev 88731)
@@ -27,19 +27,18 @@
from ocql.testing.database import TestMetadata
from ocql.compiler.compiler import registerAdapters
-import ocql.rewriter.rewriter
from ocql.testing.database import C1, C2, C3
from ocql.testing.database import D1, D2, D3
from ocql.interfaces import IDB
from ocql.interfaces import IQueryParser
-from ocql.interfaces import IObjectQuery
+from ocql.interfaces import IObjectQueryHead
class QueryNullParser(object):
implements(IQueryParser)
- adapts(IObjectQuery)
+ adapts(IObjectQueryHead)
def __init__(self, context):
self.context = context
@@ -59,7 +58,6 @@
provideAdapter(AlgebraCompiler)
provideAdapter(TestMetadata)
registerAdapters()
- ocql.rewriter.rewriter.registerAdapters()
self.engine = OCQLEngine()
@@ -97,11 +95,11 @@
# set [ ]
#
query = "set [ ]"
- qo=Query(metadata, symbols,
+ qo=Head(Query(metadata, symbols,
set,
[] ,
Identifier(metadata, symbols,
- '') )
+ '') ))
self.doit(query, qo, set([]))
@@ -113,7 +111,7 @@
# set [ c in ICourse | c ]
#
query = "[ c in ICourse | c ]"
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set,
[
@@ -121,7 +119,7 @@
metadata, symbols,
Identifier(metadata, symbols,'c'),
Identifier(metadata, symbols,'ICourse')),
- ] ,Identifier(metadata, symbols,'c') )
+ ] ,Identifier(metadata, symbols,'c') ))
#caution, these here are object references
self.doit(query, qo, set([ C1 , C2, C3 ]))
@@ -134,7 +132,7 @@
# set [ c in ICourse | c.code ]
#
query = "[ c in ICourse | c.code ]"
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set,
[
@@ -142,7 +140,7 @@
metadata, symbols,
Identifier(metadata, symbols,'c'),
Identifier(metadata, symbols,'ICourse')),
- ] ,Identifier(metadata, symbols,'c.code') )
+ ] ,Identifier(metadata, symbols,'c.code') ))
self.doit(query, qo, set([ "C1" , "C2", "C3" ]))
@@ -154,7 +152,7 @@
# set [ c in ICourse , c.credits>3 | c.code ]
#
query = "[ c in ICourse, c.credits>3 | c.code ]"
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set,
[
@@ -166,7 +164,7 @@
metadata, symbols,
Identifier(metadata, symbols,'c.credits'),
Constant(metadata, symbols,'3')),
- ] ,Identifier(metadata, symbols, 'c.code') )
+ ] ,Identifier(metadata, symbols, 'c.code') ))
self.doit(query, qo, set([]))
@@ -178,7 +176,7 @@
# set [ c in ICourse , c.credits<=3 | c.code ]
#
query = "[ c in ICourse, c.credits<=3 | c.code ]"
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set, [
In(
@@ -188,7 +186,7 @@
Le(metadata, symbols,
Identifier(metadata, symbols,'c.credits'),
Constant(metadata, symbols,'3')),
- ] ,Identifier(metadata, symbols,'c.code'))
+ ] ,Identifier(metadata, symbols,'c.code')))
self.doit(query, qo, set([ "C1" , "C2", "C3" ]))
@@ -200,7 +198,7 @@
# set [ c in ICourse , c.credits=3 | c.code ]
#
query = "[ c in ICourse, c.credits=3 | c.code ]"
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set,
[
@@ -212,7 +210,7 @@
metadata, symbols,
Identifier(metadata, symbols,'c.credits'),
Constant(metadata, symbols,'3')),
- ] ,Identifier(metadata, symbols,'c.code'))
+ ] ,Identifier(metadata, symbols,'c.code')))
self.doit(query, qo, set([ "C2", "C3" ]))
@@ -224,7 +222,7 @@
# set [ c in ICourse , c.credits<5, c.credits >=1 | c.code ]
#
query = "[ c in ICourse, c.credits<3, c.credits>=1 | c.code ]"
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set,
[
@@ -240,7 +238,7 @@
metadata, symbols,
Identifier(metadata, symbols,'c.credits'),
Constant(metadata, symbols,'1')),
- ] ,Identifier(metadata, symbols, 'c.code'))
+ ] ,Identifier(metadata, symbols, 'c.code')))
self.doit(query, qo, set([ "C1", "C2", "C3" ]))
@@ -252,7 +250,7 @@
# set [ c in ICourse , c.credits<=2, 2<=c.credits | c.code ]
#
query = "[ c in ICourse, c.credits<=2, 2<=c.credits | c.code ]"
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set, [
In(
@@ -267,7 +265,7 @@
metadata, symbols,
Constant(metadata, symbols,'2'),
Identifier(metadata, symbols,'c.credits')),
- ] ,Identifier(metadata, symbols,'c.code'))
+ ] ,Identifier(metadata, symbols,'c.code')))
self.doit(query, qo, set([ "C1" ]))
@@ -279,7 +277,7 @@
# set [ c in ICourse , c.credits>=2, 2>=c.credits | c.code ]
#
query = "[ c in ICourse, c.credits>=2, 2>=c.credits | c.code ]"
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set, [
In(
@@ -294,7 +292,7 @@
metadata, symbols,
Constant(metadata, symbols,'2'),
Identifier(metadata, symbols,'c.credits')),
- ] ,Identifier(metadata, symbols,'c.code'))
+ ] ,Identifier(metadata, symbols,'c.code')))
self.doit(query, qo, set([ "C1" ]))
@@ -306,7 +304,7 @@
# set [ c in ICourse , c.credits=3, c.credits!=3 | c.code ]
#
query = "[ c in ICourse, c.credits=3, c.credits!=3 | c.code ]"
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set, [
In(
@@ -321,7 +319,7 @@
metadata, symbols,
Identifier(metadata, symbols,'c.credits'),
Constant(metadata, symbols,'3')),
- ] ,Identifier(metadata, symbols,'c.code'))
+ ] ,Identifier(metadata, symbols,'c.code')))
self.doit(query, qo, set([]))
@@ -334,7 +332,7 @@
# some c.runBy = d | d.name ]
#
query = "[ c in ICourse, d in IDepartments, d = some c.runBy | d.name ]"
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set, [
In(
@@ -354,7 +352,7 @@
Identifier(metadata, symbols, 'c'),
Identifier(metadata, symbols, 'runBy'))
)),
- ] ,Identifier(metadata, symbols,'d.name'))
+ ] ,Identifier(metadata, symbols,'d.name')))
self.doit(query, qo, set(['Other department', 'Computing Science']))
@@ -366,7 +364,7 @@
# set [ d in ICourse, c in ICourse, c.credits=3, some c.runBy = d | d.name ]
#
query = "[ c in ICourse, d in IDepartments, c.credits=3, d = some c.runBy | d.name ]"
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set,
[
@@ -392,7 +390,7 @@
Identifier(metadata, symbols, 'c'),
Identifier(metadata, symbols, 'runBy'))
)),
- ] ,Identifier(metadata, symbols, 'd.name'))
+ ] ,Identifier(metadata, symbols, 'd.name')))
self.doit(query, qo, set(['Computing Science']))
@@ -405,7 +403,7 @@
query = """[ d in IDepartments,
c in ICourse,
some c.runBy = d, c.credits != 3| d.name ]"""
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set,
[
@@ -431,7 +429,7 @@
metadata, symbols,
Constant(metadata, symbols,'3'),
Identifier(metadata, symbols,'c.credits')),
- ] ,Identifier(metadata, symbols,'d.name'))
+ ] ,Identifier(metadata, symbols,'d.name')))
self.doit(query, qo, set(['Other department','Computing Science']))
@@ -447,7 +445,7 @@
every
set [ c in ICourse, some c.runBy = d | c.credits ] = 2
| d.name ]"""
- qo=Query(
+ qo=Head(Query(
metadata, symbols,
set,
[
@@ -481,7 +479,7 @@
], Identifier(metadata, symbols, 'c.credits')
)
),Constant(metadata, symbols,'2')),
- ] ,Identifier(metadata, symbols,'d.name'))
+ ] ,Identifier(metadata, symbols,'d.name')))
self.doit(query, qo, set(['Other department']))
Modified: Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/tests/test_zope.py
===================================================================
--- Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/tests/test_zope.py 2008-07-22 19:15:23 UTC (rev 88730)
+++ Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/tests/test_zope.py 2008-07-22 19:54:31 UTC (rev 88731)
@@ -8,7 +8,6 @@
from ocql.aoptimizer.aoptimizer import AlgebraOptimizer
from ocql.compiler.compiler import AlgebraCompiler
from ocql.compiler.compiler import registerAdapters
-import ocql.rewriter.rewriter
from ocql.database import metadata
from ocql.database.metadata import Metadata
from ocql.engine import OCQLEngine
@@ -36,7 +35,6 @@
provideAdapter(AlgebraCompiler)
provideAdapter(Metadata)
registerAdapters()
- ocql.rewriter.rewriter.registerAdapters()
setupInterfaces(self)
setupCatalog(self)
@@ -77,11 +75,11 @@
# set [ ]
#
query = "set [ ]"
- qo=Query(metadata, symbols,
+ qo=Head(Query(metadata, symbols,
set,
[] ,
Identifier(metadata, symbols,
- '') )
+ '') ))
self.doit(query, qo, set([]))
@@ -93,7 +91,7 @@
# set [ c in IStudent | c ]
#
query = "[c in IStudent | c]"
- qo = Query(
+ qo = Head(Query(
metadata, symbols,
set,
[
@@ -101,7 +99,7 @@
metadata, symbols,
Identifier(metadata,symbols,'c'),
Identifier(metadata,symbols,'IStudent'))
- ], Identifier(metadata,symbols,'c'))
+ ], Identifier(metadata,symbols,'c')))
self.doit(query, qo, set(metadata.getAll('IStudent')))
@@ -113,7 +111,7 @@
# set [ c in IStudent | c.name ]
#
query = "[c in IStudent | c.name]"
- qo = Query(
+ qo = Head(Query(
metadata, symbols,
set,
[
@@ -121,7 +119,7 @@
metadata, symbols,
Identifier(metadata, symbols,'c'),
Identifier(metadata, symbols, 'IStudent'))
- ],Identifier(metadata, symbols, 'c.name'))
+ ],Identifier(metadata, symbols, 'c.name')))
self.doit(query, qo, set(["Charith", "Jane", "Ann"]))
@@ -132,7 +130,7 @@
# set [ c in IProject , c.description="test" | c.name]
#
query = "[c in IProject , c.description=test | c.name]"
- qo = Query(
+ qo = Head(Query(
metadata, symbols,
set,
[
@@ -144,7 +142,7 @@
metadata,symbols,
Identifier(metadata, symbols, 'c.description'),
Identifier(metadata, symbols, '"test"'))
- ], Identifier(metadata, symbols, 'c.name'))
+ ], Identifier(metadata, symbols, 'c.name')))
self.doit(query, qo, set(["Save the world"]))
More information about the Checkins
mailing list