BACKPORT-TO-STABLE: Backported fixes for Drill 1.21.2

.asf.yaml

@@ -1,6 +1,15 @@
 # https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories
 
 github:
+  protected_branches:
+    master:
+      required_status_checks:
+        # strict means "Require branches to be up to date before merging".
+        strict: false
+      required_pull_request_reviews:
+        dismiss_stale_reviews: false
+        require_code_owner_reviews: false
+        required_approving_review_count: 1
   description: "Apache Drill is a distributed MPP query layer for self describing data"
   homepage: https://drill.apache.org/
   labels:
@@ -12,11 +21,23 @@ github:
     - hadoop
     - jdbc
     - parquet
-  
+
   features:
     # Enable wiki for documentation
     wiki: true
     # Enable issue management
     issues: true
     # Enable projects for project management boards
     projects: true
+
+  # Attempt to make the auto-generated github emails more easily readable in email clients.
+  custom_subjects:
+    new_pr: "[PR] {title} ({repository})"
+    close_pr: "Re: [PR] {title} ({repository})"
+    comment_pr: "Re: [PR] {title} ({repository})"
+    diffcomment: "Re: [PR] {title} ({repository})"
+    merge_pr: "Re: [PR] {title} ({repository})"
+    new_issue: "[I] {title} ({repository})"
+    comment_issue: "Re: [I] {title} ({repository})"
+    close_issue: "Re: [I] {title} ({repository})"
+    catchall: "[GH] {title} ({repository})"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,10 +2,11 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: ''
+labels: 'bug,needs-triage'
 assignees: ''
 
 ---
+Before submitting a bug report, please verify that you are using the most current version of Drill.  
 
 **Describe the bug**
 A clear and concise description of what the bug is.

.github/workflows/ci.yml

@@ -29,6 +29,7 @@ jobs:
   build:
     name: Main Build
     runs-on: ubuntu-latest
+    if: github.repository == 'apache/drill'
     timeout-minutes: 150
     strategy:
       matrix:
@@ -41,42 +42,50 @@ jobs:
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
           cache: 'maven'
+      - name: Set up swap space
+        # Linux Action Runners come with 7GB of RAM which isn't quite enoough
+        # to run the test suite. Two workarounds are used below: a swap file is
+        # added to the Runner and memory hungry tests are run separately.
+        run: |
+          sudo sh -c "
+            fallocate -l 4G /tmp/swapfile
+            chmod 0600 /tmp/swapfile
+            mkswap /tmp/swapfile
+            swapon /tmp/swapfile
+          "
       - name: Build and test
-        # The total GitHub Actions memory is 7000Mb. But GitHub CI requires some memory for the container to perform tests
         run: |
-          MAVEN_OPTS="-XX:+UseG1GC"
-          sudo sh -c 'echo 1 > /proc/sys/vm/drop_caches' && \
           mvn -P${{ matrix.profile }} install --batch-mode --no-transfer-progress \
-          -DexcludedGroups=org.apache.drill.categories.EasyOutOfMemory \
-          -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
-      - name: Test Specific Categories # EasyOutOfMemory
-        run: |
-          sudo sh -c 'echo 1 > /proc/sys/vm/drop_caches' && \
-          mvn -P${{ matrix.profile }} test -pl org.apache.drill.exec:drill-java-exec \
-          -Dgroups=org.apache.drill.categories.EasyOutOfMemory \
           -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
+      - name: Remove swap space
+        run : |
+          sudo sh -c "
+            swapoff /tmp/swapfile
+            rm /tmp/swapfile
+          "
   checkstyle_protobuf:
     name: Run checkstyle and generate protobufs
     runs-on: ubuntu-latest
+    if: github.repository == 'apache/drill'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '8'
           cache: 'maven'
       # Caches built protobuf library
       - name: Cache protobufs
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/protobuf
           key: ${{ runner.os }}-protobuf

.github/workflows/codeql-analysis.yml

@@ -42,6 +42,7 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+    if: github.repository == 'apache/drill'
     permissions:
       actions: read
       contents: read
@@ -56,7 +57,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/publish-snapshot.yml

@@ -27,11 +27,12 @@ jobs:
   publish:
     name: Publish snapshot artifacts
     runs-on: ubuntu-latest
+    if: github.repository == 'apache/drill'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Cache Maven Repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.gitignore

@@ -1,31 +1,35 @@
-.project
+# Please keep this list sorted.
+*~
 .buildpath
-.classpath
-.factorypath
 .checkstyle
-.settings/
-.idea/
-TAGS
-*.log
-*.lck
-*.iml
-target/
-*.DS_Store
-*.patch
-*~
-git.properties
-contrib/native/client/build/
-contrib/native/client/build/*
+.classpath
 CMakeCache.txt
 CMakeFiles
-Makefile
 cmake_install.cmake
+contrib/native/client/build/
+contrib/native/client/build/*
+ # binary dist license is by the build
+distribution/src/main/resources/LICENSE
+*.DS_Store
+exec/jdbc-all/dependency-reduced-pom.xml
+.factorypath
+git.properties
+.*.html
+.idea/
+*.iml
 install_manifest.txt
+*.lck
+*.log
+Makefile
 .*.md.html
+.mvn/maven.config
+*.patch
+.project
+.settings/
 *.swp
+TAGS
+target/
 # TODO - DRILL-4336
-exec/jdbc-all/dependency-reduced-pom.xml
-.*.html
-venv/
 tools/venv/
-
+venv/
+.vscode/*

LICENSE

@@ -202,10 +202,10 @@
    limitations under the License.
 
 ---------------------------------------------------------------------------
-This product includes source licensed under the MIT license
+This product includes source licensed under the MIT license.
 
 The source files are located at contrib/native/client/src/clientlib/y2038/
-in the source distribution. The four files carry this license are:
+in the source distribution. The files that carry this license are:
 time64.c
 time64.h
 time64_config.h
@@ -215,24 +215,11 @@ Copyright (c) 2007-2010  Michael G Schwern
 
 This software originally derived from Paul Sheer's pivotal_gmtime_r.c.
 
-The MIT License:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+---------------------------------------------------------------------------
+This product includes source licensed under the BSD 3-clause license.
 
+The source files are located at exec/java-exec/src/main/java/org/apache/drill/exec/compile/
+in the source distribution. The files that carry this license are:
+ClassBodyBuilder.java
 
+Copyright (c) 2001-2010, Arno Unkrig

NOTICE

@@ -1,5 +1,5 @@
 Apache Drill
-Copyright 2013-2023 The Apache Software Foundation
+Copyright 2013-2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java

@@ -32,6 +32,7 @@
 import org.apache.drill.common.config.DrillConfig;
 import org.apache.drill.common.exceptions.DrillRuntimeException;
 import org.apache.drill.common.scanner.persistence.ScanResult;
+import org.apache.drill.common.util.JacksonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,7 +48,7 @@ public class BuildTimeScan {
   private static final Logger logger = LoggerFactory.getLogger(BuildTimeScan.class);
   private static final String REGISTRY_FILE = "META-INF/drill-module-scan/registry.json";
 
-  private static final ObjectMapper mapper = new ObjectMapper().enable(INDENT_OUTPUT);
+  private static final ObjectMapper mapper = JacksonUtils.createObjectMapper().enable(INDENT_OUTPUT);
   private static final ObjectReader reader = mapper.readerFor(ScanResult.class);
   private static final ObjectWriter writer = mapper.writerFor(ScanResult.class);
 

common/src/main/java/org/apache/drill/common/util/JacksonUtils.java

@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.common.util;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+
+/**
+ * Utility class which contain methods for interacting with Jackson.
+ */
+public final class JacksonUtils {
+
+  private JacksonUtils() {}
+
+  /**
+   * Creates a new instance of the Jackson {@link ObjectMapper}.
+   * @return an {@link ObjectMapper} instance
+   */
+  public static ObjectMapper createObjectMapper() {
+    return createJsonMapperBuilder().build();
+  }
+
+  /**
+   * Creates a new instance of the Jackson {@link ObjectMapper}.
+   * @param factory a {@link JsonFactory} instance
+   * @return an {@link ObjectMapper} instance
+   */
+  public static ObjectMapper createObjectMapper(final JsonFactory factory) {
+    return createJsonMapperBuilder(factory).build();
+  }
+
+  /**
+   * Creates a new instance of the Jackson {@link JsonMapper.Builder}.
+   * @return an {@link JsonMapper.Builder} instance
+   */
+  public static JsonMapper.Builder createJsonMapperBuilder() {
+    return JsonMapper.builder();
+  }
+
+  /**
+   * Creates a new instance of the Jackson {@link JsonMapper.Builder}.
+   * @param factory a {@link JsonFactory} instance
+   * @return an {@link JsonMapper.Builder} instance
+   */
+  public static JsonMapper.Builder createJsonMapperBuilder(final JsonFactory factory) {
+    return JsonMapper.builder(factory);
+  }
+}