Merge pull request #19 from apache/main

Updating fork of apache iceberg into Teradata iceberg

Author: jb185048

.asf.yaml

@@ -18,7 +18,7 @@
 #
 
 # The format of this file is documented at
-# https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features
+# https://github.com/apache/infrastructure-asfyaml/blob/main/README.md
 
 github:
   description: "Apache Iceberg"
@@ -33,14 +33,16 @@ github:
     squash: true
     rebase: true
 
+  pull_requests:
+    # auto-delete head branches after being merged
+    del_branch_on_merge: true
+
   protected_branches:
     main:
       required_pull_request_reviews:
         required_approving_review_count: 1
 
       required_linear_history: true
-
-  del_branch_on_merge: true
 
   features:
     wiki: true
@@ -64,6 +66,7 @@ notifications:
     commits:      commits@iceberg.apache.org
     issues:       issues@iceberg.apache.org
     pullrequests: issues@iceberg.apache.org
+    jobs:         ci-jobs@iceberg.apache.org
     jira_options: link label link label
 
 publish:

.baseline/checkstyle/checkstyle-suppressions.xml

@@ -49,6 +49,15 @@
     <!-- Referencing guava classes should be allowed in classes within bundled-guava module -->
     <suppress files="org.apache.iceberg.GuavaClasses" id="BanUnrelocatedGuavaClasses"/>
 
+    <!-- Allow using Flink's shaded Curator dependency -->
+    <suppress files="org.apache.iceberg.flink.maintenance.api.ZkLockFactory" id="BanShadedClasses"/>
+    <suppress files="org.apache.iceberg.flink.maintenance.api.TestZkLockFactory" id="BanShadedClasses"/>
+
     <!-- Suppress checks for CometColumnReader -->
     <suppress files="org.apache.iceberg.spark.data.vectorized.CometColumnReader" checks="IllegalImport"/>
+    <!-- Suppress checks for CometDeletedColumnVector -->
+    <suppress files="org.apache.iceberg.spark.data.vectorized.CometDeletedColumnVector" checks="IllegalImport"/>
+
+    <!-- Suppress TestClassNamingConvention for main source files -->
+    <suppress files=".*[/\\]src[/\\]main[/\\].*" id="TestClassNamingConvention" />
 </suppressions>

.baseline/checkstyle/checkstyle.xml

@@ -92,6 +92,10 @@
         <property name="format" value="^\s*import\s+static\s+(?!\Qorg.assertj.core.api.Assertions.\E).*\.assertThatThrownBy;"/>
         <property name="message" value="assertThatThrownBy() should be statically imported from org.assertj.core.api.Assertions"/>
     </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="^\s*import\s+static\s+org\.junit\.jupiter\.api\.Assertions\.\w+;"/>
+        <property name="message" value="Prefer using org.assertj.core.api.Assertions instead."/>
+    </module>
     <module name="RegexpMultiline">
         <property name="id" value="AssertThatThrownByWithMessageCheck"/>
         <property name="fileExtensions" value="java"/>
@@ -110,6 +114,10 @@
         <property name="format" value="^\s*import\s+\Qorg.assertj.core.api.Assertions;\E" />
         <property name="message" value="org.assertj.core.api.Assertions should only be used with static imports" />
     </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="^\s*import\s+\Qorg.assertj.core.api.Assumptions;\E" />
+        <property name="message" value="org.assertj.core.api.Assumptions should only be used with static imports" />
+    </module>
     <module name="SuppressionFilter"> <!-- baseline-gradle: README.md -->
         <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
     </module>
@@ -167,7 +175,6 @@
                 org.apache.spark.sql.functions.*,
                 org.apache.spark.sql.connector.iceberg.write.RowLevelOperation.Command.*,
                 org.apache.spark.sql.connector.write.RowLevelOperation.Command.*,
-                org.junit.Assert.*,
                 org.assertj.core.api.Assertions.*,
                 org.assertj.core.api.Assumptions.*"/>
         </module>
@@ -201,10 +208,6 @@
             <property name="setterCanReturnItsClass" value="true"/>
         </module>
         <module name="HideUtilityClassConstructor"/> <!-- Java Coding Guidelines: Private constructors -->
-        <module name="IllegalImport"> <!-- Java Coding Guidelines: Use JUnit 4-style test classes and assertions -->
-            <property name="illegalPkgs" value="junit.framework"/>
-            <message key="import.illegal" value="Use JUnit 4-style (org.junit.*) test classes and assertions instead of JUnit 3 (junit.framework.*)."/>
-        </module>
         <module name="IllegalImport"> <!-- Only relevant for pre-Java 11 because javafx is gone completely in Java 11 -->
             <property name="id" value="BanJavafx"/>
             <property name="illegalPkgs" value="javafx"/>
@@ -257,6 +260,17 @@
             <property name="illegalPkgs" value="com.google.common.testing"/>
             <message key="import.illegal" value="Use org.apache.iceberg.relocated.* classes from bundled-guava module instead."/>
         </module>
+        <module name="IllegalImport">
+            <property name="id" value="BanFlinkPreconditions"/>
+            <property name="illegalClasses" value="org.apache.flink.util.Preconditions"/>
+            <message key="import.illegal" value="Use org.apache.iceberg.relocated.com.google.common.base.Preconditions instead."/>
+        </module>
+        <module name="IllegalImport">
+            <property name="id" value="BanHadoopUtils"/>
+            <property name="regexp" value="true"/>
+            <property name="illegalClasses" value="^org\.apache\.hadoop\.util\.(Sets|Lists|Preconditions)"/>
+            <message key="import.illegal" value="Use org.apache.iceberg.relocated.* classes from bundled-guava module instead."/>
+        </module>
         <module name="IllegalImport">
             <property name="id" value="GuavaClassesInAssertJ"/>
             <property name="illegalPkgs" value="org.assertj.core.util"/>
@@ -431,6 +445,11 @@
             <property name="format" value="@Test\(.*expected.*\)"/>
             <property name="message" value="Prefer using Assertions.assertThatThrownBy(...).isInstanceOf(...) instead."/>
         </module>
+        <module name="RegexpSinglelineJava">
+            <property name="id" value="TestClassNamingConvention"/>
+            <property name="format" value="^\s*(public\s+)?(abstract\s+)?class\s+[A-Za-z0-9]*Test(\s|&lt;)"/>
+            <property name="message" value="Test class names should start with 'Test' prefix, not end with 'Test' suffix. Example: 'TestNewFeature' instead of 'NewFeatureTest'"/>
+        </module>
         <module name="IllegalToken">
             <property name="tokens" value="LITERAL_ASSERT"/>
         </module>
@@ -441,7 +460,7 @@
         </module>
         <module name="IllegalImport">
             <property name="id" value="BanJUnit5AssumptionsUsage"/>
-            <property name="illegalPkgs" value="org.junit.jupiter.api.Assumptions"/>
+            <property name="illegalClasses" value="org.junit.jupiter.api.Assumptions"/>
             <message key="import.illegal" value="Prefer using Assertions.assumeThat(...).isTrue() instead."/>
         </module>
         <module name="IllegalImport">
@@ -451,9 +470,14 @@
         </module>
         <module name="IllegalImport">
             <property name="id" value="BanJUnit5Assertions"/>
-            <property name="illegalPkgs" value="org.junit.jupiter.api.Assertions"/>
+            <property name="illegalClasses" value="org.junit.jupiter.api.Assertions"/>
             <message key="import.illegal" value="Prefer using org.assertj.core.api.Assertions instead."/>
         </module>
+        <module name="IllegalImport">
+            <property name="id" value="BanJUnit4Usage"/>
+            <property name="illegalClasses" value="org.junit.Assert, org.junit.Assume, org.junit.Test"/>
+            <message key="import.illegal" value="Prefer using JUnit5 / AssertJ instead."/>
+        </module>
         <module name="RegexpSinglelineJava">
             <property name="ignoreComments" value="true"/>
             <property name="format" value="@Json(S|Des)erialize"/>

.baseline/scala/.scala212fmt.conf

@@ -0,0 +1,32 @@
+# 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.
+
+version = 3.9.7
+
+align = none
+align.openParenDefnSite = false
+align.openParenCallSite = false
+align.tokens = []
+importSelectors = "singleLine"
+optIn = {
+  configStyleArguments = false
+}
+danglingParentheses.preset = false
+docstrings.style = Asterisk
+docstrings.wrap = false
+maxColumn = 100
+runner.dialect = scala212

.baseline/scala/.scala213fmt.conf

@@ -0,0 +1,32 @@
+# 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.
+
+version = 3.9.7
+
+align = none
+align.openParenDefnSite = false
+align.openParenCallSite = false
+align.tokens = []
+importSelectors = "singleLine"
+optIn = {
+  configStyleArguments = false
+}
+danglingParentheses.preset = false
+docstrings.style = Asterisk
+docstrings.wrap = false
+maxColumn = 100
+runner.dialect = scala213

.github/ISSUE_TEMPLATE/iceberg_bug_report.yml

@@ -22,13 +22,24 @@ name: Iceberg Bug report 🐞
 description: Problems, bugs and issues with Apache Iceberg
 labels: ["bug"]
 body:
+  - type: markdown
+    attributes:
+      value: |
+        * Verify that the issue is not already reported, looking at the [currently open issues](https://github.com/apache/iceberg/issues), use the `Filter` field to narrow down your search.
+        * **Possible security vulnerabilities**: STOP here and contact `security@apache.org` instead!
+        * Do **NOT** share any sensitive information like passwords, security tokens, private URLs etc.
   - type: dropdown
     attributes:
       label: Apache Iceberg version
       description: What Apache Iceberg version are you using?
       multiple: false
       options:
-        - "1.8.1 (latest release)"
+        - "1.10.1 (latest release)"
+        - "1.10.0"
+        - "1.9.2"
+        - "1.9.1"
+        - "1.9.0"
+        - "1.8.1"
         - "1.8.0"
         - "1.7.2"
         - "1.7.1"

.github/ISSUE_TEMPLATE/iceberg_improvement.yml

@@ -22,6 +22,10 @@ name: Iceberg Improvement / Feature Request
 description: New features with Apache Iceberg
 labels: ["improvement"]
 body:
+  - type: markdown
+    attributes:
+      value: |
+        Do **NOT** share any sensitive information like passwords, security tokens, private URLs etc.
   - type: textarea
     attributes:
       label: Feature Request / Improvement

.github/ISSUE_TEMPLATE/iceberg_proposal.yml

@@ -24,7 +24,10 @@ labels: ["proposal"]
 body:
   - type: markdown
     attributes:
-      value: "Please see documentation site for information on [contributing proposals](https://iceberg.apache.org/contribute/#apache-iceberg-improvement-proposals)"
+      value: |
+        Please see documentation site for information on [contributing proposals](https://iceberg.apache.org/contribute/#apache-iceberg-improvement-proposals)
+        
+        Do **NOT** share any sensitive information like passwords, security tokens, private URLs etc.
   - type: textarea
     attributes:
       label: Proposed Change

.github/ISSUE_TEMPLATE/iceberg_question.yml

@@ -24,7 +24,10 @@ labels: ["question"]
 body:
   - type: markdown
     attributes:
-      value: "Feel free to ask your question on [Slack](https://join.slack.com/t/apache-iceberg/shared_invite/zt-2561tq9qr-UtISlHgsdY3Virs3Z2_btQ) as well."
+      value: |
+        Feel free to ask your question on [Slack](https://join.slack.com/t/apache-iceberg/shared_invite/zt-3kclosz6r-3heAW3d~_PHefmN2A_~cAg) as well.
+
+        Do **NOT** share any sensitive information like passwords, security tokens, private URLs etc.
   - type: textarea
     attributes:
       label: Query engine

.github/dependabot.yml

@@ -24,9 +24,6 @@ updates:
     schedule:
       interval: "weekly"
       day: "sunday"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major"]
   - package-ecosystem: "gradle"
     directory: "/"
     schedule: