checkpoint

eva/optimizer/rules/rules.py

@@ -222,7 +222,7 @@ def __init__(self):
     def promise(self):
         return Promise.EMBED_FILTER_INTO_DERIVED_GET
 
-    def check(self, before: Operator, context: OptimizerContext):
+    def check(self, before: LogicalFilter, context: OptimizerContext):
         # nothing else to check if logical match found return true
         return True
 
@@ -249,7 +249,7 @@ def __init__(self):
     def promise(self):
         return Promise.EMBED_PROJECT_INTO_DERIVED_GET
 
-    def check(self, before: Operator, context: OptimizerContext):
+    def check(self, before: LogicalProject, context: OptimizerContext):
         # nothing else to check if logical match found return true
         return True
 
@@ -778,25 +778,6 @@ def apply(self, before: LogicalGet, context: OptimizerContext):
         yield after
 
 
-class LogicalSampleToUniformSample(Rule):
-    def __init__(self):
-        pattern = Pattern(OperatorType.LOGICALSAMPLE)
-        pattern.append_child(Pattern(OperatorType.DUMMY))
-        super().__init__(RuleType.LOGICAL_SAMPLE_TO_UNIFORMSAMPLE, pattern)
-
-    def promise(self):
-        return Promise.LOGICAL_SAMPLE_TO_UNIFORMSAMPLE
-
-    def check(self, before: Operator, context: OptimizerContext):
-        return True
-
-    def apply(self, before: LogicalSample, context: OptimizerContext):
-        after = SamplePlan(before.sample_freq)
-        for child in before.children:
-            after.append_child(child)
-        yield after
-
-
 class LogicalDerivedGetToPhysical(Rule):
     def __init__(self):
         pattern = Pattern(OperatorType.LOGICALQUERYDERIVEDGET)

eva/optimizer/rules/rules_manager.py

@@ -62,7 +62,6 @@
 )
 from eva.optimizer.rules.rules import (
     LogicalRenameToPhysical,
-    LogicalSampleToUniformSample,
     LogicalShowToPhysical,
     LogicalUnionToPhysical,
     LogicalUploadToPhysical,
@@ -101,7 +100,6 @@ def __init__(self):
             LogicalDeleteToPhysical(),
             LogicalLoadToPhysical(),
             LogicalUploadToPhysical(),
-            LogicalSampleToUniformSample(),
             DistributedLogicalGetToSeqScan()
             if ray_enabled
             else SequentialLogicalGetToSeqScan(),

test/integration_tests/test_optimizer_rules.py

@@ -86,6 +86,8 @@ def test_should_benefit_from_pushdown(self, evaluate_mock):
 
         self.assertEqual(result_without_xform_rule, result_with_rule)
 
+
+
     def test_should_support_pushdown_with_right_join(self):
         query = """SELECT A.id FROM MyVideo AS A JOIN MyVideo AS B
                     WHERE A.id = B.id AND B.id < 10"""

test/optimizer/rules/test_rules.py

@@ -28,6 +28,7 @@
     LogicalProject,
     LogicalQueryDerivedGet,
     LogicalSample,
+    LogicalJoin    
 )
 from eva.optimizer.rules.rules import (
     CombineSimilarityOrderByAndLimitToFaissIndexScan,
@@ -60,7 +61,6 @@
     LogicalOrderByToPhysical,
     LogicalProjectToPhysical,
     LogicalRenameToPhysical,
-    LogicalSampleToUniformSample,
     LogicalShowToPhysical,
     LogicalUnionToPhysical,
     LogicalUploadToPhysical,
@@ -71,7 +71,7 @@
 )
 from eva.optimizer.rules.rules_manager import RulesManager
 from eva.server.command_handler import execute_query_fetch_all
-
+from eva.parser.types import JoinType
 
 class RulesTest(unittest.TestCase):
     @classmethod
@@ -189,7 +189,6 @@ def test_supported_rules(self):
             LogicalDeleteToPhysical(),
             LogicalLoadToPhysical(),
             LogicalUploadToPhysical(),
-            LogicalSampleToUniformSample(),
             LogicalGetToSeqScan(),
             LogicalDerivedGetToPhysical(),
             LogicalUnionToPhysical(),
@@ -251,26 +250,26 @@ def test_simple_filter_into_get(self):
         self.assertFalse(rewrite_opr is logi_get)
         self.assertEqual(rewrite_opr.predicate, predicate)
 
-    # EmbedFilterIntoDerivedGet
-    def test_simple_filter_into_derived_get(self):
+    def test_embed_filter_into_derived_get(self):
         rule = EmbedFilterIntoDerivedGet()
         predicate = MagicMock()
 
         logi_derived_get = LogicalQueryDerivedGet(MagicMock())
         logi_filter = LogicalFilter(predicate, [logi_derived_get])
 
+        self.assertTrue(rule.check(logi_derived_get, MagicMock()))
         rewrite_opr = next(rule.apply(logi_filter, MagicMock()))
         self.assertFalse(rewrite_opr is logi_derived_get)
         self.assertEqual(rewrite_opr.predicate, predicate)
 
-    # EmbedProjectIntoDerivedGet
-    def test_simple_project_into_derived_get(self):
+    def test_embed_project_into_derived_get(self):
         rule = EmbedProjectIntoDerivedGet()
         target_list = MagicMock()
 
         logi_derived_get = LogicalQueryDerivedGet(MagicMock())
         logi_project = LogicalProject(target_list, [logi_derived_get])
 
+        self.assertTrue(rule.check(logi_derived_get, MagicMock()))
         rewrite_opr = next(rule.apply(logi_project, MagicMock()))
         self.assertFalse(rewrite_opr is logi_derived_get)
         self.assertEqual(rewrite_opr.target_list, target_list)
@@ -286,3 +285,8 @@ def test_embed_sample_into_get_does_not_work_with_structured_data(self):
         logi_sample = LogicalSample(MagicMock(), children=[logi_get])
 
         self.assertFalse(rule.check(logi_sample, MagicMock()))
+
+    def test_xform_lateral_join_does_not_work_with_other_join(self):
+        rule = XformLateralJoinToLinearFlow()
+        logi_join = LogicalJoin(JoinType.INNER_JOIN)
+        self.assertFalse(rule.check(logi_join, MagicMock()))