AGENT SKILL

review-comet-shuffle-pr

Use when reviewing a DataFusion Comet pull request that touches native or JVM columnar shuffle, the shuffle writers and readers, partitioning, the Arrow IPC block format, shuffle compression, or the Celeborn integration. Load alongside review-comet-pr.

License 许可
Apache-2.0
最近更新
2026-11-14
Stars
★ 1.3k
Forks
418

01 前言 Front Matter

name
review-comet-shuffle-pr
description
Use when reviewing a DataFusion Comet pull request that touches native or JVM columnar shuffle, the shuffle writers and readers, partitioning, the Arrow IPC block format, shuffle compression, or the Celeborn integration. Load alongside review-comet-pr.
argument-hint
<pr-number>

02 资源文件 1

03 SKILL.md 正文

<!-- 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. -->

Shuffle-specific review for Comet PR #$ARGUMENTS.

REQUIRED BACKGROUND: Use review-comet-pr for PR metadata, existing comments, CI, the review bar, and the output format. This skill only covers shuffle.

Read the Contributor Guide First

Doc What you need from it
docs/source/contributor-guide/native_shuffle.md Selection rules, architecture, partitioning, block format, spilling
docs/source/contributor-guide/jvm_shuffle.md Writer variants, handle selection, the row-based path, spill mechanics
docs/source/contributor-guide/memory_management.md Where shuffle memory comes from, which differs between the two paths

Read both shuffle docs even if the PR only touches one path. The two implementations share the manager, the dependency, the reader, and the on-disk format, and a change to one side of a shared piece is the most common way to break the other.

1. Which Implementation

Implementation Selected when
Native, CometExchange shuffle.mode is native or auto, child is a CometPlan, supported partitioning, supported key types
JVM columnar, CometColumnarExchange shuffle.mode is jvm, or the child is row-based, or a partition key type native shuffle cannot handle

Complex types are fully supported as data columns in both. The restriction is on partition keys, and it is not the same rule for the two partitionings:

  • RangePartitioning is primitive-only, unconditionally. supportedRangePartitioningDataType rejects every nested type, because native cannot sort them, and rejects collated strings, because Comet compares raw bytes. That is the whole rule. Scalar float and double are accepted, under spark.comet.exec.strictFloatingPoint as well: since #5981 the native range partitioner normalizes its comparison keys and its sampled boundary rows the same way the native sort does. CometSortOrder is Compatible() for scalar floats regardless of strict mode. It is for floats nested in arrays and structs too, because the native sort normalizes them, unless the key's type can hold a null element or field (#6476, #6477), which strict mode declines. A nested key is already out as a range key for being nested. CometNativeShuffleSuite runs "range partitioning on floating-point uses native shuffle" under both settings of the config.
  • HashPartitioning is primitive-only by default only. With spark.comet.shuffle.native.partitioning.hash.nested.enabled=true (default false), supportedHashPartitioningDataType admits structs and arrays recursively, and maps on Spark 4.0+, where Spark's mapsort normalization makes physical entry order irrelevant. The recursion still rejects a collated string at any depth, and a map on Spark 3.x. A map key also has to clear the separate expression check on the inserted mapsort(...), which CometMapSort (spark/src/main/spark-4.x/) supports for scalar map keys only. CometNativeShuffleSuite covers both settings of the config.

A native exchange on a struct or array hash key is therefore not automatically a bug, and neither is one on a scalar float or double range key in strict mode. Check the config before calling either one, and do not carry the range-partitioning rule over to hash partitioning.

  • [ ] A PR that widens what native shuffle supports updates the fallback conditions in CometShuffleExchangeExec and both docs' "When X is Used" lists
  • [ ] A PR that narrows support does not silently move workloads onto the slower path. The JVM path costs a columnar to row to columnar round trip through ColumnarToRowExec.
  • [ ] Fallback decisions stay consistent across a stage. CometShuffleFallbackStickinessSuite exists because they did not once.

2. Spark Compatibility of Partitioning

Partitioning is where shuffle silently produces wrong answers rather than failing.

  • [ ] Hash partitioning uses Murmur3 with seed 42 and partition_id = hash % num_partitions, matching Spark. Any change to the hash, the seed, or the modulo changes which rows land in which partition, which breaks a join between a Comet-shuffled side and a Spark-shuffled side.
  • [ ] Round robin defaults to a content hash, and is off by default. Comet's default RoundRobinStrategy::HashAll assigns partitions from a Murmur3 hash rather than cycling row by row, because placement has to be reproducible across task retries. Two costs are accepted: low-cardinality data distributes unevenly, and unsorted rows land in different partitions than Spark's UnsafeRow-sorted assignment would put them, which is why spark.comet.shuffle.native.partitioning.roundrobin.enabled defaults to false. Sorted output is identical either way.
  • [ ] Positional round robin is allowed, but its allowlist is the whole safety argument. RoundRobinStrategy::RowGroups is not a bug by construction. It is a function of row order and never sorts, so it needs a retry to replay the same rows in the same order, which is more than Spark's own round robin needs under its default sortBeforeRepartition=true. CometShuffleExchangeExec.replaysRowsInOrder is what establishes that, and a PR that widens it needs an argument that each operator it admits replays its rows in order, including that the admitted expressions are deterministic; the RDD-level determinism check is defence in depth and cannot fire under today's allowlist. Also check that placement still counts rows rather than batches, that the start still comes from positionalStartPartition, and that the group size is still resolved on the driver rather than from executor state. The reasoning behind all three is in native_shuffle.md under "Round Robin Partitioning".
  • [ ] Range partitioning bounds come from the driver. Spark's RangePartitioner samples and computes boundaries, they are serialized into the native plan, and native does a binary search over comparable-row-format keys. A change to the comparison or the row encoding must match Spark's ordering exactly, including nulls and signed zero.
  • [ ] The JVM path uses Spark's own partitioner via partitioner.getPartition(key), so it inherits Spark's semantics for free. A PR that reimplements partitioning on that path is solving a problem that does not exist.

3. On-Disk and On-Wire Format

Writer and reader must change together, and they are in different languages.

The block layout is an 8-byte compressed length header, an 8-byte field count header, then the compressed Arrow IPC stream. It is written by the native ShuffleBlockWriter and read by NativeBatchDecoderIterator calling Native.decodeShuffleBlock().

  • [ ] A format change updates the writer, the reader, and the Celeborn reader path
  • [ ] A format change is not silently incompatible with shuffle files written by a previous version in the same cluster during a rolling deployment. If it is, the PR needs to say so.
  • [ ] Compression codec changes apply uniformly to all partitions, and each partition stays independently decompressible so reads can parallelize
  • [ ] The commit path still works. Native records the byte offset where each partition begins plus the total length, CometNativeShuffleWriter fetches them with Native.getShufflePartitionOffsets, converts them to partition lengths, and commits through Spark's IndexShuffleBlockResolver.writeMetadataFileAndCommit. Offsets and lengths are easy to confuse and the failure is a corrupt index file rather than an exception.
  • [ ] Checksums via CometShuffleChecksumSupport still cover what Spark expects

4. Memory and Spilling

Shuffle is the largest memory consumer in most queries, and the two paths draw from different budgets.

Native shuffle uses the DataFusion memory pool. Partitions spill when the pool denies an allocation, or when buffered bytes reach spark.comet.shuffle.native.maxBufferBytes, which defaults to 0, meaning the fixed limit is disabled and memory pressure is the only trigger.

The local writer spills every partition into one file per task, not one file per partition. PartitionedSpill (native/shuffle/src/writers/local/spill.rs) opens a single DataFusion spill file lazily on the first spill and records, per partition, the byte ranges holding that partition's blocks in write order. finish_partition copies a partition's ranges into the output file in that order. spilling_every_partition_creates_one_file asserts the file count after spilling 64 partitions three times. The single-partition writer does not spill, and neither does the RSS writer, which pushes blocks to the remote service instead.

JVM shuffle allocates off-heap pages through CometShuffleMemoryAllocator, which is an ordinary Spark MemoryConsumer drawing from spark.memory.offHeap.size. CometDiskBlockWriter coordinates spilling across partition writers, largest first. TooLargePageException is the signal that a single record does not fit in a page.

  • [ ] A PR that adds buffering on either path says where the reservation is
  • [ ] A change to native spill bookkeeping keeps the recorded ranges and the file in sync. PartitionedSpill sets a failed flag on a partial write because a mid-write failure makes every later range untrustworthy, and a range that runs past the end of a truncated file must fail the task rather than write a short partition.
  • [ ] A PR that changes spill thresholds has benchmark evidence, because spilling too late is an OOM and spilling too early is a throughput loss
  • [ ] Scratch buffers reused for partition-id computation are correctly reset between batches
  • [ ] Use review-comet-memory-pr as well for anything touching reservations or the allocator

5. Writer Selection on the JVM Path

CometShuffleManager.shouldBypassMergeSort() picks between the two JVM writers. It uses bypass if the partition count is below the threshold and partitions times cores is within the max thread count, otherwise sort-based to avoid OOM from too many concurrent writers.

Handle Writer
CometBypassMergeSortShuffleHandle CometBypassMergeSortShuffleWriter, one CometDiskBlockWriter per partition
CometSerializedShuffleHandle CometUnsafeShuffleWriter, via CometShuffleExternalSorter
CometNativeShuffleHandle CometNativeShuffleWriter

A change to the selection heuristic changes the memory profile of every job with a large partition count. Ask for the reasoning and the numbers.

6. Source Layout

Native shuffle lives in its own crate, datafusion-comet-shuffle, under native/shuffle/, with shuffle_writer.rs, comet_partitioning.rs, ipc.rs, the partitioners/ and writers/ modules, and benchmarks in native/shuffle/benches/. The JVM side is split between spark/src/main/scala/org/apache/spark/sql/comet/execution/shuffle/, the Java writers under spark/src/main/java/org/apache/spark/sql/comet/execution/shuffle/, and the allocators under spark/src/main/java/org/apache/spark/shuffle/comet/.

Verify the paths cited in the docs still exist. The native shuffle code has moved between crates before, and the "Key Classes" tables in the docs are exactly what goes stale when it does.

7. Tests

Suite Covers
org.apache.comet.exec.CometNativeShuffleSuite Native shuffle end to end
org.apache.comet.exec.CometColumnarShuffleSuite JVM columnar shuffle end to end
CometShuffle4_0Suite Spark 4.x specific behavior
CometDiskBlockWriterSuite JVM spill and page handling
NativeBatchDecoderIteratorLifecycleChecks, ...ConcurrencyChecks Reader lifetime and concurrency
CometNativeShuffleInputRDDSuite The scheduling-anchor RDD
CometCeleborn*Suite The Celeborn path, which is easy to forget
CometShuffleBenchmark Throughput

Ask specifically:

  • [ ] Is the other shuffle path tested, if the change touched anything shared?
  • [ ] Is the Celeborn path tested, if the change touched the manager, dependency, writer, or reader?
  • [ ] Are multiple partitions and an actual spill exercised, rather than one small batch?
  • [ ] Are complex types covered as data columns, and is the partition-key restriction tested at its boundary, on both settings of spark.comet.shuffle.native.partitioning.hash.nested.enabled?
  • [ ] For a partitioning change, is there a test that the same input produces the same partition assignment as Spark, not just that the total row count matches?

8. Do the PR Changes Make the Shuffle Docs Stale?

Both docs are structured as tables of current fact, which is exactly what a refactor invalidates. Check:

  • native_shuffle.md: the "When Native Shuffle is Used" conditions, the architecture diagram, the Scala Side and Rust Side "Key Classes" tables including their file paths, the write-path and read-path numbered steps, the Partitioning sections and the guarantees they state, the Compression table, the Configuration table with its defaults, and the comparison table at the end
  • jvm_shuffle.md: the "When JVM Shuffle is Used" list, the writer architecture diagram, the Shuffle Manager, Handles, Writers and Reader tables, the bypass selection description, the Memory Management section, and the Configuration table
  • A config default changed in CometConf.scala but left at its old value in either doc's config table is a specific thing to look for, because those tables are hand-maintained while the user-facing configs.md is generated
  • If the PR adds a partitioning scheme, both the native doc's Partitioning section and the comparison table's "Supported schemes" row need it

04 同仓库更多 Skills

apache
apache/datafusion-comet

wire-datafusion-function

Use when wiring an existing DataFusion or datafusion-spark function into Comet for a Spark expression. Identifies the right wiring pattern (one-line passthrough, datafusion-spark UDF registration, or custom serde with input massaging / restrictions), applies the Scala serde, registers the UDF in jni_api when needed, and adds SQL file tests. Assumes the function already exists upstream — if not, switch to `implement-comet-expression`.

后端与接口
★ 1.3k
apache
apache/datafusion-comet

suggest-native-expression

Use when picking the next Spark expression to implement natively in Comet, or when asked whether a specific codegen-dispatched expression is worth a native Rust implementation. Scores the candidate on how likely a native path can be 100% Spark-compatible and how much throughput or allocation it would save versus the JVM codegen dispatcher, records the verdict in the per-expression audit log so disqualified candidates are not re-litigated, and files a GitHub issue for the recommendation.

★ 1.3k
apache
apache/datafusion-comet

review-comet-pr

Use when reviewing a DataFusion Comet pull request. Covers the workflow that applies to every PR and routes to the area-specific review skills for expressions, FFI, memory management, shuffle, Iceberg writes, and documentation. Provides guidance to a human reviewer rather than posting comments.

★ 1.3k
apache
apache/datafusion-comet

review-comet-memory-pr

Use when reviewing a DataFusion Comet pull request that touches memory pools, memory reservations, spilling, the Spark TaskMemoryManager bridge, allocators, or memory-related configuration. Load alongside review-comet-pr.

★ 1.3k
apache
apache/datafusion-comet

review-comet-iceberg-write-pr

Use when reviewing a DataFusion Comet pull request that touches Iceberg writes, the split-operator write plan (IcebergWriteStrategy, IcebergWriteExec, IcebergCommitExec), the native Iceberg writer (CometIcebergWriteExec, iceberg_write.rs, iceberg_partition_path.rs), its eligibility gate (CometIcebergNativeWrite), or the iceberg-rust pin. Load alongside review-comet-pr.

★ 1.3k
apache
apache/datafusion-comet

review-comet-ffi-pr

Use when reviewing a DataFusion Comet pull request that crosses the JVM/native boundary, touching Arrow C Data or C Stream interface code, batch export and import, CometExecIterator, ScanExec, NativeUtil, CometVector subclasses, or jni_api. Load alongside review-comet-pr.

★ 1.3k