[native] Add support for ORC reader

presto-docs/src/main/sphinx/presto-cpp.rst

@@ -54,4 +54,6 @@ Only specific connectors are supported in the Presto C++ evaluation engine.
 
 * Iceberg connector supports both V1 and V2 tables, including tables with delete files.
 
+* Supports reading and writing of DWRF and PARQUET file formats, supports reading ORC file format.
+
 * TPCH connector, with ``tpch.naming=standard`` catalog property.

presto-native-execution/presto_cpp/main/PrestoServer.cpp

@@ -57,6 +57,7 @@
 #include "velox/connectors/tpch/TpchConnector.h"
 #include "velox/dwio/dwrf/RegisterDwrfReader.h"
 #include "velox/dwio/dwrf/RegisterDwrfWriter.h"
+#include "velox/dwio/orc/reader/OrcReader.h"
 #include "velox/dwio/parquet/RegisterParquetReader.h"
 #include "velox/dwio/parquet/RegisterParquetWriter.h"
 #include "velox/exec/OutputBufferManager.h"
@@ -1391,6 +1392,7 @@ void PrestoServer::registerMemoryArbitrators() {
 void PrestoServer::registerFileReadersAndWriters() {
   velox::dwrf::registerDwrfReaderFactory();
   velox::dwrf::registerDwrfWriterFactory();
+  velox::orc::registerOrcReaderFactory();
   velox::parquet::registerParquetReaderFactory();
   velox::parquet::registerParquetWriterFactory();
 }

presto-native-execution/presto_cpp/main/types/PrestoToVeloxConnector.cpp

@@ -72,6 +72,9 @@ dwio::common::FileFormat toVeloxFileFormat(
     const presto::protocol::hive::StorageFormat& format) {
   if (format.inputFormat == "com.facebook.hive.orc.OrcInputFormat") {
     return dwio::common::FileFormat::DWRF;
+  } else if (
+      format.inputFormat == "org.apache.hadoop.hive.ql.io.orc.OrcInputFormat") {
+    return dwio::common::FileFormat::ORC;
   } else if (
       format.inputFormat ==
       "org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat") {

presto-native-execution/src/test/java/com/facebook/presto/nativeworker/NativeQueryRunnerUtils.java

@@ -193,6 +193,9 @@ public static void createNation(QueryRunner queryRunner)
         if (!queryRunner.tableExists(queryRunner.getDefaultSession(), "nation")) {
             queryRunner.execute("CREATE TABLE nation AS SELECT * FROM tpch.tiny.nation");
         }
+        if (!queryRunner.tableExists(queryRunner.getDefaultSession(), "nation")) {
+            queryRunner.execute("CREATE TABLE nation WITH (FORMAT = 'ORC') AS SELECT * FROM tpch.tiny.nation");
+        }
         if (!queryRunner.tableExists(queryRunner.getDefaultSession(), "nation_json")) {
             queryRunner.execute("CREATE TABLE nation_json WITH (FORMAT = 'JSON') AS SELECT * FROM tpch.tiny.nation");
         }
@@ -214,7 +217,7 @@ public static void createNationWithFormat(Session session, QueryRunner queryRunn
         }
 
         if (storageFormat.equals("ORC") && !queryRunner.tableExists(session, "nation")) {
-            queryRunner.execute(session, "CREATE TABLE nation AS SELECT * FROM tpch.tiny.nation");
+            queryRunner.execute(session, "CREATE TABLE nation WITH (FORMAT = 'ORC') AS SELECT * FROM tpch.tiny.nation");
         }
 
         if (storageFormat.equals("JSON") && !queryRunner.tableExists(session, "nation_json")) {

presto-native-execution/src/test/java/com/facebook/presto/nativeworker/TestPrestoNativeIcebergPositionDeleteQueriesOrcUsingThrift.java

@@ -0,0 +1,40 @@
+/*
+ * Licensed 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 com.facebook.presto.nativeworker;
+
+import com.facebook.presto.testing.ExpectedQueryRunner;
+import com.facebook.presto.testing.QueryRunner;
+
+import static com.facebook.presto.nativeworker.PrestoNativeQueryRunnerUtils.createJavaIcebergQueryRunner;
+import static com.facebook.presto.nativeworker.PrestoNativeQueryRunnerUtils.createNativeIcebergQueryRunner;
+
+public class TestPrestoNativeIcebergPositionDeleteQueriesOrcUsingThrift
+        extends AbstractTestNativeIcebergPositionDeleteQueries
+{
+    private final String storageFormat = "ORC";
+
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        return createNativeIcebergQueryRunner(true, storageFormat);
+    }
+
+    @Override
+    protected ExpectedQueryRunner createExpectedQueryRunner()
+            throws Exception
+    {
+        return createJavaIcebergQueryRunner(storageFormat);
+    }
+}

presto-native-execution/src/test/java/com/facebook/presto/nativeworker/TestPrestoNativeIcebergPositionDeleteQueriesUsingThrift.java → presto-native-execution/src/test/java/com/facebook/presto/nativeworker/TestPrestoNativeIcebergPositionDeleteQueriesParquetUsingThrift.java

@@ -19,7 +19,7 @@
 import static com.facebook.presto.nativeworker.PrestoNativeQueryRunnerUtils.createJavaIcebergQueryRunner;
 import static com.facebook.presto.nativeworker.PrestoNativeQueryRunnerUtils.createNativeIcebergQueryRunner;
 
-public class TestPrestoNativeIcebergPositionDeleteQueriesUsingThrift
+public class TestPrestoNativeIcebergPositionDeleteQueriesParquetUsingThrift
         extends AbstractTestNativeIcebergPositionDeleteQueries
 {
     private final String storageFormat = "PARQUET";

presto-native-execution/src/test/java/com/facebook/presto/nativeworker/TestPrestoNativeIcebergTpcdsQueriesOrcUsingThrift.java

@@ -0,0 +1,47 @@
+/*
+ * Licensed 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 com.facebook.presto.nativeworker;
+
+import com.facebook.presto.testing.ExpectedQueryRunner;
+import com.facebook.presto.testing.QueryRunner;
+import org.testng.annotations.Test;
+
+@Test(groups = {"orc"})
+public class TestPrestoNativeIcebergTpcdsQueriesOrcUsingThrift
+        extends AbstractTestNativeTpcdsQueries
+{
+    @Override
+    protected QueryRunner createQueryRunner()
+            throws Exception
+    {
+        this.storageFormat = "ORC";
+        return PrestoNativeQueryRunnerUtils.createNativeIcebergQueryRunner(true, "ORC");
+    }
+
+    @Override
+    protected ExpectedQueryRunner createExpectedQueryRunner()
+            throws Exception
+    {
+        this.storageFormat = "ORC";
+        return PrestoNativeQueryRunnerUtils.createJavaIcebergQueryRunner("ORC");
+    }
+
+    @Test
+    public void doDeletesAndQuery() throws Exception
+    {
+        doDeletes();
+        verifyDeletes();
+        runAllQueries();
+    }
+}