Move DataSink/DataOutput to presto-common

presto-orc/src/main/java/com/facebook/presto/orc/stream/DataOutput.java → 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;

presto-orc/src/main/java/com/facebook/presto/orc/DataSink.java → 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;

presto-orc/src/main/java/com/facebook/presto/orc/OutputStreamDataSink.java → 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;
 

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;

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;

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;

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;

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;

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;
 

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;

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;

presto-hive/src/main/java/com/facebook/presto/hive/pagefile/PageFileWriterFactory.java

@@ -14,14 +14,14 @@
 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;
 import com.facebook.presto.hive.HiveFileWriter;
 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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;