Revert "[Native] Use mimalloc in native libs (#500)" (#501)

This reverts commit 9445b7b.
lakesoul-io · Jun 27, 2024 · dd4f7c2 · dd4f7c2
1 parent 9445b7b
commit dd4f7c2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 42 deletions.
diff --git a/.../main/java/org/apache/spark/sql/execution/datasources/parquet/NativeVectorizedReader.java b/.../main/java/org/apache/spark/sql/execution/datasources/parquet/NativeVectorizedReader.java
@@ -192,7 +192,6 @@ public void closeCurrentBatch() {
             nativeColumnVector = null;
         }
         if (columnarBatch != null) {
-            columnarBatch.close();
             columnarBatch = null;
         }
     }

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -47,5 +47,4 @@ bytes = "1.4.0"
 half = "^2.1"
 tracing = "0.1.40"
 thiserror = "1.0"
-anyhow = "1.0.79"
-mimalloc = { version = "0.1.43", features = ["local_dynamic_tls"] }
+anyhow = "1.0.79"
diff --git a/rust/lakesoul-io-c/Cargo.toml b/rust/lakesoul-io-c/Cargo.toml
@@ -21,7 +21,6 @@ proto = { path = "../proto" }
 prost = { workspace = true }
 log = "0.4.20"
 env_logger = "0.11"
-mimalloc = { workspace = true }
 
 
 [target.'cfg(target_os = "windows")'.dependencies]

diff --git a/rust/lakesoul-io-c/src/lib.rs b/rust/lakesoul-io-c/src/lib.rs
@@ -11,27 +11,24 @@ use std::ptr::NonNull;
 use std::slice;
 use std::sync::Arc;
 
+use bytes::BufMut;
+
 use arrow::array::Array;
 pub use arrow::array::StructArray;
 use arrow::datatypes::{Schema, SchemaRef};
-pub use arrow::ffi::{FFI_ArrowArray, FFI_ArrowSchema};
 use arrow::ffi::from_ffi;
-use bytes::BufMut;
+pub use arrow::ffi::{FFI_ArrowArray, FFI_ArrowSchema};
 use datafusion_substrait::substrait::proto::Plan;
-use log::debug;
-use mimalloc::MiMalloc;
 use prost::Message;
 use tokio::runtime::{Builder, Runtime};
 
 use lakesoul_io::helpers;
 use lakesoul_io::lakesoul_io_config::{LakeSoulIOConfig, LakeSoulIOConfigBuilder};
 use lakesoul_io::lakesoul_reader::{LakeSoulReader, RecordBatch, Result, SyncSendableMutableLakeSoulReader};
 use lakesoul_io::lakesoul_writer::SyncSendableMutableLakeSoulWriter;
+use log::debug;
 use proto::proto::entity;
 
-#[global_allocator]
-static GLOBAL: MiMalloc = MiMalloc;
-
 #[allow(non_camel_case_types)]
 pub type c_size_t = usize;
 #[allow(non_camel_case_types)]
@@ -927,11 +924,11 @@ mod tests {
 
     use crate::{
         create_lakesoul_io_config_from_builder, create_lakesoul_reader_from_config, create_lakesoul_writer_from_config,
-        flush_and_close_writer, free_lakesoul_reader, IOConfigBuilder,
-        lakesoul_config_builder_add_single_file, lakesoul_config_builder_add_single_primary_key,
-        lakesoul_config_builder_set_batch_size, lakesoul_config_builder_set_max_row_group_size,
-        lakesoul_config_builder_set_object_store_option, lakesoul_config_builder_set_schema, lakesoul_config_builder_set_thread_num,
-        lakesoul_reader_get_schema, next_record_batch, start_reader, tokio_runtime_builder_set_thread_num, write_record_batch,
+        flush_and_close_writer, free_lakesoul_reader, lakesoul_config_builder_add_single_file,
+        lakesoul_config_builder_add_single_primary_key, lakesoul_config_builder_set_batch_size,
+        lakesoul_config_builder_set_max_row_group_size, lakesoul_config_builder_set_object_store_option,
+        lakesoul_config_builder_set_schema, lakesoul_config_builder_set_thread_num, lakesoul_reader_get_schema,
+        next_record_batch, start_reader, tokio_runtime_builder_set_thread_num, write_record_batch, IOConfigBuilder,
     };
 
     fn set_object_store_kv(builder: NonNull<IOConfigBuilder>, key: &str, value: &str) -> NonNull<IOConfigBuilder> {

diff --git a/rust/lakesoul-metadata-c/Cargo.toml b/rust/lakesoul-metadata-c/Cargo.toml
@@ -19,4 +19,3 @@ prost = {workspace = true}
 serde_json = "1.0.111"
 log = {workspace = true}
 env_logger = "0.11"
-mimalloc = { workspace = true }
diff --git a/rust/lakesoul-metadata-c/src/lib.rs b/rust/lakesoul-metadata-c/src/lib.rs
@@ -11,7 +11,6 @@ use std::io::Write;
 use std::ptr::{null, null_mut, NonNull};
 
 use log::debug;
-use mimalloc::MiMalloc;
 use prost::bytes::BufMut;
 use prost::Message;
 
@@ -20,9 +19,6 @@ use lakesoul_metadata::transfusion::SplitDesc;
 use lakesoul_metadata::{Builder, Client, MetaDataClient, PreparedStatementMap, Runtime};
 use proto::proto::entity;
 
-#[global_allocator]
-static GLOBAL: MiMalloc = MiMalloc;
-
 #[allow(non_camel_case_types)]
 pub type c_size_t = usize;
 #[allow(non_camel_case_types)]