diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/DataOutput.java b/presto-common/src/main/java/com/facebook/presto/common/io/DataOutput.java similarity index 97% rename from presto-orc/src/main/java/com/facebook/presto/orc/stream/DataOutput.java rename to presto-common/src/main/java/com/facebook/presto/common/io/DataOutput.java index 782982997fda..d75fc3f54f46 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/DataOutput.java +++ b/presto-common/src/main/java/com/facebook/presto/common/io/DataOutput.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.orc.stream; +package com.facebook.presto.common.io; import io.airlift.slice.Slice; import io.airlift.slice.SliceOutput; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/DataSink.java b/presto-common/src/main/java/com/facebook/presto/common/io/DataSink.java similarity index 92% rename from presto-orc/src/main/java/com/facebook/presto/orc/DataSink.java rename to presto-common/src/main/java/com/facebook/presto/common/io/DataSink.java index a3d4292a48b6..0c94ab10c4c9 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/DataSink.java +++ b/presto-common/src/main/java/com/facebook/presto/common/io/DataSink.java @@ -11,9 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.orc; - -import com.facebook.presto.orc.stream.DataOutput; +package com.facebook.presto.common.io; import java.io.IOException; import java.util.List; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OutputStreamDataSink.java b/presto-common/src/main/java/com/facebook/presto/common/io/OutputStreamDataSink.java similarity index 95% rename from presto-orc/src/main/java/com/facebook/presto/orc/OutputStreamDataSink.java rename to presto-common/src/main/java/com/facebook/presto/common/io/OutputStreamDataSink.java index 8aacc212db01..c368f9c56219 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OutputStreamDataSink.java +++ b/presto-common/src/main/java/com/facebook/presto/common/io/OutputStreamDataSink.java @@ -11,9 +11,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.orc; +package com.facebook.presto.common.io; -import com.facebook.presto.orc.stream.DataOutput; import io.airlift.slice.OutputStreamSliceOutput; import org.openjdk.jol.info.ClassLayout; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriter.java index ebcc9badf265..0218131aef63 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriter.java @@ -18,8 +18,8 @@ import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; import com.facebook.presto.common.block.RunLengthEncodedBlock; +import com.facebook.presto.common.io.DataSink; import com.facebook.presto.common.type.Type; -import com.facebook.presto.orc.DataSink; import com.facebook.presto.orc.DwrfEncryptionProvider; import com.facebook.presto.orc.DwrfWriterEncryption; import com.facebook.presto.orc.OrcDataSource; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java index e3e7104fd421..67ace9256487 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java @@ -13,13 +13,13 @@ */ package com.facebook.presto.hive; +import com.facebook.presto.common.io.DataSink; import com.facebook.presto.common.type.Type; import com.facebook.presto.common.type.TypeManager; import com.facebook.presto.hive.datasink.DataSinkFactory; import com.facebook.presto.hive.metastore.MetastoreUtil; import com.facebook.presto.hive.metastore.StorageFormat; import com.facebook.presto.hive.orc.HdfsOrcDataSource; -import com.facebook.presto.orc.DataSink; import com.facebook.presto.orc.DwrfEncryptionProvider; import com.facebook.presto.orc.DwrfWriterEncryption; import com.facebook.presto.orc.OrcDataSource; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriter.java index 4a6073f3c726..e457e7970e22 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/SortingFileWriter.java @@ -16,13 +16,13 @@ import com.facebook.airlift.log.Logger; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.SortOrder; +import com.facebook.presto.common.io.DataSink; import com.facebook.presto.common.type.Type; import com.facebook.presto.hive.orc.HdfsOrcDataSource; import com.facebook.presto.hive.util.MergingPageIterator; import com.facebook.presto.hive.util.SortBuffer; import com.facebook.presto.hive.util.TempFileReader; import com.facebook.presto.hive.util.TempFileWriter; -import com.facebook.presto.orc.DataSink; import com.facebook.presto.orc.OrcDataSource; import com.facebook.presto.orc.OrcDataSourceId; import com.facebook.presto.spi.PageSorter; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/datasink/DataSinkFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/datasink/DataSinkFactory.java index 6233fea6431c..ded3d42fdb0f 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/datasink/DataSinkFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/datasink/DataSinkFactory.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive.datasink; -import com.facebook.presto.orc.DataSink; +import com.facebook.presto.common.io.DataSink; import com.facebook.presto.spi.ConnectorSession; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/datasink/OutputStreamDataSinkFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/datasink/OutputStreamDataSinkFactory.java index 511eecfec6df..2d34b7bcb87c 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/datasink/OutputStreamDataSinkFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/datasink/OutputStreamDataSinkFactory.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.hive.datasink; -import com.facebook.presto.orc.DataSink; -import com.facebook.presto.orc.OutputStreamDataSink; +import com.facebook.presto.common.io.DataSink; +import com.facebook.presto.common.io.OutputStreamDataSink; import com.facebook.presto.spi.ConnectorSession; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageDataOutput.java b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageDataOutput.java index 29b5a9b9d027..205fcbccc620 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageDataOutput.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageDataOutput.java @@ -13,7 +13,7 @@ */ package com.facebook.presto.hive.pagefile; -import com.facebook.presto.orc.stream.DataOutput; +import com.facebook.presto.common.io.DataOutput; import com.facebook.presto.spi.page.SerializedPage; import io.airlift.slice.SliceOutput; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileFooterOutput.java b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileFooterOutput.java index 493207f134b8..9894f40e8e05 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileFooterOutput.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileFooterOutput.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.hive.pagefile; +import com.facebook.presto.common.io.DataOutput; import com.facebook.presto.hive.HiveCompressionCodec; -import com.facebook.presto.orc.stream.DataOutput; import com.google.common.collect.ImmutableList; import io.airlift.slice.Slice; import io.airlift.slice.SliceOutput; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriter.java index a3b4fbd75c3d..c2c81ace2620 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriter.java @@ -14,9 +14,9 @@ package com.facebook.presto.hive.pagefile; import com.facebook.presto.common.Page; +import com.facebook.presto.common.io.DataSink; import com.facebook.presto.hive.HiveCompressionCodec; import com.facebook.presto.hive.HiveFileWriter; -import com.facebook.presto.orc.DataSink; import com.facebook.presto.spi.PrestoException; import com.facebook.presto.spi.page.PagesSerde; import io.airlift.units.DataSize; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriterFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriterFactory.java index a1759263a6e2..4a5d6b5962a3 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriterFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriterFactory.java @@ -14,6 +14,7 @@ package com.facebook.presto.hive.pagefile; import com.facebook.presto.common.block.BlockEncodingSerde; +import com.facebook.presto.common.io.DataSink; import com.facebook.presto.hive.EncryptionInformation; import com.facebook.presto.hive.HdfsEnvironment; import com.facebook.presto.hive.HiveCompressionCodec; @@ -21,7 +22,6 @@ import com.facebook.presto.hive.HiveFileWriterFactory; import com.facebook.presto.hive.datasink.DataSinkFactory; import com.facebook.presto.hive.metastore.StorageFormat; -import com.facebook.presto.orc.DataSink; import com.facebook.presto.orc.zlib.DeflateCompressor; import com.facebook.presto.orc.zlib.InflateDecompressor; import com.facebook.presto.orc.zstd.ZstdJniCompressor; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageWriter.java index d05249741ca1..15c41137eb9b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageWriter.java @@ -13,9 +13,9 @@ */ package com.facebook.presto.hive.pagefile; +import com.facebook.presto.common.io.DataOutput; +import com.facebook.presto.common.io.DataSink; import com.facebook.presto.hive.HiveCompressionCodec; -import com.facebook.presto.orc.DataSink; -import com.facebook.presto.orc.stream.DataOutput; import com.facebook.presto.spi.page.SerializedPage; import com.google.common.collect.ImmutableList; import io.airlift.units.DataSize; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/util/TempFileWriter.java b/presto-hive/src/main/java/com/facebook/presto/hive/util/TempFileWriter.java index 579105c6fc32..672ba70a3290 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/util/TempFileWriter.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/util/TempFileWriter.java @@ -15,8 +15,8 @@ import com.facebook.presto.common.NotSupportedException; import com.facebook.presto.common.Page; +import com.facebook.presto.common.io.DataSink; import com.facebook.presto.common.type.Type; -import com.facebook.presto.orc.DataSink; import com.facebook.presto.orc.OrcWriteValidation.OrcWriteValidationMode; import com.facebook.presto.orc.OrcWriter; import com.facebook.presto.orc.OrcWriterOptions; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/benchmark/FileFormat.java b/presto-hive/src/test/java/com/facebook/presto/hive/benchmark/FileFormat.java index 9d61fe20f3e9..324a827085c6 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/benchmark/FileFormat.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/benchmark/FileFormat.java @@ -15,6 +15,7 @@ import com.facebook.presto.block.BlockEncodingManager; import com.facebook.presto.common.Page; +import com.facebook.presto.common.io.OutputStreamDataSink; import com.facebook.presto.common.predicate.TupleDomain; import com.facebook.presto.common.type.Type; import com.facebook.presto.hive.FileFormatDataSourceStats; @@ -43,7 +44,6 @@ import com.facebook.presto.orc.OrcWriter; import com.facebook.presto.orc.OrcWriterOptions; import com.facebook.presto.orc.OrcWriterStats; -import com.facebook.presto.orc.OutputStreamDataSink; import com.facebook.presto.orc.StorageStripeMetadataSource; import com.facebook.presto.orc.cache.StorageOrcFileTailSource; import com.facebook.presto.parquet.cache.MetadataReader; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java index 37b62610a8e4..c7c41c41fd93 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcWriter.java @@ -15,6 +15,8 @@ import com.facebook.airlift.log.Logger; import com.facebook.presto.common.Page; +import com.facebook.presto.common.io.DataOutput; +import com.facebook.presto.common.io.DataSink; import com.facebook.presto.common.type.Type; import com.facebook.presto.orc.OrcWriteValidation.OrcWriteValidationBuilder; import com.facebook.presto.orc.OrcWriteValidation.OrcWriteValidationMode; @@ -34,7 +36,6 @@ import com.facebook.presto.orc.metadata.statistics.ColumnStatistics; import com.facebook.presto.orc.metadata.statistics.StripeStatistics; import com.facebook.presto.orc.proto.DwrfProto; -import com.facebook.presto.orc.stream.DataOutput; import com.facebook.presto.orc.stream.StreamDataOutput; import com.facebook.presto.orc.writer.ColumnWriter; import com.facebook.presto.orc.writer.SliceDictionaryColumnWriter; @@ -66,6 +67,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import static com.facebook.presto.common.io.DataOutput.createDataOutput; import static com.facebook.presto.orc.DwrfEncryptionInfo.UNENCRYPTED; import static com.facebook.presto.orc.DwrfEncryptionInfo.createNodeToGroupMap; import static com.facebook.presto.orc.OrcReader.validateFile; @@ -77,7 +79,6 @@ import static com.facebook.presto.orc.metadata.DwrfMetadataWriter.toFileStatistics; import static com.facebook.presto.orc.metadata.DwrfMetadataWriter.toStripeEncryptionGroup; import static com.facebook.presto.orc.metadata.PostScript.MAGIC; -import static com.facebook.presto.orc.stream.DataOutput.createDataOutput; import static com.facebook.presto.orc.writer.ColumnWriters.createColumnWriter; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/stream/StreamDataOutput.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/StreamDataOutput.java index 44e583b7b122..b09c0e6c0f4f 100644 --- a/presto-orc/src/main/java/com/facebook/presto/orc/stream/StreamDataOutput.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/StreamDataOutput.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.orc.stream; +import com.facebook.presto.common.io.DataOutput; import com.facebook.presto.orc.metadata.Stream; import io.airlift.slice.Slice; import io.airlift.slice.SliceOutput; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java b/presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java index e1655fab10ff..8a7c8dfe1ad0 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java @@ -19,6 +19,7 @@ import com.facebook.presto.common.Subfield; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; +import com.facebook.presto.common.io.OutputStreamDataSink; import com.facebook.presto.common.type.ArrayType; import com.facebook.presto.common.type.CharType; import com.facebook.presto.common.type.DecimalType; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcWriter.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcWriter.java index 15a68a7e57b5..38af1ac7bf9d 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcWriter.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcWriter.java @@ -16,13 +16,15 @@ import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; +import com.facebook.presto.common.io.DataOutput; +import com.facebook.presto.common.io.DataSink; +import com.facebook.presto.common.io.OutputStreamDataSink; import com.facebook.presto.orc.OrcWriteValidation.OrcWriteValidationMode; import com.facebook.presto.orc.cache.StorageOrcFileTailSource; import com.facebook.presto.orc.metadata.Footer; import com.facebook.presto.orc.metadata.Stream; import com.facebook.presto.orc.metadata.StripeFooter; import com.facebook.presto.orc.metadata.StripeInformation; -import com.facebook.presto.orc.stream.DataOutput; import com.facebook.presto.orc.stream.OrcInputStream; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/presto-orc/src/test/java/com/facebook/presto/orc/TestStructBatchStreamReader.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestStructBatchStreamReader.java index 6414b74545a4..bf1834f18da8 100644 --- a/presto-orc/src/test/java/com/facebook/presto/orc/TestStructBatchStreamReader.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestStructBatchStreamReader.java @@ -18,6 +18,7 @@ import com.facebook.presto.common.block.Block; import com.facebook.presto.common.block.BlockBuilder; import com.facebook.presto.common.block.RowBlock; +import com.facebook.presto.common.io.OutputStreamDataSink; import com.facebook.presto.common.type.NamedTypeSignature; import com.facebook.presto.common.type.RowFieldName; import com.facebook.presto.common.type.StandardTypes; diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/filesystem/HdfsOrcDataEnvironment.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/filesystem/HdfsOrcDataEnvironment.java index f669dd00d3e6..c830f000ceec 100644 --- a/presto-raptor/src/main/java/com/facebook/presto/raptor/filesystem/HdfsOrcDataEnvironment.java +++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/filesystem/HdfsOrcDataEnvironment.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.raptor.filesystem; +import com.facebook.presto.common.io.DataSink; +import com.facebook.presto.common.io.OutputStreamDataSink; import com.facebook.presto.hive.HdfsContext; -import com.facebook.presto.orc.DataSink; import com.facebook.presto.orc.OrcDataSource; import com.facebook.presto.orc.OrcDataSourceId; -import com.facebook.presto.orc.OutputStreamDataSink; import com.facebook.presto.raptor.storage.OrcDataEnvironment; import com.facebook.presto.raptor.storage.ReaderAttributes; import com.facebook.presto.spi.PrestoException; diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/filesystem/LocalOrcDataEnvironment.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/filesystem/LocalOrcDataEnvironment.java index d083018d1453..73b82ea78db3 100644 --- a/presto-raptor/src/main/java/com/facebook/presto/raptor/filesystem/LocalOrcDataEnvironment.java +++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/filesystem/LocalOrcDataEnvironment.java @@ -13,11 +13,11 @@ */ package com.facebook.presto.raptor.filesystem; +import com.facebook.presto.common.io.DataSink; +import com.facebook.presto.common.io.OutputStreamDataSink; import com.facebook.presto.hive.HdfsContext; -import com.facebook.presto.orc.DataSink; import com.facebook.presto.orc.FileOrcDataSource; import com.facebook.presto.orc.OrcDataSource; -import com.facebook.presto.orc.OutputStreamDataSink; import com.facebook.presto.raptor.storage.OrcDataEnvironment; import com.facebook.presto.raptor.storage.ReaderAttributes; import com.facebook.presto.spi.PrestoException; diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/OrcDataEnvironment.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/OrcDataEnvironment.java index ad35995b2236..e12cff187a35 100644 --- a/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/OrcDataEnvironment.java +++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/OrcDataEnvironment.java @@ -13,8 +13,8 @@ */ package com.facebook.presto.raptor.storage; +import com.facebook.presto.common.io.DataSink; import com.facebook.presto.hive.HdfsContext; -import com.facebook.presto.orc.DataSink; import com.facebook.presto.orc.OrcDataSource; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/OrcFileWriter.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/OrcFileWriter.java index 71269e9ab2cd..4fef34262ace 100644 --- a/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/OrcFileWriter.java +++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/OrcFileWriter.java @@ -16,10 +16,10 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.presto.common.NotSupportedException; import com.facebook.presto.common.Page; +import com.facebook.presto.common.io.DataSink; import com.facebook.presto.common.type.Type; import com.facebook.presto.common.type.TypeManager; import com.facebook.presto.common.type.TypeSignature; -import com.facebook.presto.orc.DataSink; import com.facebook.presto.orc.OrcWriter; import com.facebook.presto.orc.OrcWriterOptions; import com.facebook.presto.orc.OrcWriterStats; diff --git a/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/OrcStorageManager.java b/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/OrcStorageManager.java index 19d8c28fb1ea..4509afe0f7ef 100644 --- a/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/OrcStorageManager.java +++ b/presto-raptor/src/main/java/com/facebook/presto/raptor/storage/OrcStorageManager.java @@ -16,6 +16,7 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; +import com.facebook.presto.common.io.DataSink; import com.facebook.presto.common.predicate.TupleDomain; import com.facebook.presto.common.type.ArrayType; import com.facebook.presto.common.type.DecimalType; @@ -31,7 +32,6 @@ import com.facebook.presto.common.type.TypeSignatureParameter; import com.facebook.presto.hive.HdfsContext; import com.facebook.presto.hive.HiveFileContext; -import com.facebook.presto.orc.DataSink; import com.facebook.presto.orc.OrcAggregatedMemoryContext; import com.facebook.presto.orc.OrcBatchRecordReader; import com.facebook.presto.orc.OrcDataSource; diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/OrcTestingUtil.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/OrcTestingUtil.java index 0c90d221e7d1..b08e9b299b33 100644 --- a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/OrcTestingUtil.java +++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/OrcTestingUtil.java @@ -13,6 +13,7 @@ */ package com.facebook.presto.raptor.storage; +import com.facebook.presto.common.io.OutputStreamDataSink; import com.facebook.presto.common.type.Type; import com.facebook.presto.metadata.FunctionAndTypeManager; import com.facebook.presto.metadata.Metadata; @@ -25,7 +26,6 @@ import com.facebook.presto.orc.OrcReader; import com.facebook.presto.orc.OrcReaderOptions; import com.facebook.presto.orc.OrcWriterStats; -import com.facebook.presto.orc.OutputStreamDataSink; import com.facebook.presto.orc.StorageStripeMetadataSource; import com.facebook.presto.orc.cache.StorageOrcFileTailSource; import com.facebook.presto.raptor.RaptorOrcAggregatedMemoryContext; diff --git a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestOrcFileRewriter.java b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestOrcFileRewriter.java index ef78250bb0c0..4f0ddf177cb1 100644 --- a/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestOrcFileRewriter.java +++ b/presto-raptor/src/test/java/com/facebook/presto/raptor/storage/TestOrcFileRewriter.java @@ -16,6 +16,7 @@ import com.facebook.airlift.json.JsonCodec; import com.facebook.presto.common.Page; import com.facebook.presto.common.block.Block; +import com.facebook.presto.common.io.OutputStreamDataSink; import com.facebook.presto.common.predicate.TupleDomain; import com.facebook.presto.common.type.ArrayType; import com.facebook.presto.common.type.DecimalType; @@ -28,7 +29,6 @@ import com.facebook.presto.orc.OrcDataSource; import com.facebook.presto.orc.OrcReader; import com.facebook.presto.orc.OrcWriterStats; -import com.facebook.presto.orc.OutputStreamDataSink; import com.facebook.presto.orc.StorageStripeMetadataSource; import com.facebook.presto.orc.cache.StorageOrcFileTailSource; import com.facebook.presto.raptor.RaptorOrcAggregatedMemoryContext;