-
Notifications
You must be signed in to change notification settings - Fork 3k
Core|ORC|Spark: Remove deprecated functionality #6274
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
Conversation
7eefa7f to
d7ab222
Compare
....4/spark/src/main/java/org/apache/iceberg/spark/actions/BaseRewriteManifestsSparkAction.java
Outdated
Show resolved
Hide resolved
| * @deprecated since 1.0.0, will be removed in 1.1.0; use {@link #dataSequenceNumber()} instead. | ||
| */ | ||
| @Deprecated | ||
| Long sequenceNumber(); |
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.
@aokolnychyi could you please review all places that adjust sequenceNumber -> dataSequenceNumber?
d7ab222 to
6a64322
Compare
6a64322 to
39a983f
Compare
39a983f to
6df8657
Compare
| private Status status = Status.EXISTING; | ||
| private Long snapshotId = null; | ||
| private Long dataSequenceNumber = null; | ||
| private Long sequenceNumber = null; |
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.
@aokolnychyi, can you take a look at these changes?
| */ | ||
| @Deprecated | ||
| @Override | ||
| public List<ManifestFile> apply(TableMetadata base) { |
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.
Why remove these? It doesn't seem like a big deal to keep the versions that default the parent snapshot to current.
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.
| * Predicate, DeleteCounter)}. | ||
| */ | ||
| @Deprecated | ||
| public static <T> CloseableIterable<T> filterDeleted( |
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 guess this is okay? It doesn't seem bad to have a version that doesn't require a counter.
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.
data/src/test/java/org/apache/iceberg/data/orc/TestOrcRowIterator.java
Outdated
Show resolved
Hide resolved
...ark-extensions/src/main/scala/org/apache/spark/sql/catalyst/optimizer/RewriteMergeInto.scala
Show resolved
Hide resolved
spark/v3.1/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMerge.java
Show resolved
Hide resolved
| .build(), | ||
| MetricsConfig.getDefault())) { | ||
| writer.addAll(rows); | ||
| try (ParquetWriter<InternalRow> writer = |
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.
Why were these changes needed?
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.
this was using the deprecated ParquetWriteAdapter class, so I started changing code that uses this class so that we can eventually remove ParquetWriteAdapter
6df8657 to
623b7aa
Compare
|
I'll take a look at seq number related changes today. |
core/src/main/java/org/apache/iceberg/GenericManifestEntry.java
Outdated
Show resolved
Hide resolved
core/src/main/java/org/apache/iceberg/GenericManifestEntry.java
Outdated
Show resolved
Hide resolved
| /** | ||
| * @deprecated will be removed in 0.14.0, the cardinality check is always performed starting from | ||
| * 0.13.0. | ||
| * @deprecated will be removed once Spark 3.1 support is dropped, the cardinality check is always |
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.
Makes sense to me.
aokolnychyi
left a comment
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.
LGTM, I'd just remove two comments that no longer apply. Thanks, @nastra!
623b7aa to
48a9ade
Compare
48a9ade to
735eaf8
Compare
|
Thanks, @nastra! |
When dropping ManifestEntry.sequenceNumber in apache#6274, a new assert was added to TableTestBase.validateManifests(). However, there was a same assert already. Dropping one of them.
When dropping ManifestEntry.sequenceNumber in apache#6274, a new assert was added to validateManifest() and validateDeleteManifest(). However, there was a same assert already. Dropping one of them.
fixes #6155