Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix memory usage in plan_to_object_store #71

Merged
merged 11 commits into from
Aug 30, 2022
Merged

Fix memory usage in plan_to_object_store #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fae6740
Limit max row group size when writing Parquet files
mildbyte Aug 28, 2022
7d8791b
Remove redundant `http_object_store`
mildbyte Aug 28, 2022
b2de256
Use temporary file paths instead of handles
mildbyte Aug 28, 2022
41e1c95
Add a wrapper object store that stores the config
mildbyte Aug 28, 2022
44ad7d0
Wire the wrapper object store to the context
mildbyte Aug 28, 2022
8905aac
Read the Parquet statistics from disk
mildbyte Aug 28, 2022
8eaf4ed
Don't load the file into memory to hash it
mildbyte Aug 28, 2022
91bcb08
Fix file renames across different filesystems
mildbyte Aug 28, 2022
1578962
Remove the dot from the logo text
mildbyte Aug 29, 2022
634a461
Actually convert the RAM limit from MB to bytes
mildbyte Aug 29, 2022
67c1d1b
Revert "Use mimalloc in line with datafusion-cli"
mildbyte Aug 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ hashbrown = { version = "0.12", features = ["raw"] }
hex = ">=0.4.0"
itertools = ">=0.10.0"
log = "0.4"
mimalloc = { version = "*", default-features = false }
moka = { version = "0.9.3", default_features = false, features = ["future", "atomic64", "quanta"] }
object_store = "0.3.0"
pretty_env_logger = "0.4"
Expand Down
26 changes: 6 additions & 20 deletions docs/static/logotype.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 9 additions & 4 deletions src/config/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ use object_store::{local::LocalFileSystem, memory::InMemory, ObjectStore};
use crate::repository::postgres::PostgresRepository;

use crate::object_store::http::add_http_object_store;
use crate::object_store::wrapped::InternalObjectStore;
#[cfg(feature = "object-store-s3")]
use object_store::aws::new_s3;

use super::schema::{self, MEMORY_FRACTION, S3};
use super::schema::{self, MEBIBYTES, MEMORY_FRACTION, S3};

async fn build_catalog(
config: &schema::SeafowlConfig,
Expand Down Expand Up @@ -87,8 +88,8 @@ pub async fn build_context(
) -> Result<DefaultSeafowlContext, DataFusionError> {
let mut runtime_config = RuntimeConfig::new();
if let Some(max_memory) = cfg.runtime.max_memory {
runtime_config =
runtime_config.with_memory_limit(max_memory as usize, MEMORY_FRACTION);
runtime_config = runtime_config
.with_memory_limit((max_memory * MEBIBYTES) as usize, MEMORY_FRACTION);
}

if let Some(temp_dir) = &cfg.runtime.temp_dir {
Expand All @@ -108,7 +109,7 @@ pub async fn build_context(
context.runtime_env().register_object_store(
INTERNAL_OBJECT_STORE_SCHEME,
"",
object_store,
object_store.clone(),
);

// Register the HTTP object store for external tables
Expand Down Expand Up @@ -141,6 +142,10 @@ pub async fn build_context(
table_catalog: tables,
partition_catalog: partitions,
function_catalog: functions,
internal_object_store: Arc::new(InternalObjectStore {
inner: object_store,
config: cfg.object_store.clone(),
}),
database: DEFAULT_DB.to_string(),
database_id: default_db,
max_partition_size: cfg.misc.max_partition_size,
Expand Down
Loading