Merge branch 'main' into cijothomas/selective-ci

Author: cijothomas

rust/experimental/query_engine/engine-columnar/benches/filter.rs

@@ -102,7 +102,42 @@ fn bench_filter_pipelines(c: &mut Criterion) {
         "logs | where 
             (attributes[\"code.namespace\"] == \"main\" and attributes[\"code.line\"] == 2) 
             or 
-            (attributes[\"code.namespace\"] == \"otap_dataflow_engine\" and attributes[\"code.line\"] == 3)",
+            (attributes[\"code.namespace\"] == \"otap_dataflow_engine\" and attributes[\"code.line.number\"] == 3)",
+    );
+
+    bench_log_pipeline(
+        c,
+        &rt,
+        &batch_sizes,
+        "and_attrs_short_circuit",
+        // left expr of "and" should always return false for all rows
+        "logs | where attributes[\"code.line.number\"] > 1000 and attributes[\"code.line.number\"] == 2",
+    );
+
+    bench_log_pipeline(
+        c,
+        &rt,
+        &batch_sizes,
+        "and_short_circuit",
+        // left expr of "and" should be false for all rows
+        //
+        // this is different from the case above in that the "and" here is currently something that
+        // won't get optimized into a Composite<AttributeFilterExec> so we can test the fast path
+        // in Composite<FilterExec>
+        "logs | where severity_text == \"invalid value\" and attributes[\"code.line.number\"] == 2",
+    );
+
+    bench_log_pipeline(
+        c,
+        &rt,
+        &batch_sizes,
+        "or_short_circuit",
+        // left expr of "or" should be true for all rows
+        //
+        // this is different from the case above in that the "and" here is currently something that
+        // won't get optimized into a Composite<AttributeFilterExec> so we can test the fast path
+        // in Composite<FilterExec>
+        "logs | where attributes[\"code.line.number\"] >= 0 or not(attributes[\"some.attr\"] >= 0 and severity_text == \"WARN\")",
     );
 }