alamb commented on code in PR #7842: URL: https://github.com/apache/arrow-datafusion/pull/7842#discussion_r1367707917
########## datafusion/physical-plan/src/sorts/batches.rs: ########## @@ -0,0 +1,31 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +use super::cursor::{Cursor, CursorValues}; + +#[derive(Debug)] +pub(crate) struct BatchCursor<C: CursorValues> { + /// The index into SortOrderBuilder::batches + /// TODO: this will become a BatchId, for record batch collected (and not passed across streams) + pub batch_idx: usize, + + /// The row index within the given batch + pub row_idx: usize, Review Comment: Given the `Cursor` already has a row offset, why is there a another `row_idx` index in `BatchCursor`? Is it the same or does it potentially point at a different offset? ########## datafusion/physical-plan/src/sorts/batches.rs: ########## @@ -0,0 +1,31 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +use super::cursor::{Cursor, CursorValues}; + +#[derive(Debug)] +pub(crate) struct BatchCursor<C: CursorValues> { Review Comment: Perhaps we can add a doc comment here explaining what this structure is for. It seems like the core function is to hold the entire original `RecordBatch` that the input rows came from (rather than just the columns that are part of the sort key). ########## datafusion/physical-plan/src/sorts/builder.rs: ########## @@ -42,15 +37,15 @@ pub struct BatchBuilder { reservation: MemoryReservation, /// The current [`BatchCursor`] for each stream - cursors: Vec<BatchCursor>, + cursors: Vec<Option<BatchCursor<C>>>, Review Comment: It seems like this structure now does some of the same things as `SortPreservingMergeStream`: https://github.com/apache/arrow-datafusion/blob/37d6bf08c948418fe6c72d072d988c2875d81e02/datafusion/physical-plan/src/sorts/merge.rs#L210-L222 Is there any way to avoid a second copy? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
