Skip to content

graph, store: Use a much larger fetch_size for fdw #5790

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

Merged
lutter merged 1 commit into from
Mar 5, 2025
Merged

graph, store: Use a much larger fetch_size for fdw #5790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions graph/src/env/store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ pub struct EnvVarsStore {
/// used to work around Postgres errors complaining 'number of
/// parameters must be between 0 and 65535' when inserting entities
pub insert_extra_cols: usize,
/// The number of rows to fetch from the foreign data wrapper in one go,
/// this will be set as the option 'fetch_size' on all foreign servers
pub fdw_fetch_size: usize,
}

// This does not print any values avoid accidentally leaking any sensitive env vars
Expand Down Expand Up @@ -175,6 +178,7 @@ impl From<InnerStore> for EnvVarsStore {
disable_block_cache_for_lookup: x.disable_block_cache_for_lookup,
last_rollup_from_poi: x.last_rollup_from_poi,
insert_extra_cols: x.insert_extra_cols,
fdw_fetch_size: x.fdw_fetch_size,
}
}
}
Expand Down Expand Up @@ -238,6 +242,8 @@ pub struct InnerStore {
last_rollup_from_poi: bool,
#[envconfig(from = "GRAPH_STORE_INSERT_EXTRA_COLS", default = "0")]
insert_extra_cols: usize,
#[envconfig(from = "GRAPH_STORE_FDW_FETCH_SIZE", default = "10000")]
fdw_fetch_size: usize,
}

#[derive(Clone, Copy, Debug)]
Expand Down
14 changes: 12 additions & 2 deletions store/postgres/src/connection_pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,11 @@ impl ForeignServer {
"\
create server \"{name}\"
foreign data wrapper postgres_fdw
options (host '{remote_host}', port '{remote_port}', dbname '{remote_db}', updatable 'false');
options (host '{remote_host}', \
port '{remote_port}', \
dbname '{remote_db}', \
fetch_size '{fetch_size}', \
updatable 'false');
create user mapping
for current_user server \"{name}\"
options (user '{remote_user}', password '{remote_password}');",
Expand All @@ -160,6 +164,7 @@ impl ForeignServer {
remote_db = self.dbname,
remote_user = self.user,
remote_password = self.password,
fetch_size = ENV_VARS.store.fdw_fetch_size,
);
Ok(conn.batch_execute(&query)?)
}
Expand All @@ -178,17 +183,22 @@ impl ForeignServer {
let query = format!(
"\
alter server \"{name}\"
options (set host '{remote_host}', {set_port} port '{remote_port}', set dbname '{remote_db}');
options (set host '{remote_host}', \
{set_port} port '{remote_port}', \
set dbname '{remote_db}, \
{set_fetch_size} fetch_size '{fetch_size}');
alter user mapping
for current_user server \"{name}\"
options (set user '{remote_user}', set password '{remote_password}');",
name = self.name,
remote_host = self.host,
set_port = set_or_add("port"),
set_fetch_size = set_or_add("fetch_size"),
remote_port = self.port,
remote_db = self.dbname,
remote_user = self.user,
remote_password = self.password,
fetch_size = ENV_VARS.store.fdw_fetch_size,
);
Ok(conn.batch_execute(&query)?)
}
Expand Down
Loading