-
Notifications
You must be signed in to change notification settings - Fork 166
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
feat: Add DeleteColumnReader and PositionColumnReader #363
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
46 changes: 46 additions & 0 deletions
46
common/src/main/java/org/apache/comet/parquet/DeleteColumnReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/* | ||
* 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. | ||
*/ | ||
|
||
package org.apache.comet.parquet; | ||
|
||
import org.apache.spark.sql.types.DataTypes; | ||
import org.apache.spark.sql.types.Metadata; | ||
import org.apache.spark.sql.types.StructField; | ||
|
||
/** A column reader for reading delete column */ | ||
public class DeleteColumnReader extends MetadataColumnReader { | ||
private boolean[] isDeleted; | ||
|
||
public DeleteColumnReader(boolean[] isDeleted) { | ||
super( | ||
DataTypes.BooleanType, | ||
TypeUtil.convertToParquet( | ||
new StructField("deleted", DataTypes.BooleanType, false, Metadata.empty())), | ||
false); | ||
this.isDeleted = isDeleted; | ||
} | ||
|
||
@Override | ||
public void readBatch(int total) { | ||
Native.resetBatch(nativeHandle); | ||
Native.setIsDeleted(nativeHandle, isDeleted); | ||
|
||
super.readBatch(total); | ||
} | ||
} |
47 changes: 47 additions & 0 deletions
47
common/src/main/java/org/apache/comet/parquet/PositionColumnReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
/* | ||
* 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. | ||
*/ | ||
|
||
package org.apache.comet.parquet; | ||
|
||
import org.apache.parquet.column.ColumnDescriptor; | ||
import org.apache.spark.sql.types.DataTypes; | ||
|
||
/** A column reader for reading position column */ | ||
public class PositionColumnReader extends MetadataColumnReader { | ||
/** The current position value of the column that are used to initialize this column reader. */ | ||
private long position; | ||
|
||
public PositionColumnReader(ColumnDescriptor descriptor) { | ||
this(descriptor, 0L); | ||
} | ||
|
||
PositionColumnReader(ColumnDescriptor descriptor, long position) { | ||
super(DataTypes.LongType, descriptor, false); | ||
this.position = position; | ||
} | ||
|
||
@Override | ||
public void readBatch(int total) { | ||
Native.resetBatch(nativeHandle); | ||
Native.setPosition(nativeHandle, position, total); | ||
position += total; | ||
|
||
super.readBatch(total); | ||
Comment on lines
+42
to
+45
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not familiar with this area of code, but this looks odd to me and maybe just needs a comment to explain. My understanding:
|
||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would you like to add some more comment explaining why we have these? Especially they are not used in Comet itself.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually this is
common
module, and it is odd to have Iceberg code here.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These are pretty much similar to
ConstantColumnReader
, so I am thinking of putting them incommon
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am OK with leave these in Iceberg.