From 8c590334187cf5261aa0d53443e4fb0934cc7448 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Tue, 1 Feb 2022 11:19:57 +0100
Subject: [PATCH] Remove legacy ORC writer identification

---
 .../src/main/java/io/trino/orc/OrcWriterOptions.java     | 5 -----
 .../java/io/trino/orc/metadata/OrcMetadataWriter.java    | 9 ---------
 2 files changed, 14 deletions(-)

diff --git a/lib/trino-orc/src/main/java/io/trino/orc/OrcWriterOptions.java b/lib/trino-orc/src/main/java/io/trino/orc/OrcWriterOptions.java
index 8edbe42c03c3..0f60910d0ed4 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/OrcWriterOptions.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/OrcWriterOptions.java
@@ -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.
          */
diff --git a/lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcMetadataWriter.java b/lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcMetadataWriter.java
index 09d1600e4360..d586940be376 100644
--- a/lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcMetadataWriter.java
+++ b/lib/trino-orc/src/main/java/io/trino/orc/metadata/OrcMetadataWriter.java
@@ -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
-    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;
@@ -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;
         }
@@ -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;