Skip to content

Commit 90fa7d0

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/5540-iceberg-case-sensitive
2 parents 228ffa9 + 4c473ea commit 90fa7d0

164 files changed

Lines changed: 12631 additions & 1204 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.asf.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ github:
116116
branch-1.1:
117117
required_pull_request_reviews:
118118
required_approving_review_count: 1
119+
branch-1.2:
120+
required_pull_request_reviews:
121+
required_approving_review_count: 1
119122
# GitHub's merge queue. Classic `protected_branches` above has no way to
120123
# express this, but .asf.yaml rulesets accept a raw Rulesets API payload, so
121124
# no INFRA ticket is needed. Same approach as apache/iceberg-python and

‎.github/workflows/pr_build_linux.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,7 @@ jobs:
497497
- name: "scans"
498498
value: |
499499
org.apache.comet.parquet.CometParquetWriterSuite
500+
org.apache.comet.parquet.CometParquetWriterRetrySuite
500501
org.apache.comet.parquet.CometEmptyRelationParquetWriterSuite
501502
org.apache.spark.sql.comet.CometNativeWriteSuite
502503
org.apache.comet.parquet.ParquetReadV1Suite
@@ -541,6 +542,7 @@ jobs:
541542
org.apache.spark.sql.comet.execution.shuffle.CometNativeShuffleWriterSuite
542543
org.apache.spark.sql.comet.execution.shuffle.CometNativePositionalRoundRobinSuite
543544
org.apache.spark.sql.comet.execution.shuffle.CometDiskBlockWriterSuite
545+
org.apache.spark.sql.comet.execution.shuffle.CometBlockStoreShuffleReaderSuite
544546
org.apache.comet.exec.CometShuffleEncryptionSuite
545547
org.apache.comet.exec.CometShuffleManagerSuite
546548
org.apache.comet.exec.DisableAQECometShuffleSuite
@@ -676,6 +678,7 @@ jobs:
676678
org.apache.comet.serde.CometScalarFunctionSuite
677679
org.apache.comet.serde.CometLiteralSuite
678680
org.apache.comet.serde.QueryPlanSerdeSuite
681+
org.apache.comet.serde.SparkFixesSuite
679682
org.apache.comet.CometFallbackInvarianceSuite
680683
fail-fast: false
681684
name: ${{ matrix.profile.name }} [${{ matrix.suite.name }}]

‎.github/workflows/pr_build_macos.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ jobs:
163163
- name: "scans"
164164
value: |
165165
org.apache.comet.parquet.CometParquetWriterSuite
166+
org.apache.comet.parquet.CometParquetWriterRetrySuite
166167
org.apache.comet.parquet.CometEmptyRelationParquetWriterSuite
167168
org.apache.spark.sql.comet.CometNativeWriteSuite
168169
org.apache.comet.parquet.ParquetReadV1Suite
@@ -207,6 +208,7 @@ jobs:
207208
org.apache.spark.sql.comet.execution.shuffle.CometNativeShuffleWriterSuite
208209
org.apache.spark.sql.comet.execution.shuffle.CometNativePositionalRoundRobinSuite
209210
org.apache.spark.sql.comet.execution.shuffle.CometDiskBlockWriterSuite
211+
org.apache.spark.sql.comet.execution.shuffle.CometBlockStoreShuffleReaderSuite
210212
org.apache.comet.exec.CometShuffleEncryptionSuite
211213
org.apache.comet.exec.CometShuffleManagerSuite
212214
org.apache.comet.exec.DisableAQECometShuffleSuite
@@ -342,6 +344,7 @@ jobs:
342344
org.apache.comet.serde.CometScalarFunctionSuite
343345
org.apache.comet.serde.CometLiteralSuite
344346
org.apache.comet.serde.QueryPlanSerdeSuite
347+
org.apache.comet.serde.SparkFixesSuite
345348
org.apache.comet.CometFallbackInvarianceSuite
346349
347350
fail-fast: false

‎dev/ci/check-suites.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ def file_to_class_name(path: Path) -> str | None:
3535
ignore_list = [
3636
"org.apache.comet.parquet.ParquetReadSuite", # abstract
3737
"org.apache.comet.parquet.ParquetReadFromS3Suite", # manual test suite
38+
"org.apache.comet.parquet.ParquetWriteWithMagicCommitterSuite", # manual test suite
3839
"org.apache.comet.csv.CsvReadFromS3Suite", # manual test suite
3940
"org.apache.comet.parquet.ParquetReadFromFakeHadoopFsSuite", # manual test suite (loads libhdfs, see #5023)
4041
"org.apache.comet.IcebergReadFromS3Suite", # manual test suite

‎dev/generate-release-docs.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,16 @@ done
7373
# must pass the check. GenerateDocs wraps the config/cast tables in prettier-ignore, but
7474
# the surrounding generated Markdown is not guaranteed prettier-clean. prettier honors
7575
# .prettierignore, so excluded pages (e.g. expressions.md) are left untouched.
76+
# CI installs the latest prettier (`npm install -g prettier`), and releases of prettier differ
77+
# in what they accept, so format with the latest too rather than with whatever version is
78+
# installed locally or cached by npx. Generating the 1.2.0 docs with prettier 3.2.5 left 40
79+
# pages that the latest prettier rejects.
7680
if ! command -v npx >/dev/null 2>&1; then
7781
echo "ERROR: npx not found. Install Node/prettier (see docs/source/contributor-guide/development.md)" >&2
7882
exit 1
7983
fi
8084
echo "Formatting generated Markdown with prettier..."
81-
npx prettier "${LATEST_USER_GUIDE}/**/*.md" --write
85+
npx --yes prettier@latest "${LATEST_USER_GUIDE}/**/*.md" --write
8286

8387
echo ""
8488
echo "Done! Generated documentation content in docs/source/user-guide/latest/"

0 commit comments

Comments
 (0)