Merge branch 'master' into msq-disallow-top-level-union-all

LakshSingla · Sep 26, 2023 · fd652a7 · fd652a7
2 parents 75652e6 + 7301e60
commit fd652a7
Show file tree

Hide file tree

Showing 218 changed files with 8,483 additions and 1,533 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -46,9 +46,12 @@
   - 'processing/src/main/java/org/apache/druid/java/util/emitter/**'
   - 'extensions-contrib/*-emitter/**'
 
+'Area - MSQ':
+  - 'extensions-core/multi-stage-query/**'
+
 'Area - Querying':
   - 'sql/**'
-  - 'extensions-core/multi-stage-query/**'
+  - '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/**'
@@ -62,6 +65,3 @@
 
 'Kubernetes':
   - 'extensions-contrib/kubernetes-overlord-extensions/**'
-
-'MSQ':
-  - 'extensions-core/multi-stage-query/**'
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -29,6 +29,12 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - uses: actions/setup-java@v3
+      with:
+        distribution: 'zulu'
+        java-version: '8'
+        cache: 'maven'
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
@@ -42,7 +48,6 @@ jobs:
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         queries: +security-and-quality
 
-
     - run: |
         echo "Building using custom commands"
         mvn clean package -f "pom.xml" -B -V -e -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Denforcer.skip -Dmaven.javadoc.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Dweb.console.skip=true -Dcyclonedx.skip=true

diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml
@@ -41,20 +41,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 'jdk8', 'jdk11', 'jdk17' ]
+        java: [ '8', '11', '17' ]
     runs-on: ubuntu-latest
     steps:
       - name: checkout branch
         uses: actions/checkout@v3
 
-      - name: set java version
-        run: |
-          export jdk=${{ matrix.java }}
-          echo "java_version=${jdk:3}" >> $GITHUB_ENV
-
-      - name: setup ${{ matrix.java }}
-        run: |
-          echo "JAVA_HOME=$JAVA_HOME_${{ env.java_version }}_X64" >> $GITHUB_ENV
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: ${{ matrix.java }}
+          cache: 'maven'
 
       - name: packaging check
         run: |
@@ -66,53 +63,53 @@ jobs:
 
       - name: script checks
         # who watches the watchers?
-        if: ${{ matrix.java == 'jdk8' }}
+        if: ${{ matrix.java == '8' }}
         run: ./check_test_suite_test.py
 
       - name: (openjdk17) strict compilation
-        if: ${{ matrix.java == 'jdk17' }}
+        if: ${{ matrix.java == '17' }}
         # errorprone requires JDK 11+
         # Strict compilation requires more than 2 GB
         run: ${MVN} clean -DstrictCompile compile test-compile --fail-at-end ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS}
 
       - name: maven install
-        if: ${{ matrix.java == 'jdk8' }}
+        if: ${{ matrix.java == '8' }}
         run: |
           echo 'Running Maven install...' &&
           ${MVN} clean install -q -ff -pl '!distribution,!:druid-it-image,!:druid-it-cases' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -T1C &&
           ${MVN} install -q -ff -pl 'distribution' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS}
 
       - name: checkstyle
-        if: ${{ matrix.java == 'jdk8' }}
+        if: ${{ matrix.java == '8' }}
         run: ${MVN} checkstyle:checkstyle --fail-at-end
 
       - name: license checks
-        if: ${{ matrix.java == 'jdk8' }}
+        if: ${{ matrix.java == '8' }}
         run: ./.github/scripts/license_checks_script.sh
 
       - name: analyze dependencies
-        if: ${{ matrix.java == 'jdk8' }}
+        if: ${{ matrix.java == '8' }}
         run: |
           ./.github/scripts/analyze_dependencies_script.sh
 
       - name: animal sniffer checks
-        if: ${{ matrix.java == 'jdk8' }}
+        if: ${{ matrix.java == '8' }}
         run: ${MVN} animal-sniffer:check --fail-at-end
 
       - name: enforcer checks
-        if: ${{ matrix.java == 'jdk8' }}
+        if: ${{ matrix.java == '8' }}
         run: ${MVN} enforcer:enforce --fail-at-end
 
       - name: forbidden api checks
-        if: ${{ matrix.java == 'jdk8' }}
+        if: ${{ matrix.java == '8' }}
         run: ${MVN} forbiddenapis:check forbiddenapis:testCheck --fail-at-end
 
       - name: pmd checks
-        if: ${{ matrix.java == 'jdk8' }}
+        if: ${{ matrix.java == '8' }}
         run: ${MVN} pmd:check --fail-at-end  # TODO: consider adding pmd:cpd-check
 
       - name: spotbugs checks
-        if: ${{ matrix.java == 'jdk8' }}
+        if: ${{ matrix.java == '8' }}
         run: ${MVN} spotbugs:check --fail-at-end -pl '!benchmarks'
 
   intellij-inspections:
@@ -123,9 +120,11 @@ jobs:
       - name: checkout branch
         uses: actions/checkout@v3
 
-      - name: setup JDK8
-        run: |
-          echo "JAVA_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8'
+          cache: 'maven'
 
       - name: maven install
         run: |
@@ -153,9 +152,11 @@ jobs:
       - name: checkout branch
         uses: actions/checkout@v3
 
-      - name: setup JDK17
-        run: |
-          echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+          cache: 'maven'
 
       - name: setup node
         uses: actions/setup-node@v3

diff --git a/doap_Druid.rdf b/doap_Druid.rdf
@@ -22,7 +22,7 @@
     limitations under the License.
 -->
   <Project rdf:about="https://druid.apache.org/">
-    <created>2023-09-08</created>
+    <created>2012-10-23</created>
     <license rdf:resource="https://spdx.org/licenses/Apache-2.0" />
     <name>Apache Druid</name>
     <homepage rdf:resource="https://druid.apache.org/" />

diff --git a/docs/querying/sql-operators.md b/docs/querying/sql-operators.md
@@ -79,7 +79,9 @@ Also see the [CONCAT function](sql-scalar.md#string-functions).
 |Operator|Description|
 |--------|-----------|
 |`x = y` |Equal to|
+|`x IS NOT DISTINCT FROM y`|Equal to, considering `NULL` as a value. Never returns `NULL`.|
 |`x <> y`|Not equal to|
+|`x IS DISTINCT FROM y`|Not equal to, considering `NULL` as a value. Never returns `NULL`.|
 |`x > y` |Greater than|
 |`x >= y`|Greater than or equal to|
 |`x < y` |Less than|

diff --git a/extensions-contrib/aliyun-oss-extensions/pom.xml b/extensions-contrib/aliyun-oss-extensions/pom.xml
@@ -168,6 +168,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/extensions-contrib/ambari-metrics-emitter/pom.xml b/extensions-contrib/ambari-metrics-emitter/pom.xml
@@ -145,6 +145,13 @@
           </ignoredUnusedDeclaredDependencies>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.owasp</groupId>
+        <artifactId>dependency-check-maven</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/extensions-contrib/cassandra-storage/pom.xml b/extensions-contrib/cassandra-storage/pom.xml
@@ -173,4 +173,15 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/extensions-contrib/cloudfiles-extensions/pom.xml b/extensions-contrib/cloudfiles-extensions/pom.xml
@@ -160,4 +160,15 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/extensions-contrib/compressed-bigdecimal/pom.xml b/extensions-contrib/compressed-bigdecimal/pom.xml
@@ -142,4 +142,16 @@
       <artifactId>jackson-annotations</artifactId>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.owasp</groupId>
+        <artifactId>dependency-check-maven</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/extensions-contrib/distinctcount/pom.xml b/extensions-contrib/distinctcount/pom.xml
@@ -101,4 +101,15 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/extensions-contrib/dropwizard-emitter/pom.xml b/extensions-contrib/dropwizard-emitter/pom.xml
@@ -114,4 +114,16 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.owasp</groupId>
+        <artifactId>dependency-check-maven</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/extensions-contrib/druid-iceberg-extensions/pom.xml b/extensions-contrib/druid-iceberg-extensions/pom.xml
@@ -357,4 +357,16 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.owasp</groupId>
+        <artifactId>dependency-check-maven</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/extensions-contrib/gce-extensions/pom.xml b/extensions-contrib/gce-extensions/pom.xml
@@ -121,4 +121,16 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.owasp</groupId>
+        <artifactId>dependency-check-maven</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/extensions-contrib/graphite-emitter/pom.xml b/extensions-contrib/graphite-emitter/pom.xml
@@ -110,4 +110,16 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.owasp</groupId>
+        <artifactId>dependency-check-maven</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/extensions-contrib/influx-extensions/pom.xml b/extensions-contrib/influx-extensions/pom.xml
@@ -120,6 +120,13 @@
       <id>strict</id>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.owasp</groupId>
+            <artifactId>dependency-check-maven</artifactId>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/extensions-contrib/influxdb-emitter/pom.xml b/extensions-contrib/influxdb-emitter/pom.xml
@@ -82,4 +82,16 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/extensions-contrib/kafka-emitter/pom.xml b/extensions-contrib/kafka-emitter/pom.xml
@@ -117,4 +117,16 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.owasp</groupId>
+        <artifactId>dependency-check-maven</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>