Merge branch 'multiway_join_rules' into disable-temp-store

Conflicts:
	raco/algebra.py
	raco/compile.py
	raco/datalog/datalog_test.py
	raco/datalog/query_tests.py
	raco/myrial/interpreter.py
	raco/myrial/myrial_test.py
	raco/myrial/optimizer_tests.py
	raco/myrialang.py
	raco/operator_test.py

README.md

@@ -18,8 +18,8 @@ Output languages include:
 * The Myria physical algebra.
 * A pseudocode algebra
 * A Python algebra
-* A C algebra
-* A Grappa algebra
+* A C++ algebra, C++ source code
+* A Grappa algebra, Grappa source code
 
 Users can of course author programs by directly instantiating one of the intermediate or output algebras as well as one of the source languages.
 

c_test_environment/clang_tests.py

@@ -17,7 +17,7 @@
 class ClangTest(unittest.TestCase, PlatformTest):
     def check(self, query, name):
         with Chdir("c_test_environment") as d:
-            emitCode(query, name, CCAlgebra)
+            emitCode(query, name, CCAlgebra())
             checkquery(name, ClangRunner())
 
     def setUp(self):

dlogcompiletest.py

@@ -116,7 +116,7 @@ def comment(s):
 dlog.fromDatalog(query)
 print dlog.logicalplan
 
-dlog.optimize(target=MyriaAlgebra, eliminate_common_subexpressions=False)
+dlog.optimize(target=MyriaAlgebra(), eliminate_common_subexpressions=False)
 
 code = dlog.compile()
 print code

examples/example_queries.py

@@ -1,4 +1,4 @@
-from raco.language import CCAlgebra, MyriaAlgebra, GrappaAlgebra
+from raco.language import CCAlgebra, GrappaAlgebra
 from emitcode import emitCode
 
 import logging

examples/grappa_test_query.py

@@ -1,5 +1,5 @@
 from raco import RACompiler
-from raco.language import CCAlgebra, MyriaAlgebra, GrappaAlgebra
+from raco.language import CCAlgebra, GrappaAlgebra
 from raco.algebra import LogicalAlgebra
 
 import logging

examples/sp2bench/sp2bench_rdf.py

@@ -1,5 +1,5 @@
 import test_query
-from raco.language import CCAlgebra, MyriaAlgebra, GrappaAlgebra
+from raco.language import CCAlgebra, GrappaAlgebra
 
 
 tr = "sp2bench_1m"

examples/sp2bench/sp2bench_rdf_long.py

@@ -2,7 +2,7 @@
 import raco.algebra as algebra
 import raco.rules as rules
 from raco.grappalang import GrappaSymmetricHashJoin, GrappaHashJoin
-from raco.language import CCAlgebra, MyriaAlgebra, GrappaAlgebra
+from raco.language import CCAlgebra, GrappaAlgebra
 
 
 tr = "sp2bench_1m"

expressiontest.py

@@ -26,7 +26,7 @@ def testRA():
   R = raco.catalog.Relation("R", sch)
   J = Join(EQ(e.UnnamedAttributeRef(0), e.NamedAttributeRef("x")), Scan(R), Scan(R))
   A = Apply(J, z=e.PLUS(e.NamedAttributeRef("x"), e.NamedAttributeRef("y")), w=e.UnnamedAttributeRef(3))
-  exprs = optimize([('A',A)], target=MyriaAlgebra, source=LogicalAlgebra)
+  exprs = optimize([('A',A)], target=MyriaAlgebra(), source=LogicalAlgebra)
   print exprs
   print compile(exprs)
 
@@ -46,7 +46,7 @@ def testDatalog():
 
   # Optimize the query, includes producing a physical plan
   print "************ PHYSICAL PLAN *************"
-  dlog.optimize(target=MyriaAlgebra, eliminate_common_subexpressions=False)
+  dlog.optimize(target=MyriaAlgebra(), eliminate_common_subexpressions=False)
   print dlog.physicalplan
   print
 

external_iterate.py

@@ -7,8 +7,6 @@
 import raco.scheme
 from raco import algebra
 from raco import myrialang
-from raco.compile import optimize
-from raco.language import MyriaAlgebra
 
 import myria
 

hellodatalogworld.py

@@ -29,7 +29,7 @@
 # expression to a target expression
 #result = optimize(ra, target=PseudoCodeAlgebra, source=LogicalAlgebra)
 #result = optimize(ra, target=ProtobufAlgebra, source=LogicalAlgebra)
-result = optimize(ra, target=MyriaAlgebra, source=LogicalAlgebra)
+result = optimize(ra, target=MyriaAlgebra(), source=LogicalAlgebra)
 
 print result
 

helloworld.py

@@ -105,7 +105,7 @@ def comment(s):
 
 # Optimize the query, includes producing a physical plan
 print "************ PHYSICAL PLAN *************"
-dlog.optimize(target=MyriaAlgebra, eliminate_common_subexpressions=False)
+dlog.optimize(target=MyriaAlgebra(), eliminate_common_subexpressions=False)
 print dlog.physicalplan
 print
 

raco/__init__.py

@@ -1,5 +1,5 @@
 from raco.datalog.grammar import parse
-from raco.language import MyriaAlgebra
+from raco.language import MyriaLeftDeepTreeAlgebra
 from raco.algebra import LogicalAlgebra
 from raco.compile import optimize
 
@@ -20,8 +20,9 @@ def fromDatalog(self, program):
         LOG.debug("parser output: %s", self.parsed)
         self.logicalplan = self.parsed.toRA()
 
-    def optimize(self, target=MyriaAlgebra,
-                 eliminate_common_subexpressions=False):
+    def optimize(self, target=MyriaLeftDeepTreeAlgebra(),
+                 eliminate_common_subexpressions=False,
+                 environment_variables=None):
         """Convert logical plan to physical plan"""
         self.target = target
         self.physicalplan = optimize(