Skip to content

Remove legacy ORC writer identification #10885

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
findepi merged 1 commit into from
Feb 25, 2022
Merged

Remove legacy ORC writer identification #10885

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
5 changes: 0 additions & 5 deletions lib/trino-orc/src/main/java/io/trino/orc/OrcWriterOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ public enum WriterIdentification
*/
LEGACY_HIVE_COMPATIBLE,

/**
* Write ORC files with the legacy writer identification of PrestoSQL
*/
PRESTO,

/**
* Write ORC files with Trino writer identification.
*/
Expand Down
9 changes: 0 additions & 9 deletions lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcMetadataWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ public class OrcMetadataWriter

// see https://github.com/trinodb/orc-protobuf/blob/master/src/main/protobuf/orc_proto.proto
public static final int PRESTO_WRITER_ID = 2;
// in order to change this value, the master Apache ORC proto file must be updated
Copy link
Copy Markdown
Member

@sopel39 sopel39 Feb 1, 2022

Choose a reason for hiding this comment

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

Is it updated?

Copy link
Copy Markdown
Member Author

@findepi findepi Feb 1, 2022

Choose a reason for hiding this comment

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

no updated needed there

private static final int PRESTO_WRITER_VERSION = 6;

// maximum version readable by Hive 2.x before the ORC-125 fix
private static final int HIVE_LEGACY_WRITER_VERSION = 4;
Expand Down Expand Up @@ -99,8 +97,6 @@ private int getOrcWriterVersion()
switch (writerIdentification) {
case LEGACY_HIVE_COMPATIBLE:
return HIVE_LEGACY_WRITER_VERSION;
case PRESTO:
return PRESTO_WRITER_VERSION;
case TRINO:
return TRINO_WRITER_VERSION;
}
Expand Down Expand Up @@ -160,11 +156,6 @@ private void setWriter(OrcProto.Footer.Builder builder)
switch (writerIdentification) {
case LEGACY_HIVE_COMPATIBLE:
return;

case PRESTO:
builder.setWriter(PRESTO_WRITER_ID);
return;

case TRINO:
builder.setWriter(TRINO_WRITER_ID);
return;
Expand Down