Skip to content

Commit bf6fc8b

Browse files
authored
Merge branch 'main' into iceberg-rust-0.9.0
2 parents 00c02a8 + 42c806b commit bf6fc8b

24 files changed

Lines changed: 209 additions & 910 deletions

File tree

.github/workflows/miri.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,14 @@ on:
2828
- "native/core/benches/**"
2929
- "native/spark-expr/benches/**"
3030
- "spark/src/test/scala/org/apache/spark/sql/benchmark/**"
31-
# Disabled until Miri compatibility is restored
32-
# https://github.com/apache/datafusion-comet/issues/3499
33-
# pull_request:
34-
# paths-ignore:
35-
# - "doc/**"
36-
# - "docs/**"
37-
# - "**.md"
38-
# - "native/core/benches/**"
39-
# - "native/spark-expr/benches/**"
40-
# - "spark/src/test/scala/org/apache/spark/sql/benchmark/**"
31+
pull_request:
32+
paths-ignore:
33+
- "doc/**"
34+
- "docs/**"
35+
- "**.md"
36+
- "native/core/benches/**"
37+
- "native/spark-expr/benches/**"
38+
- "spark/src/test/scala/org/apache/spark/sql/benchmark/**"
4139
# manual trigger
4240
# https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
4341
workflow_dispatch:

common/src/main/scala/org/apache/comet/CometConf.scala

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,6 @@ object CometConf extends ShimCometConf {
114114
.booleanConf
115115
.createWithEnvVarOrDefault("ENABLE_COMET_WRITE", false)
116116

117-
// Deprecated: native_comet uses mutable buffers incompatible with Arrow FFI best practices
118-
// and does not support complex types. Use native_iceberg_compat or auto instead.
119-
// This will be removed in a future release.
120-
// See: https://github.com/apache/datafusion-comet/issues/2186
121-
@deprecated("Use SCAN_AUTO instead. native_comet will be removed in a future release.", "0.9.0")
122-
val SCAN_NATIVE_COMET = "native_comet"
123117
val SCAN_NATIVE_DATAFUSION = "native_datafusion"
124118
val SCAN_NATIVE_ICEBERG_COMPAT = "native_iceberg_compat"
125119
val SCAN_AUTO = "auto"

common/src/main/scala/org/apache/spark/sql/comet/util/Utils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ object Utils extends CometTypeShim {
271271
throw new SparkException(
272272
s"Comet execution only takes Arrow Arrays, but got ${c.getClass}. " +
273273
"This typically happens when a Comet scan falls back to Spark due to unsupported " +
274-
"data types (e.g., complex types like structs, arrays, or maps with native_comet). " +
274+
"data types (e.g., complex types like structs, arrays, or maps). " +
275275
"To resolve this, you can: " +
276276
"(1) enable spark.comet.scan.allowIncompatible=true to use a compatible native " +
277277
"scan variant, or " +

0 commit comments

Comments
 (0)