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.

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

Remove interior mutability of MemTable #4514

Merged
merged 2 commits into from
Dec 5, 2022

Conversation

xudong963
Copy link
Member

Which issue does this PR close?

Follow up #4496

Rationale for this change

What changes are included in this PR?

Are these changes tested?

Are there any user-facing changes?

@github-actions github-actions bot added core Core DataFusion crate sqllogictest SQL Logic Tests (.slt) labels Dec 5, 2022
Comment on lines 79 to 83
for batch in insert_batches.iter_mut() {
origin_batches.push(RecordBatch::try_new(
schema.clone(),
batch.columns().to_vec(),
)?);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ideal way should be concating columns of origin_batches and insert_batches, then create new RecordBatches with origin schema and concated columns.

But seems arrow-rs doesn't provide similar APIs, so I just use the current way.

@xudong963 xudong963 requested a review from alamb December 5, 2022 14:42
@@ -74,12 +72,20 @@ pub async fn insert(ctx: &SessionContext, insert_stmt: &SQLStatement) -> Result<
.collect::<std::result::Result<Vec<DFExpr>, DataFusionError>>()?;
// Directly use `select` to get `RecordBatch`
let dataframe = ctx.read_empty()?;
insert_batches.push(dataframe.select(logical_exprs)?.collect().await?)
insert_batches.extend(dataframe.select(logical_exprs)?.collect().await?)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if you could make this

Suggested change
insert_batches.extend(dataframe.select(logical_exprs)?.collect().await?)
origin_batches.extend(dataframe.select(logical_exprs)?.collect().await?)

And avoid the need for insert_batches entirely 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, nice suggestion!

Copy link
Contributor

@alamb alamb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look like a nice improvement to me -- thanks @xudong963

I had some small suggestions but they aren't needed or could be done as a follow on PR I think

table_batches.extend(insert_batches);
// Replace new batches schema to old schema
for batch in origin_batches.iter_mut() {
*batch = RecordBatch::try_new(schema.clone(), batch.columns().to_vec())?;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is interesting -- I guess we can sort it out as a follow on

@alamb alamb merged commit 0fca6d5 into apache:master Dec 5, 2022
@alamb
Copy link
Contributor

alamb commented Dec 5, 2022

Thanks @xudong963 !

@xudong963 xudong963 deleted the change_memtable branch December 5, 2022 16:09
@ursabot
Copy link

ursabot commented Dec 5, 2022

Benchmark runs are scheduled for baseline = 73527e3 and contender = 0fca6d5. 0fca6d5 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ec2-t3-xlarge-us-east-2] ec2-t3-xlarge-us-east-2
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on test-mac-arm] test-mac-arm
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ursa-i9-9960x] ursa-i9-9960x
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ursa-thinkcentre-m75q] ursa-thinkcentre-m75q
Buildkite builds:
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core Core DataFusion crate sqllogictest SQL Logic Tests (.slt)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants