Skip to content

Commit a93d972

Browse files
authored
chore: Remove fast encoding option (#1703)
1 parent dae7aad commit a93d972

File tree

15 files changed

+83
-954
lines changed

15 files changed

+83
-954
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -326,14 +326,6 @@ object CometConf extends ShimCometConf {
326326
.intConf
327327
.createWithDefault(1)
328328

329-
val COMET_SHUFFLE_ENABLE_FAST_ENCODING: ConfigEntry[Boolean] =
330-
conf(s"$COMET_EXEC_CONFIG_PREFIX.shuffle.enableFastEncoding")
331-
.doc("Whether to enable Comet's faster proprietary encoding for shuffle blocks " +
332-
"rather than using Arrow IPC.")
333-
.internal()
334-
.booleanConf
335-
.createWithDefault(true)
336-
337329
val COMET_COLUMNAR_SHUFFLE_ASYNC_ENABLED: ConfigEntry[Boolean] =
338330
conf("spark.comet.columnar.shuffle.async.enabled")
339331
.doc("Whether to enable asynchronous shuffle for Arrow-based shuffle.")

native/core/benches/row_columnar.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ fn benchmark(c: &mut Criterion) {
7979
0,
8080
None,
8181
&CompressionCodec::Zstd(1),
82-
true,
8382
)
8483
.unwrap();
8584
});

native/core/benches/shuffle_writer.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,8 @@ fn criterion_benchmark(c: &mut Criterion) {
4747
group.bench_function(name, |b| {
4848
let mut buffer = vec![];
4949
let ipc_time = Time::default();
50-
let w = ShuffleBlockWriter::try_new(
51-
&batch.schema(),
52-
enable_fast_encoding,
53-
compression_codec.clone(),
54-
)
55-
.unwrap();
50+
let w = ShuffleBlockWriter::try_new(&batch.schema(), compression_codec.clone())
51+
.unwrap();
5652
b.iter(|| {
5753
buffer.clear();
5854
let mut cursor = Cursor::new(&mut buffer);
@@ -97,7 +93,6 @@ fn create_shuffle_writer_exec(compression_codec: CompressionCodec) -> ShuffleWri
9793
compression_codec,
9894
"/tmp/data.out".to_string(),
9995
"/tmp/index.out".to_string(),
100-
true,
10196
)
10297
.unwrap()
10398
}

native/core/src/execution/jni_api.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,6 @@ pub unsafe extern "system" fn Java_org_apache_comet_Native_writeSortedFileNative
537537
current_checksum: jlong,
538538
compression_codec: jstring,
539539
compression_level: jint,
540-
enable_fast_encoding: jboolean,
541540
) -> jlongArray {
542541
try_unwrap_or_throw(&e, |mut env| unsafe {
543542
let data_types = convert_datatype_arrays(&mut env, serialized_datatypes)?;
@@ -589,7 +588,6 @@ pub unsafe extern "system" fn Java_org_apache_comet_Native_writeSortedFileNative
589588
checksum_algo,
590589
current_checksum,
591590
&compression_codec,
592-
enable_fast_encoding != JNI_FALSE,
593591
)?;
594592

595593
let checksum = if let Some(checksum) = checksum {

native/core/src/execution/planner.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,6 @@ impl PhysicalPlanner {
12021202
codec,
12031203
writer.output_data_file.clone(),
12041204
writer.output_index_file.clone(),
1205-
writer.enable_fast_encoding,
12061205
)?);
12071206

12081207
Ok((

0 commit comments

Comments
 (0)