Merge branch 'master' into interval-error-message

apache · Jan 12, 2024 · 08bff49 · 08bff49
2 parents b0464de + 6c18434
commit 08bff49
Show file tree

Hide file tree

Showing 645 changed files with 24,814 additions and 16,553 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -21,47 +21,71 @@
 # Pull Request Labeler GitHub Action Configuration: https://github.com/marketplace/actions/labeler
 
 'Area - Batch Ingestion':
-  - 'indexing-hadoop/**'
-  - 'extensions-core/multi-stage-query/**'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'indexing-hadoop/**'
+      - 'extensions-core/multi-stage-query/**'
 
 'Area - Dependencies':
-  - '**/pom.xml'
-  - 'licenses.yaml'
+  - changed-files:
+    - any-glob-to-any-file:
+      - '**/pom.xml'
+      - 'licenses.yaml'
 
 'Area - Documentation':
-  - 'docs/**/*'
-  - 'website/**'
-  - 'examples/quickstart/jupyter-notebooks/**'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'docs/**/*'
+      - 'website/**'
+      - 'examples/quickstart/jupyter-notebooks/**'
 
 'Area - Ingestion':
-  - 'indexing-service/**'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'indexing-service/**'
 
 'Area - Lookups':
-  - 'extensions-core/lookups-cached-global/**'
-  - 'extensions-core/lookups-cached-single/**'
-  - 'extensions-core/kafka-extraction-namespace/**'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'extensions-core/lookups-cached-global/**'
+      - 'extensions-core/lookups-cached-single/**'
+      - 'extensions-core/kafka-extraction-namespace/**'
 
 'Area - Metrics/Event Emitting':
-  - 'processing/src/main/java/org/apache/druid/java/util/metrics/**'
-  - 'processing/src/main/java/org/apache/druid/java/util/emitter/**'
-  - 'extensions-contrib/*-emitter/**'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'processing/src/main/java/org/apache/druid/java/util/metrics/**'
+      - 'processing/src/main/java/org/apache/druid/java/util/emitter/**'
+      - 'extensions-contrib/*-emitter/**'
 
 'Area - MSQ':
-  - 'extensions-core/multi-stage-query/**'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'extensions-core/multi-stage-query/**'
 
 'Area - Querying':
-  - 'sql/**'
-  - 'extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/**'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'sql/**'
+      - 'extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/sql/**'
 
 'Area - Segment Format and Ser/De':
-  - 'processing/src/main/java/org/apache/druid/segment/**'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'processing/src/main/java/org/apache/druid/segment/**'
 
 'Area - Streaming Ingestion':
-  - 'extensions-core/kafka-indexing-service/**'
-  - 'extensions-core/kinesis-indexing-service/**'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'extensions-core/kafka-indexing-service/**'
+      - 'extensions-core/kinesis-indexing-service/**'
 
 'Area - Web Console':
-  - 'web-console/**'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'web-console/**'
 
 'Kubernetes':
-  - 'extensions-contrib/kubernetes-overlord-extensions/**'
+  - changed-files:
+    - any-glob-to-any-file:
+      - 'extensions-contrib/kubernetes-overlord-extensions/**'
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,8 +2,18 @@ name: "CodeQL"
 
 on:
   push:
+    paths-ignore:
+      - '**/*.md'
+      - 'dev/**'
+      - 'docs/**'
+      - 'helm/**'
     branches: [ 'master', '0.6.x', '0.7.x', '0.7.1.x', '0.7.2.x', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.9.0', '0.9.1' ]
   pull_request:
+    paths-ignore:
+      - '**/*.md'
+      - 'dev/**'
+      - 'docs/**'
+      - 'helm/**'
     # The branches below must be a subset of the branches above
     branches: [ 'master' ]
   schedule:
@@ -37,7 +47,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/config/codeql-config.yml
@@ -63,6 +73,6 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -32,6 +32,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v4
+    - uses: actions/labeler@v5
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml
@@ -168,6 +168,7 @@ jobs:
           (cd website && npm install)
           cd website
           npm run build
+          npm run link-lint
           npm run spellcheck
 
       - name: web console

diff --git a/...c/test/java/org/apache/druid/benchmark/DictionaryEncodedStringIndexSupplierBenchmark.java b/...c/test/java/org/apache/druid/benchmark/DictionaryEncodedStringIndexSupplierBenchmark.java
@@ -145,6 +145,5 @@ private Iterable<Integer> intGenerator()
   public void doValueSetCheck(Blackhole blackhole, BenchmarkState state)
   {
     BitmapColumnIndex bitmapIndex = state.stringValueSetIndex.forSortedValuesUtf8(state.values);
-    bitmapIndex.estimateSelectivity(10_000_000);
   }
 }
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/DimensionPredicateFilterBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/DimensionPredicateFilterBenchmark.java
@@ -20,7 +20,6 @@
 package org.apache.druid.benchmark;
 
 import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import org.apache.druid.collections.bitmap.BitmapFactory;
 import org.apache.druid.collections.bitmap.ImmutableBitmap;
@@ -32,7 +31,9 @@
 import org.apache.druid.query.filter.DruidDoublePredicate;
 import org.apache.druid.query.filter.DruidFloatPredicate;
 import org.apache.druid.query.filter.DruidLongPredicate;
+import org.apache.druid.query.filter.DruidObjectPredicate;
 import org.apache.druid.query.filter.DruidPredicateFactory;
+import org.apache.druid.query.filter.DruidPredicateMatch;
 import org.apache.druid.segment.data.BitmapSerdeFactory;
 import org.apache.druid.segment.data.GenericIndexed;
 import org.apache.druid.segment.data.RoaringBitmapSerdeFactory;
@@ -73,37 +74,32 @@ public class DimensionPredicateFilterBenchmark
       new DruidPredicateFactory()
       {
         @Override
-        public Predicate<String> makeStringPredicate()
+        public DruidObjectPredicate<String> makeStringPredicate()
         {
-          return new Predicate<String>()
-          {
-            @Override
-            public boolean apply(String input)
-            {
-              if (input == null) {
-                return false;
-              }
-              return Integer.parseInt(input) % 2 == 0;
+          return (DruidObjectPredicate<String>) input -> {
+            if (input == null) {
+              return DruidPredicateMatch.UNKNOWN;
             }
+            return DruidPredicateMatch.of(Integer.parseInt(input) % 2 == 0);
           };
         }
 
         @Override
         public DruidLongPredicate makeLongPredicate()
         {
-          return DruidLongPredicate.ALWAYS_FALSE;
+          return DruidLongPredicate.ALWAYS_FALSE_WITH_NULL_UNKNOWN;
         }
 
         @Override
         public DruidFloatPredicate makeFloatPredicate()
         {
-          return DruidFloatPredicate.ALWAYS_FALSE;
+          return DruidFloatPredicate.ALWAYS_FALSE_WITH_NULL_UNKNOWN;
         }
 
         @Override
         public DruidDoublePredicate makeDoublePredicate()
         {
-          return DruidDoublePredicate.ALWAYS_FALSE;
+          return DruidDoublePredicate.ALWAYS_FALSE_WITH_NULL_UNKNOWN;
         }
       },
       null

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/ExpressionFilterBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/ExpressionFilterBenchmark.java
@@ -25,6 +25,7 @@
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.java.util.common.guava.Sequence;
 import org.apache.druid.java.util.common.io.Closer;
+import org.apache.druid.math.expr.ExpressionProcessing;
 import org.apache.druid.query.expression.TestExprMacroTable;
 import org.apache.druid.query.filter.AndDimFilter;
 import org.apache.druid.query.filter.DimFilter;
@@ -70,6 +71,7 @@ public class ExpressionFilterBenchmark
 {
   static {
     NullHandling.initializeForTests();
+    ExpressionProcessing.initializeForTests();
   }
 
   @Param({"1000000"})