Merge remote-tracking branch 'upstream/master'

317brian · Feb 13, 2024 · 603eba0 · 603eba0
2 parents 66e8bb5 + cae9cbd
commit 603eba0
Show file tree

Hide file tree

Showing 342 changed files with 9,052 additions and 12,823 deletions.
diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml
@@ -187,11 +187,11 @@ jobs:
           web-console/script/druid stop
 
       - name: Tar druid logs
-        if: ${{ steps.web-console-test.conclusion == 'failure' }}
+        if: ${{ failure() && steps.web-console-test.conclusion == 'failure' }}
         run: tar cvzf ./druid-logs.tgz -C ./distribution/target/apache-druid-*-SNAPSHOT/ log
 
       - name: Upload druid logs to GitHub
-        if: ${{ steps.web-console-test.conclusion == 'failure' }}
+        if: ${{ failure() && steps.web-console-test.conclusion == 'failure' }}
         uses: actions/upload-artifact@master
         with:
           name: Druid logs web-checks

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/lookup/LookupBenchmarkUtil.java b/benchmarks/src/test/java/org/apache/druid/benchmark/lookup/LookupBenchmarkUtil.java
@@ -77,7 +77,7 @@ public LookupExtractor build(Iterable<Pair<String, String>> keyValuePairs)
         return new MapLookupExtractor(map, false);
       }
     },
-    REVERSIBLE {
+    IMMUTABLE {
       @Override
       public LookupExtractor build(Iterable<Pair<String, String>> keyValuePairs)
       {

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/lookup/SqlReverseLookupBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/lookup/SqlReverseLookupBenchmark.java
@@ -72,7 +72,7 @@ public class SqlReverseLookupBenchmark
   /**
    * Type of lookup to benchmark. All are members of enum {@link LookupBenchmarkUtil.LookupType}.
    */
-  @Param({"hashmap"})
+  @Param({"hashmap", "immutable"})
   private String lookupType;
 
   /**
@@ -84,7 +84,7 @@ public class SqlReverseLookupBenchmark
   /**
    * Average number of keys that map to each value.
    */
-  @Param({"100000", "200000", "400000", "800000", "1600000"})
+  @Param({"1000", "5000", "10000", "100000"})
   private int keysPerValue;
 
   private SqlEngine engine;
@@ -133,8 +133,10 @@ public void tearDown() throws Exception
   @OutputTimeUnit(TimeUnit.MILLISECONDS)
   public void planEquals(Blackhole blackhole)
   {
-    final String sql =
-        "SELECT COUNT(*) FROM foo WHERE LOOKUP(dimZipf, 'benchmark-lookup', 'N/A') = '0'";
+    final String sql = StringUtils.format(
+        "SELECT COUNT(*) FROM foo WHERE LOOKUP(dimZipf, 'benchmark-lookup', 'N/A') = '%s'",
+        LookupBenchmarkUtil.makeKeyOrValue(0)
+    );
     try (final DruidPlanner planner = plannerFactory.createPlannerForTesting(engine, sql, ImmutableMap.of())) {
       final PlannerResult plannerResult = planner.plan();
       blackhole.consume(plannerResult);
@@ -146,8 +148,10 @@ public void planEquals(Blackhole blackhole)
   @OutputTimeUnit(TimeUnit.MILLISECONDS)
   public void planNotEquals(Blackhole blackhole)
   {
-    final String sql =
-        "SELECT COUNT(*) FROM foo WHERE LOOKUP(dimZipf, 'benchmark-lookup', 'N/A') <> '0'";
+    final String sql = StringUtils.format(
+        "SELECT COUNT(*) FROM foo WHERE LOOKUP(dimZipf, 'benchmark-lookup', 'N/A') <> '%s'",
+        LookupBenchmarkUtil.makeKeyOrValue(0)
+    );
     try (final DruidPlanner planner = plannerFactory.createPlannerForTesting(engine, sql, ImmutableMap.of())) {
       final PlannerResult plannerResult = planner.plan();
       blackhole.consume(plannerResult);

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -257,8 +257,6 @@
                                         <argument>org.apache.druid.extensions:druid-kubernetes-extensions</argument>
                                         <argument>-c</argument>
                                         <argument>org.apache.druid.extensions:druid-catalog</argument>
-                                        <argument>-c</argument>
-                                        <argument>org.apache.druid.extensions:druid-deltalake-extensions</argument>
                                         <argument>${druid.distribution.pulldeps.opts}</argument>
                                     </arguments>
                                 </configuration>
@@ -453,9 +451,9 @@
                                         <argument>-c</argument>
                                         <argument>org.apache.druid.extensions.contrib:opentelemetry-emitter</argument>
                                         <argument>-c</argument>
-                                        <argument>org.apache.druid.extensions:druid-iceberg-extensions</argument>
+                                        <argument>org.apache.druid.extensions.contrib:druid-iceberg-extensions</argument>
                                         <argument>-c</argument>
-                                        <argument>org.apache.druid.extensions:druid-deltalake-extensions</argument>
+                                        <argument>org.apache.druid.extensions.contrib:druid-deltalake-extensions</argument>
                                         <argument>-c</argument>
                                         <argument>org.apache.druid.extensions.contrib:druid-spectator-histogram</argument>
                                     </arguments>