diff --git a/pom.xml b/pom.xml index 4bd8e9c7ba858..a4684a1c8cb58 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,7 @@ presto-spi presto-kafka presto-cassandra + presto-orc presto-hive presto-hive-hadoop1 presto-hive-hadoop2 @@ -90,6 +91,12 @@ ${project.version} + + com.facebook.presto + presto-orc + ${project.version} + + com.facebook.presto presto-hive @@ -419,6 +426,12 @@ 0.1 + + org.iq80.snappy + snappy + 0.3 + + org.openjdk.jol jol-core diff --git a/presto-hive/pom.xml b/presto-hive/pom.xml index 5cb41d2d02493..131cd8d71ea1f 100644 --- a/presto-hive/pom.xml +++ b/presto-hive/pom.xml @@ -28,8 +28,8 @@ - com.google.protobuf - protobuf-java + com.facebook.presto + presto-orc @@ -269,7 +269,6 @@ **/TestHiveDistributedQueries.java - **/TestFullOrcReader.java diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/DwrfPageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/DwrfPageSourceFactory.java index 6d7c7c21ec134..e48e7f00b4910 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/DwrfPageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/DwrfPageSourceFactory.java @@ -14,7 +14,7 @@ package com.facebook.presto.hive; import com.facebook.hive.orc.OrcSerde; -import com.facebook.presto.hive.orc.metadata.DwrfMetadataReader; +import com.facebook.presto.orc.metadata.DwrfMetadataReader; import com.facebook.presto.spi.ConnectorPageSource; import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.TupleDomain; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/HdfsOrcDataSource.java b/presto-hive/src/main/java/com/facebook/presto/hive/HdfsOrcDataSource.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/HdfsOrcDataSource.java rename to presto-hive/src/main/java/com/facebook/presto/hive/HdfsOrcDataSource.java index 26364f39d6d8f..0fea448a936b1 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/HdfsOrcDataSource.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/HdfsOrcDataSource.java @@ -11,8 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.hive; +import com.facebook.presto.orc.DiskRange; +import com.facebook.presto.orc.OrcDataSource; import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Ints; import io.airlift.slice.Slice; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/OrcPageSource.java b/presto-hive/src/main/java/com/facebook/presto/hive/OrcPageSource.java index d6a911aed0227..6ac83731cf6ae 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/OrcPageSource.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/OrcPageSource.java @@ -13,12 +13,11 @@ */ package com.facebook.presto.hive; -import com.facebook.presto.hive.orc.BooleanVector; -import com.facebook.presto.hive.orc.DoubleVector; -import com.facebook.presto.hive.orc.HdfsOrcDataSource; -import com.facebook.presto.hive.orc.LongVector; -import com.facebook.presto.hive.orc.OrcRecordReader; -import com.facebook.presto.hive.orc.SliceVector; +import com.facebook.presto.orc.BooleanVector; +import com.facebook.presto.orc.DoubleVector; +import com.facebook.presto.orc.LongVector; +import com.facebook.presto.orc.OrcRecordReader; +import com.facebook.presto.orc.SliceVector; import com.facebook.presto.spi.ConnectorPageSource; import com.facebook.presto.spi.Page; import com.facebook.presto.spi.PrestoException; @@ -51,7 +50,7 @@ import static com.facebook.presto.hive.HiveUtil.parseHiveTimestamp; import static com.facebook.presto.hive.NumberParser.parseDouble; import static com.facebook.presto.hive.NumberParser.parseLong; -import static com.facebook.presto.hive.orc.Vector.MAX_VECTOR_LENGTH; +import static com.facebook.presto.orc.Vector.MAX_VECTOR_LENGTH; import static com.facebook.presto.spi.type.BigintType.BIGINT; import static com.facebook.presto.spi.type.BooleanType.BOOLEAN; import static com.facebook.presto.spi.type.DateType.DATE; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/OrcPageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/OrcPageSourceFactory.java index 348893d4703db..94f5648083937 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/OrcPageSourceFactory.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/OrcPageSourceFactory.java @@ -13,13 +13,12 @@ */ package com.facebook.presto.hive; -import com.facebook.presto.hive.orc.HdfsOrcDataSource; -import com.facebook.presto.hive.orc.OrcPredicate; -import com.facebook.presto.hive.orc.OrcReader; -import com.facebook.presto.hive.orc.OrcRecordReader; +import com.facebook.presto.orc.OrcPredicate; +import com.facebook.presto.orc.OrcReader; +import com.facebook.presto.orc.OrcRecordReader; import com.facebook.presto.hive.TupleDomainOrcPredicate.ColumnReference; -import com.facebook.presto.hive.orc.metadata.MetadataReader; -import com.facebook.presto.hive.orc.metadata.OrcMetadataReader; +import com.facebook.presto.orc.metadata.MetadataReader; +import com.facebook.presto.orc.metadata.OrcMetadataReader; import com.facebook.presto.spi.ConnectorPageSource; import com.facebook.presto.spi.ConnectorSession; import com.facebook.presto.spi.TupleDomain; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/TupleDomainOrcPredicate.java b/presto-hive/src/main/java/com/facebook/presto/hive/TupleDomainOrcPredicate.java index a4aefb621447d..084dd8a24e42d 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/TupleDomainOrcPredicate.java +++ b/presto-hive/src/main/java/com/facebook/presto/hive/TupleDomainOrcPredicate.java @@ -13,10 +13,10 @@ */ package com.facebook.presto.hive; -import com.facebook.presto.hive.orc.OrcPredicate; -import com.facebook.presto.hive.orc.metadata.BucketStatistics; -import com.facebook.presto.hive.orc.metadata.ColumnStatistics; -import com.facebook.presto.hive.orc.metadata.RangeStatistics; +import com.facebook.presto.orc.OrcPredicate; +import com.facebook.presto.orc.metadata.BucketStatistics; +import com.facebook.presto.orc.metadata.ColumnStatistics; +import com.facebook.presto.orc.metadata.RangeStatistics; import com.facebook.presto.spi.Domain; import com.facebook.presto.spi.Range; import com.facebook.presto.spi.SortedRangeSet; diff --git a/presto-orc/pom.xml b/presto-orc/pom.xml new file mode 100644 index 0000000000000..e8aec61565df0 --- /dev/null +++ b/presto-orc/pom.xml @@ -0,0 +1,161 @@ + + + 4.0.0 + + + com.facebook.presto + presto-root + 0.80-SNAPSHOT + + + presto-orc + presto-orc + + + ${project.parent.basedir} + + + + + com.facebook.hive + hive-dwrf + + + + com.facebook.hive + hive-dwrf-shims + + + + com.google.protobuf + protobuf-java + + + + com.facebook.presto.hive + hive-apache + + + + com.fasterxml.jackson.core + jackson-core + + + + io.airlift + slice + + + + io.airlift + units + + + + io.airlift + log + + + + joda-time + joda-time + + + + com.google.guava + guava + + + + org.iq80.snappy + snappy + + + + com.google.code.findbugs + annotations + provided + + + + org.jetbrains + annotations + provided + + + + + org.testng + testng + test + + + + io.airlift + testing + test + + + + com.facebook.presto.hadoop + hadoop-cdh4 + test + + + + io.airlift + json + test + + + + it.unimi.dsi + fastutil + test + + + + org.slf4j + slf4j-jdk14 + test + + + + org.slf4j + jcl-over-slf4j + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + **/TestFullOrcReader.java + + + + + + + + + ci + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + + + + + diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/BooleanVector.java b/presto-orc/src/main/java/com/facebook/presto/orc/BooleanVector.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/BooleanVector.java rename to presto-orc/src/main/java/com/facebook/presto/orc/BooleanVector.java index 653e1d79653dd..3c6d3f48e3b7a 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/BooleanVector.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/BooleanVector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import com.google.common.annotations.VisibleForTesting; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DiskRange.java b/presto-orc/src/main/java/com/facebook/presto/orc/DiskRange.java similarity index 98% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/DiskRange.java rename to presto-orc/src/main/java/com/facebook/presto/orc/DiskRange.java index 80b5fefc51f87..e8c5557329ad8 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DiskRange.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/DiskRange.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import com.google.common.primitives.Ints; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DoubleVector.java b/presto-orc/src/main/java/com/facebook/presto/orc/DoubleVector.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/DoubleVector.java rename to presto-orc/src/main/java/com/facebook/presto/orc/DoubleVector.java index 2868be7138456..d5bdeaaa31000 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DoubleVector.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/DoubleVector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import com.google.common.annotations.VisibleForTesting; diff --git a/presto-orc/src/main/java/com/facebook/presto/orc/FileOrcDataSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/FileOrcDataSource.java new file mode 100644 index 0000000000000..338f862f16a9b --- /dev/null +++ b/presto-orc/src/main/java/com/facebook/presto/orc/FileOrcDataSource.java @@ -0,0 +1,120 @@ +/* + * 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.orc; + +import com.google.common.collect.ImmutableMap; +import com.google.common.primitives.Ints; +import io.airlift.slice.Slice; +import io.airlift.slice.Slices; + +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.util.Map; +import java.util.Map.Entry; + +import static com.google.common.base.Preconditions.checkNotNull; + +public class FileOrcDataSource + implements OrcDataSource +{ + private final File path; + private final long size; + private final RandomAccessFile input; + private long readTimeNanos; + + public FileOrcDataSource(File path) + throws IOException + { + this.path = checkNotNull(path, "path is null"); + this.size = path.length(); + this.input = new RandomAccessFile(path, "r"); + } + + @Override + public void close() + throws IOException + { + input.close(); + } + + public long getReadTimeNanos() + { + return readTimeNanos; + } + + @Override + public long getSize() + { + return size; + } + + @Override + public void readFully(long position, byte[] buffer) + throws IOException + { + readFully(position, buffer, 0, buffer.length); + } + + @Override + public void readFully(long position, byte[] buffer, int bufferOffset, int bufferLength) + throws IOException + { + long start = System.nanoTime(); + + input.seek(position); + input.readFully(buffer, bufferOffset, bufferLength); + + readTimeNanos += System.nanoTime() - start; + } + + @Override + public Map readFully(Map diskRanges) + throws IOException + { + checkNotNull(diskRanges, "diskRanges is null"); + + if (diskRanges.isEmpty()) { + return ImmutableMap.of(); + } + + // TODO: benchmark alternatively strategies: + // 1) sort ranges and perform one read per range + // 2) single read with transferTo() using custom WritableByteChannel + + // merge ranges + DiskRange fullRange = diskRanges.values().iterator().next(); + for (DiskRange diskRange : diskRanges.values()) { + fullRange = fullRange.span(diskRange); + } + + // read full range in one request + byte[] buffer = new byte[fullRange.getLength()]; + readFully(fullRange.getOffset(), buffer); + + ImmutableMap.Builder slices = ImmutableMap.builder(); + for (Entry entry : diskRanges.entrySet()) { + DiskRange diskRange = entry.getValue(); + int offset = Ints.checkedCast(diskRange.getOffset() - fullRange.getOffset()); + slices.put(entry.getKey(), Slices.wrappedBuffer(buffer, offset, diskRange.getLength())); + } + return slices.build(); + } + + @Override + public String toString() + { + return path.getPath(); + } +} diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/LongVector.java b/presto-orc/src/main/java/com/facebook/presto/orc/LongVector.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/LongVector.java rename to presto-orc/src/main/java/com/facebook/presto/orc/LongVector.java index 63f8d4720692f..fb95aae36ac55 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/LongVector.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/LongVector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import com.google.common.annotations.VisibleForTesting; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/ObjectVector.java b/presto-orc/src/main/java/com/facebook/presto/orc/ObjectVector.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/ObjectVector.java rename to presto-orc/src/main/java/com/facebook/presto/orc/ObjectVector.java index 90c4ca884bc98..7ddbc2e25cd7c 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/ObjectVector.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/ObjectVector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import com.google.common.annotations.VisibleForTesting; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcCorruptionException.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcCorruptionException.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcCorruptionException.java rename to presto-orc/src/main/java/com/facebook/presto/orc/OrcCorruptionException.java index eeeec192d6102..91cdbad0d826f 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcCorruptionException.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcCorruptionException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import org.jetbrains.annotations.Contract; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcDataSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcDataSource.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcDataSource.java rename to presto-orc/src/main/java/com/facebook/presto/orc/OrcDataSource.java index dd2ad5bff7aaa..097db5009c5a2 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcDataSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcDataSource.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import io.airlift.slice.Slice; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcPredicate.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcPredicate.java similarity index 91% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcPredicate.java rename to presto-orc/src/main/java/com/facebook/presto/orc/OrcPredicate.java index 7f113d7843de1..11ba8bb27b922 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcPredicate.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcPredicate.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; -import com.facebook.presto.hive.orc.metadata.ColumnStatistics; +import com.facebook.presto.orc.metadata.ColumnStatistics; import java.util.Map; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcReader.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/OrcReader.java index 82f7ae258e9b4..27021c5d512a3 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcReader.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; - -import com.facebook.presto.hive.orc.metadata.CompressionKind; -import com.facebook.presto.hive.orc.metadata.Footer; -import com.facebook.presto.hive.orc.metadata.Metadata; -import com.facebook.presto.hive.orc.metadata.MetadataReader; -import com.facebook.presto.hive.orc.metadata.OrcType; -import com.facebook.presto.hive.orc.metadata.PostScript; -import com.facebook.presto.hive.orc.stream.OrcInputStream; +package com.facebook.presto.orc; + +import com.facebook.presto.orc.metadata.CompressionKind; +import com.facebook.presto.orc.metadata.Footer; +import com.facebook.presto.orc.metadata.Metadata; +import com.facebook.presto.orc.metadata.MetadataReader; +import com.facebook.presto.orc.metadata.OrcType; +import com.facebook.presto.orc.metadata.PostScript; +import com.facebook.presto.orc.stream.OrcInputStream; import com.google.common.base.Joiner; import com.google.common.primitives.Ints; import io.airlift.log.Logger; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcRecordReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/OrcRecordReader.java similarity index 94% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcRecordReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/OrcRecordReader.java index 7c840b4282b0a..b5e196475dfc7 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/OrcRecordReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/OrcRecordReader.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; - -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.metadata.ColumnStatistics; -import com.facebook.presto.hive.orc.metadata.CompressionKind; -import com.facebook.presto.hive.orc.metadata.MetadataReader; -import com.facebook.presto.hive.orc.metadata.OrcType; -import com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind; -import com.facebook.presto.hive.orc.metadata.StripeInformation; -import com.facebook.presto.hive.orc.metadata.StripeStatistics; -import com.facebook.presto.hive.orc.reader.StreamReader; -import com.facebook.presto.hive.orc.reader.StreamReaders; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc; + +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.metadata.ColumnStatistics; +import com.facebook.presto.orc.metadata.CompressionKind; +import com.facebook.presto.orc.metadata.MetadataReader; +import com.facebook.presto.orc.metadata.OrcType; +import com.facebook.presto.orc.metadata.OrcType.OrcTypeKind; +import com.facebook.presto.orc.metadata.StripeInformation; +import com.facebook.presto.orc.metadata.StripeStatistics; +import com.facebook.presto.orc.reader.StreamReader; +import com.facebook.presto.orc.reader.StreamReaders; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/RowGroup.java b/presto-orc/src/main/java/com/facebook/presto/orc/RowGroup.java similarity index 94% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/RowGroup.java rename to presto-orc/src/main/java/com/facebook/presto/orc/RowGroup.java index a4d7955c640a9..48864fddfcec5 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/RowGroup.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/RowGroup.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/RowGroupLayout.java b/presto-orc/src/main/java/com/facebook/presto/orc/RowGroupLayout.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/RowGroupLayout.java rename to presto-orc/src/main/java/com/facebook/presto/orc/RowGroupLayout.java index 260bdf1481938..29e0cf81235be 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/RowGroupLayout.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/RowGroupLayout.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; -import com.facebook.presto.hive.orc.stream.OrcInputStream; -import com.facebook.presto.hive.orc.stream.StreamSource; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.stream.OrcInputStream; +import com.facebook.presto.orc.stream.StreamSource; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Function; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/SliceVector.java b/presto-orc/src/main/java/com/facebook/presto/orc/SliceVector.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/SliceVector.java rename to presto-orc/src/main/java/com/facebook/presto/orc/SliceVector.java index a9bf79a060309..958d735af0bd2 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/SliceVector.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/SliceVector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import com.google.common.annotations.VisibleForTesting; import io.airlift.slice.Slice; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/StreamDescriptor.java b/presto-orc/src/main/java/com/facebook/presto/orc/StreamDescriptor.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/StreamDescriptor.java rename to presto-orc/src/main/java/com/facebook/presto/orc/StreamDescriptor.java index 61bcd2bf25e43..fa9683080972b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/StreamDescriptor.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/StreamDescriptor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; -import com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind; +import com.facebook.presto.orc.metadata.OrcType.OrcTypeKind; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/StreamId.java b/presto-orc/src/main/java/com/facebook/presto/orc/StreamId.java similarity index 92% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/StreamId.java rename to presto-orc/src/main/java/com/facebook/presto/orc/StreamId.java index 9747c74be5529..ccce9e7435418 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/StreamId.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/StreamId.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; -import com.facebook.presto.hive.orc.metadata.Stream; -import com.facebook.presto.hive.orc.metadata.Stream.StreamKind; +import com.facebook.presto.orc.metadata.Stream; +import com.facebook.presto.orc.metadata.Stream.StreamKind; import java.util.Objects; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/StreamLayout.java b/presto-orc/src/main/java/com/facebook/presto/orc/StreamLayout.java similarity index 90% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/StreamLayout.java rename to presto-orc/src/main/java/com/facebook/presto/orc/StreamLayout.java index cf38da98436d6..1af5a69443edf 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/StreamLayout.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/StreamLayout.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; - -import com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind; -import com.facebook.presto.hive.orc.metadata.CompressionKind; -import com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind; -import com.facebook.presto.hive.orc.reader.StreamSources; -import com.facebook.presto.hive.orc.stream.OrcInputStream; -import com.facebook.presto.hive.orc.stream.StreamSource; +package com.facebook.presto.orc; + +import com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind; +import com.facebook.presto.orc.metadata.CompressionKind; +import com.facebook.presto.orc.metadata.OrcType.OrcTypeKind; +import com.facebook.presto.orc.reader.StreamSources; +import com.facebook.presto.orc.stream.OrcInputStream; +import com.facebook.presto.orc.stream.StreamSource; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/Stripe.java b/presto-orc/src/main/java/com/facebook/presto/orc/Stripe.java similarity index 93% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/Stripe.java rename to presto-orc/src/main/java/com/facebook/presto/orc/Stripe.java index 564c6986c02fe..b3b83eaf1132b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/Stripe.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/Stripe.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/StripeReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/StripeReader.java similarity index 90% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/StripeReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/StripeReader.java index 51def9b062b22..dd3d60769e74f 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/StripeReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/StripeReader.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; - -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind; -import com.facebook.presto.hive.orc.metadata.ColumnStatistics; -import com.facebook.presto.hive.orc.metadata.CompressionKind; -import com.facebook.presto.hive.orc.metadata.DwrfMetadataReader; -import com.facebook.presto.hive.orc.metadata.MetadataReader; -import com.facebook.presto.hive.orc.metadata.OrcType; -import com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind; -import com.facebook.presto.hive.orc.metadata.RowGroupIndex; -import com.facebook.presto.hive.orc.metadata.Stream; -import com.facebook.presto.hive.orc.metadata.Stream.StreamKind; -import com.facebook.presto.hive.orc.metadata.StripeFooter; -import com.facebook.presto.hive.orc.metadata.StripeInformation; -import com.facebook.presto.hive.orc.stream.OrcInputStream; -import com.facebook.presto.hive.orc.stream.StreamSource; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc; + +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind; +import com.facebook.presto.orc.metadata.ColumnStatistics; +import com.facebook.presto.orc.metadata.CompressionKind; +import com.facebook.presto.orc.metadata.DwrfMetadataReader; +import com.facebook.presto.orc.metadata.MetadataReader; +import com.facebook.presto.orc.metadata.OrcType; +import com.facebook.presto.orc.metadata.OrcType.OrcTypeKind; +import com.facebook.presto.orc.metadata.RowGroupIndex; +import com.facebook.presto.orc.metadata.Stream; +import com.facebook.presto.orc.metadata.Stream.StreamKind; +import com.facebook.presto.orc.metadata.StripeFooter; +import com.facebook.presto.orc.metadata.StripeInformation; +import com.facebook.presto.orc.stream.OrcInputStream; +import com.facebook.presto.orc.stream.StreamSource; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; @@ -53,24 +53,24 @@ import java.util.Map.Entry; import java.util.Set; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT_V2; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DWRF_DIRECT; -import static com.facebook.presto.hive.orc.metadata.CompressionKind.UNCOMPRESSED; -import static com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind.TIMESTAMP; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DICTIONARY_COUNT; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.IN_DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.LENGTH; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY_LENGTH; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.ROW_INDEX; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.SECONDARY; -import static com.facebook.presto.hive.orc.stream.OrcInputStream.BLOCK_HEADER_SIZE; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT_V2; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DWRF_DIRECT; +import static com.facebook.presto.orc.metadata.CompressionKind.UNCOMPRESSED; +import static com.facebook.presto.orc.metadata.OrcType.OrcTypeKind.TIMESTAMP; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DICTIONARY_COUNT; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.IN_DICTIONARY; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.LENGTH; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY_LENGTH; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.ROW_INDEX; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.SECONDARY; +import static com.facebook.presto.orc.stream.OrcInputStream.BLOCK_HEADER_SIZE; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/Vector.java b/presto-orc/src/main/java/com/facebook/presto/orc/Vector.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/Vector.java rename to presto-orc/src/main/java/com/facebook/presto/orc/Vector.java index 28c29ceac08a4..788fa48f28782 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/Vector.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/Vector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import com.google.common.annotations.VisibleForTesting; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/BooleanJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/BooleanJsonReader.java similarity index 85% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/BooleanJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/BooleanJsonReader.java index a0b11df245d4a..fb4237aae9d27 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/BooleanJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/BooleanJsonReader.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; @@ -25,9 +25,9 @@ import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; import static com.google.common.base.Preconditions.checkNotNull; public class BooleanJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/ByteJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/ByteJsonReader.java similarity index 84% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/ByteJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/ByteJsonReader.java index e5c38c6c62074..e227c4491447c 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/ByteJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/ByteJsonReader.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.ByteStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.ByteStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; @@ -26,9 +26,9 @@ import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; import static com.google.common.base.Preconditions.checkNotNull; public class ByteJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/DateJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/DateJsonReader.java similarity index 87% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/DateJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/DateJsonReader.java index c278db612ca04..c76ac24ad6e88 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/DateJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/DateJsonReader.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; import org.joda.time.format.DateTimeFormatter; @@ -29,9 +29,9 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; import static com.google.common.base.Preconditions.checkNotNull; public class DateJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/DoubleJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/DoubleJsonReader.java similarity index 84% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/DoubleJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/DoubleJsonReader.java index c1d3a47ad9d6e..0d66253653666 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/DoubleJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/DoubleJsonReader.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.DoubleStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.DoubleStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; @@ -26,9 +26,9 @@ import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; import static com.google.common.base.Preconditions.checkNotNull; public class DoubleJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/FloatJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/FloatJsonReader.java similarity index 85% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/FloatJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/FloatJsonReader.java index 7cba9fecd9625..218aaec7db61e 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/FloatJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/FloatJsonReader.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.FloatStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.FloatStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; @@ -26,9 +26,9 @@ import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; import static com.google.common.base.Preconditions.checkNotNull; public class FloatJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/JsonMapKeyReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/JsonMapKeyReader.java similarity index 94% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/JsonMapKeyReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/JsonMapKeyReader.java index 7f2d9efc4dcf0..d2a3ee5776413 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/JsonMapKeyReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/JsonMapKeyReader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; import java.io.IOException; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/JsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/JsonReader.java similarity index 86% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/JsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/JsonReader.java index 0ecd9a929759c..1f6c39287d1de 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/JsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/JsonReader.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/JsonReaders.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/JsonReaders.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/JsonReaders.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/JsonReaders.java index eb4d64c1151c9..466d5fde2a9d8 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/JsonReaders.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/JsonReaders.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; +import com.facebook.presto.orc.StreamDescriptor; import org.joda.time.DateTimeZone; public final class JsonReaders diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/ListJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/ListJsonReader.java similarity index 84% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/ListJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/ListJsonReader.java index 9bddc44d167d7..e6aa92f4eae9c 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/ListJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/ListJsonReader.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; import com.google.common.primitives.Ints; @@ -28,10 +28,10 @@ import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.json.JsonReaders.createJsonReader; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.LENGTH; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.json.JsonReaders.createJsonReader; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.LENGTH; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; import static com.google.common.base.Preconditions.checkNotNull; public class ListJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/LongDictionaryJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/LongDictionaryJsonReader.java similarity index 85% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/LongDictionaryJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/LongDictionaryJsonReader.java index 45c3a00e91949..80492682022c1 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/LongDictionaryJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/LongDictionaryJsonReader.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; @@ -27,11 +27,11 @@ import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.IN_DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.IN_DICTIONARY; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; import static com.google.common.base.Preconditions.checkNotNull; public class LongDictionaryJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/LongDirectJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/LongDirectJsonReader.java similarity index 84% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/LongDirectJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/LongDirectJsonReader.java index e0b1ac659cc79..398b44ec555ef 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/LongDirectJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/LongDirectJsonReader.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; @@ -26,9 +26,9 @@ import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; import static com.google.common.base.Preconditions.checkNotNull; public class LongDirectJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/LongJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/LongJsonReader.java similarity index 78% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/LongJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/LongJsonReader.java index 7aca30079c38e..3fc520e3faf60 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/LongJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/LongJsonReader.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT_V2; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DWRF_DIRECT; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT_V2; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DWRF_DIRECT; import static com.google.common.base.Preconditions.checkNotNull; public class LongJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/MapJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/MapJsonReader.java similarity index 84% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/MapJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/MapJsonReader.java index 7c0dbde4ee18d..f48d0f6d829b1 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/MapJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/MapJsonReader.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; import com.google.common.primitives.Ints; @@ -28,11 +28,11 @@ import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.json.JsonReaders.createJsonMapKeyReader; -import static com.facebook.presto.hive.orc.json.JsonReaders.createJsonReader; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.LENGTH; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.json.JsonReaders.createJsonMapKeyReader; +import static com.facebook.presto.orc.json.JsonReaders.createJsonReader; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.LENGTH; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; import static com.google.common.base.Preconditions.checkNotNull; public class MapJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/SliceDictionaryJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/SliceDictionaryJsonReader.java similarity index 88% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/SliceDictionaryJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/SliceDictionaryJsonReader.java index 65d7ec3d339a4..ae9425c4a1588 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/SliceDictionaryJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/SliceDictionaryJsonReader.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; - -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.ByteArrayStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.RowGroupDictionaryLengthStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc.json; + +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.ByteArrayStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.RowGroupDictionaryLengthStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; import com.google.common.io.BaseEncoding; @@ -31,14 +31,14 @@ import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.IN_DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.LENGTH; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY_LENGTH; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.IN_DICTIONARY; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.LENGTH; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY_LENGTH; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/SliceDirectJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/SliceDirectJsonReader.java similarity index 86% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/SliceDirectJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/SliceDirectJsonReader.java index 890bc8b813623..89ff992fba8bf 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/SliceDirectJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/SliceDirectJsonReader.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; - -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.ByteArrayStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc.json; + +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.ByteArrayStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; import com.google.common.io.BaseEncoding; @@ -30,10 +30,10 @@ import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.LENGTH; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.LENGTH; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; import static com.google.common.base.Preconditions.checkNotNull; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/SliceJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/SliceJsonReader.java similarity index 81% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/SliceJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/SliceJsonReader.java index 8ac1b508b0c9c..9735ca00d79ba 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/SliceJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/SliceJsonReader.java @@ -11,22 +11,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT_V2; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT_V2; import static com.google.common.base.Preconditions.checkNotNull; public class SliceJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/StructJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/StructJsonReader.java similarity index 91% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/StructJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/StructJsonReader.java index c93e41e041b84..bccad5216761a 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/StructJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/StructJsonReader.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; @@ -28,8 +28,8 @@ import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.json.JsonReaders.createJsonReader; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.json.JsonReaders.createJsonReader; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; import static com.google.common.base.Preconditions.checkNotNull; public class StructJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/TimestampJsonReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/json/TimestampJsonReader.java similarity index 87% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/json/TimestampJsonReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/json/TimestampJsonReader.java index 9695f81f7b63e..04bf06b03118f 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/json/TimestampJsonReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/json/TimestampJsonReader.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.json; +package com.facebook.presto.orc.json; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; import org.joda.time.DateTime; @@ -30,11 +30,11 @@ import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.SECONDARY; -import static com.facebook.presto.hive.orc.reader.TimestampStreamReader.decodeTimestamp; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.SECONDARY; +import static com.facebook.presto.orc.reader.TimestampStreamReader.decodeTimestamp; import static com.google.common.base.Preconditions.checkNotNull; public class TimestampJsonReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/BucketStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/BucketStatistics.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/BucketStatistics.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/BucketStatistics.java index 2c375b1fd3b06..c4b0e7b5beaf0 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/BucketStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/BucketStatistics.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import com.google.common.collect.ImmutableList; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/ColumnEncoding.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/ColumnEncoding.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/ColumnEncoding.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/ColumnEncoding.java index 8e28f1a7c18a0..048b279a9dedd 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/ColumnEncoding.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/ColumnEncoding.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import com.google.common.base.Objects; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/ColumnStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/ColumnStatistics.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/ColumnStatistics.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/ColumnStatistics.java index c87b44061e768..ed7b952f518ea 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/ColumnStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/ColumnStatistics.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; public class ColumnStatistics { diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/CompressionKind.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/CompressionKind.java similarity index 93% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/CompressionKind.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/CompressionKind.java index 7072500373be4..96bf11a126bf2 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/CompressionKind.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/CompressionKind.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; public enum CompressionKind { diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/DateStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/DateStatistics.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/DateStatistics.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/DateStatistics.java index 7b474a5b738a0..8cf7f0ab1d198 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/DateStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/DateStatistics.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; public class DateStatistics implements RangeStatistics diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/DoubleStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/DoubleStatistics.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/DoubleStatistics.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/DoubleStatistics.java index 9f3012cafaaca..849a436d3d800 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/DoubleStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/DoubleStatistics.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; public class DoubleStatistics implements RangeStatistics diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/DwrfMetadataReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/DwrfMetadataReader.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/DwrfMetadataReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/DwrfMetadataReader.java index f83256166c203..ca00a955e5044 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/DwrfMetadataReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/DwrfMetadataReader.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import com.facebook.hive.orc.OrcProto; import com.facebook.hive.orc.OrcProto.ColumnEncoding.Kind; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind; -import com.facebook.presto.hive.orc.metadata.Stream.StreamKind; -import com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind; +import com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind; +import com.facebook.presto.orc.metadata.Stream.StreamKind; +import com.facebook.presto.orc.metadata.OrcType.OrcTypeKind; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -28,9 +28,9 @@ import java.io.InputStream; import java.util.List; -import static com.facebook.presto.hive.orc.metadata.CompressionKind.SNAPPY; -import static com.facebook.presto.hive.orc.metadata.CompressionKind.UNCOMPRESSED; -import static com.facebook.presto.hive.orc.metadata.CompressionKind.ZLIB; +import static com.facebook.presto.orc.metadata.CompressionKind.SNAPPY; +import static com.facebook.presto.orc.metadata.CompressionKind.UNCOMPRESSED; +import static com.facebook.presto.orc.metadata.CompressionKind.ZLIB; import static com.google.common.base.Preconditions.checkArgument; public class DwrfMetadataReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/Footer.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/Footer.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/Footer.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/Footer.java index af1c54db6fea8..103c5f9af6431 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/Footer.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/Footer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/IntegerStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/IntegerStatistics.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/IntegerStatistics.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/IntegerStatistics.java index 8a8909c463837..e68f70ddafc13 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/IntegerStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/IntegerStatistics.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; public class IntegerStatistics implements RangeStatistics diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/Metadata.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/Metadata.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/Metadata.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/Metadata.java index 2805be2731c32..1fb5918403148 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/Metadata.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/Metadata.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/MetadataReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/MetadataReader.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/MetadataReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/MetadataReader.java index 0905423b83e46..c397e93ce4138 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/MetadataReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/MetadataReader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import java.io.IOException; import java.io.InputStream; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/OrcMetadataReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/OrcMetadataReader.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/OrcMetadataReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/OrcMetadataReader.java index fe748aa57911c..419a42abac9b5 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/OrcMetadataReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/OrcMetadataReader.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind; -import com.facebook.presto.hive.orc.metadata.Stream.StreamKind; -import com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind; +import com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind; +import com.facebook.presto.orc.metadata.Stream.StreamKind; +import com.facebook.presto.orc.metadata.OrcType.OrcTypeKind; import com.facebook.presto.hive.shaded.com.google.protobuf.CodedInputStream; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; @@ -28,9 +28,9 @@ import java.io.InputStream; import java.util.List; -import static com.facebook.presto.hive.orc.metadata.CompressionKind.SNAPPY; -import static com.facebook.presto.hive.orc.metadata.CompressionKind.UNCOMPRESSED; -import static com.facebook.presto.hive.orc.metadata.CompressionKind.ZLIB; +import static com.facebook.presto.orc.metadata.CompressionKind.SNAPPY; +import static com.facebook.presto.orc.metadata.CompressionKind.UNCOMPRESSED; +import static com.facebook.presto.orc.metadata.CompressionKind.ZLIB; public class OrcMetadataReader implements MetadataReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/OrcType.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/OrcType.java similarity index 98% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/OrcType.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/OrcType.java index 4cd39a00a08b4..3c9103bb21ac3 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/OrcType.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/OrcType.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/PostScript.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/PostScript.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/PostScript.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/PostScript.java index 4a502acd5af62..1bb1d4958d5b3 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/PostScript.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/PostScript.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/RangeStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/RangeStatistics.java similarity index 93% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/RangeStatistics.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/RangeStatistics.java index a4aa6f8c59cbf..f1f3cfde45989 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/RangeStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/RangeStatistics.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; public interface RangeStatistics { diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/RowGroupIndex.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/RowGroupIndex.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/RowGroupIndex.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/RowGroupIndex.java index d3dd7568fa2bc..c49a961ceb685 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/RowGroupIndex.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/RowGroupIndex.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import com.google.common.collect.ImmutableList; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/Stream.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/Stream.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/Stream.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/Stream.java index 5090195a993a6..d63bee823bd8f 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/Stream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/Stream.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import com.google.common.base.Objects; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/StringStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/StringStatistics.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/StringStatistics.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/StringStatistics.java index c8f37b63a26d4..60ee597f4e1ad 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/StringStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/StringStatistics.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; public class StringStatistics implements RangeStatistics diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/StripeFooter.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/StripeFooter.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/StripeFooter.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/StripeFooter.java index 231661356fa23..a090682dac9a5 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/StripeFooter.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/StripeFooter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import com.google.common.collect.ImmutableList; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/StripeInformation.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/StripeInformation.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/StripeInformation.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/StripeInformation.java index 0fed53404ef26..f25a38e388057 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/StripeInformation.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/StripeInformation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import com.google.common.base.Objects; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/StripeStatistics.java b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/StripeStatistics.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/StripeStatistics.java rename to presto-orc/src/main/java/com/facebook/presto/orc/metadata/StripeStatistics.java index 981984f212b53..9e854e9e2cf5b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/metadata/StripeStatistics.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/metadata/StripeStatistics.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.metadata; +package com.facebook.presto.orc.metadata; import com.google.common.collect.ImmutableList; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/orc-file-format.md b/presto-orc/src/main/java/com/facebook/presto/orc/orc-file-format.md similarity index 100% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/orc-file-format.md rename to presto-orc/src/main/java/com/facebook/presto/orc/orc-file-format.md diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/BooleanStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanStreamReader.java similarity index 86% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/BooleanStreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanStreamReader.java index c39efe99a9c3c..582012beaa283 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/BooleanStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/BooleanStreamReader.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; - -import com.facebook.presto.hive.orc.BooleanVector; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.StreamSource; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc.reader; + +import com.facebook.presto.orc.BooleanVector; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.StreamSource; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import javax.annotation.Nonnull; @@ -28,10 +28,10 @@ import java.util.Arrays; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.stream.MissingStreamSource.missingStreamSource; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.stream.MissingStreamSource.missingStreamSource; import static com.google.common.base.Preconditions.checkNotNull; public class BooleanStreamReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/ByteStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteStreamReader.java similarity index 85% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/ByteStreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteStreamReader.java index b124b0b576e97..3adb73ade8139 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/ByteStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/ByteStreamReader.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; - -import com.facebook.presto.hive.orc.LongVector; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.ByteStream; -import com.facebook.presto.hive.orc.stream.StreamSource; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc.reader; + +import com.facebook.presto.orc.LongVector; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.ByteStream; +import com.facebook.presto.orc.stream.StreamSource; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import javax.annotation.Nonnull; @@ -29,10 +29,10 @@ import java.util.Arrays; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.stream.MissingStreamSource.missingStreamSource; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.stream.MissingStreamSource.missingStreamSource; import static com.google.common.base.Preconditions.checkNotNull; public class ByteStreamReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/DoubleStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleStreamReader.java similarity index 85% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/DoubleStreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleStreamReader.java index e0f7fdb2cd791..4e06eb56fd4b1 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/DoubleStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/DoubleStreamReader.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; - -import com.facebook.presto.hive.orc.DoubleVector; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.DoubleStream; -import com.facebook.presto.hive.orc.stream.StreamSource; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc.reader; + +import com.facebook.presto.orc.DoubleVector; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.DoubleStream; +import com.facebook.presto.orc.stream.StreamSource; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import javax.annotation.Nonnull; @@ -29,10 +29,10 @@ import java.util.Arrays; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.stream.MissingStreamSource.missingStreamSource; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.stream.MissingStreamSource.missingStreamSource; import static com.google.common.base.Preconditions.checkNotNull; public class DoubleStreamReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/FloatStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatStreamReader.java similarity index 85% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/FloatStreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatStreamReader.java index 2c7258cbfbec1..cd39f57d49e6d 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/FloatStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/FloatStreamReader.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; - -import com.facebook.presto.hive.orc.DoubleVector; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.FloatStream; -import com.facebook.presto.hive.orc.stream.StreamSource; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc.reader; + +import com.facebook.presto.orc.DoubleVector; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.FloatStream; +import com.facebook.presto.orc.stream.StreamSource; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import javax.annotation.Nonnull; @@ -29,10 +29,10 @@ import java.util.Arrays; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.stream.MissingStreamSource.missingStreamSource; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.stream.MissingStreamSource.missingStreamSource; import static com.google.common.base.Preconditions.checkNotNull; public class FloatStreamReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/JsonStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/JsonStreamReader.java similarity index 86% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/JsonStreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/JsonStreamReader.java index 71fb2c8cf8055..f31e189839da0 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/JsonStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/JsonStreamReader.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; - -import com.facebook.presto.hive.orc.SliceVector; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.Vector; -import com.facebook.presto.hive.orc.json.JsonReader; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.StreamSource; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc.reader; + +import com.facebook.presto.orc.SliceVector; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.Vector; +import com.facebook.presto.orc.json.JsonReader; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.StreamSource; +import com.facebook.presto.orc.stream.StreamSources; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Objects; @@ -34,10 +34,10 @@ import java.util.Arrays; import java.util.List; -import static com.facebook.presto.hive.orc.json.JsonReaders.createJsonReader; -import static com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind.STRUCT; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.stream.MissingStreamSource.missingStreamSource; +import static com.facebook.presto.orc.json.JsonReaders.createJsonReader; +import static com.facebook.presto.orc.metadata.OrcType.OrcTypeKind.STRUCT; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.stream.MissingStreamSource.missingStreamSource; import static com.google.common.base.Preconditions.checkNotNull; public class JsonStreamReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/LongDictionaryStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionaryStreamReader.java similarity index 87% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/LongDictionaryStreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionaryStreamReader.java index 5bf680a193ff9..9f0cecfbcf7c3 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/LongDictionaryStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDictionaryStreamReader.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; - -import com.facebook.presto.hive.orc.LongVector; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.Vector; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.StreamSource; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc.reader; + +import com.facebook.presto.orc.LongVector; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.Vector; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.StreamSource; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import javax.annotation.Nonnull; @@ -30,12 +30,12 @@ import java.util.Arrays; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.IN_DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.stream.MissingStreamSource.missingStreamSource; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.IN_DICTIONARY; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.stream.MissingStreamSource.missingStreamSource; import static com.google.common.base.Preconditions.checkNotNull; public class LongDictionaryStreamReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/LongDirectStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectStreamReader.java similarity index 85% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/LongDirectStreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectStreamReader.java index 186493722af91..ccdf4f3ca8389 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/LongDirectStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongDirectStreamReader.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; - -import com.facebook.presto.hive.orc.LongVector; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.StreamSource; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc.reader; + +import com.facebook.presto.orc.LongVector; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.StreamSource; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import javax.annotation.Nonnull; @@ -29,10 +29,10 @@ import java.util.Arrays; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.stream.MissingStreamSource.missingStreamSource; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.stream.MissingStreamSource.missingStreamSource; import static com.google.common.base.Preconditions.checkNotNull; public class LongDirectStreamReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/LongStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongStreamReader.java similarity index 78% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/LongStreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/LongStreamReader.java index bfb4f8847eef5..0d603687ac318 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/LongStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/LongStreamReader.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; +package com.facebook.presto.orc.reader; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT_V2; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DWRF_DIRECT; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT_V2; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DWRF_DIRECT; import static com.google.common.base.Preconditions.checkNotNull; public class LongStreamReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/SliceDictionaryStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionaryStreamReader.java similarity index 88% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/SliceDictionaryStreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionaryStreamReader.java index 568483e6d8ffb..8a5a0b848da87 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/SliceDictionaryStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDictionaryStreamReader.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; - -import com.facebook.presto.hive.orc.SliceVector; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.Vector; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.ByteArrayStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.RowGroupDictionaryLengthStream; -import com.facebook.presto.hive.orc.stream.StreamSource; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc.reader; + +import com.facebook.presto.orc.SliceVector; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.Vector; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.ByteArrayStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.RowGroupDictionaryLengthStream; +import com.facebook.presto.orc.stream.StreamSource; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import io.airlift.slice.Slice; import io.airlift.slice.Slices; @@ -34,15 +34,15 @@ import java.util.Arrays; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.IN_DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.LENGTH; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY_LENGTH; -import static com.facebook.presto.hive.orc.stream.MissingStreamSource.missingStreamSource; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.IN_DICTIONARY; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.LENGTH; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY_LENGTH; +import static com.facebook.presto.orc.stream.MissingStreamSource.missingStreamSource; import static com.google.common.base.Preconditions.checkNotNull; public class SliceDictionaryStreamReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/SliceDirectStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectStreamReader.java similarity index 86% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/SliceDirectStreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectStreamReader.java index af68a232e92e6..dd6bdd29f0b41 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/SliceDirectStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceDirectStreamReader.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; - -import com.facebook.presto.hive.orc.SliceVector; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.Vector; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.ByteArrayStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.StreamSource; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc.reader; + +import com.facebook.presto.orc.SliceVector; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.Vector; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.ByteArrayStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.StreamSource; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import io.airlift.slice.Slices; @@ -32,11 +32,11 @@ import java.util.Arrays; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.LENGTH; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.stream.MissingStreamSource.missingStreamSource; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.LENGTH; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.stream.MissingStreamSource.missingStreamSource; import static com.google.common.base.Preconditions.checkNotNull; public class SliceDirectStreamReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/SliceStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceStreamReader.java similarity index 77% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/SliceStreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceStreamReader.java index 8c52989a79041..1c426ab794a91 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/SliceStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/SliceStreamReader.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; +package com.facebook.presto.orc.reader; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import java.io.IOException; import java.util.List; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DWRF_DIRECT; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DWRF_DIRECT; import static com.google.common.base.Preconditions.checkNotNull; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT_V2; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT_V2; public class SliceStreamReader implements StreamReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/StreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StreamReader.java similarity index 85% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/StreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/StreamReader.java index 7a6c8b5144189..14bba49c0d40b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/StreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StreamReader.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; +package com.facebook.presto.orc.reader; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.StreamSources; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.StreamSources; import java.io.IOException; import java.util.List; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/StreamReaders.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StreamReaders.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/StreamReaders.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/StreamReaders.java index dc0803f08d086..a05d568f2fb0a 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/StreamReaders.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StreamReaders.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; +package com.facebook.presto.orc.reader; -import com.facebook.presto.hive.orc.StreamDescriptor; +import com.facebook.presto.orc.StreamDescriptor; import org.joda.time.DateTimeZone; public final class StreamReaders diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/StreamSources.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StreamSources.java similarity index 74% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/StreamSources.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/StreamSources.java index 3cb4f6234c79d..cd4ed994673a0 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/StreamSources.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/StreamSources.java @@ -11,41 +11,41 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; - -import com.facebook.presto.hive.orc.StreamId; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind; -import com.facebook.presto.hive.orc.metadata.CompressionKind; -import com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind; -import com.facebook.presto.hive.orc.stream.BooleanStreamSource; -import com.facebook.presto.hive.orc.stream.ByteArrayStreamSource; -import com.facebook.presto.hive.orc.stream.ByteStreamSource; -import com.facebook.presto.hive.orc.stream.DoubleStreamSource; -import com.facebook.presto.hive.orc.stream.FloatStreamSource; -import com.facebook.presto.hive.orc.stream.LongStreamSource; -import com.facebook.presto.hive.orc.stream.OrcByteSource; -import com.facebook.presto.hive.orc.stream.OrcInputStream; -import com.facebook.presto.hive.orc.stream.RowGroupDictionaryLengthStreamSource; -import com.facebook.presto.hive.orc.stream.StreamSource; +package com.facebook.presto.orc.reader; + +import com.facebook.presto.orc.StreamId; +import com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind; +import com.facebook.presto.orc.metadata.CompressionKind; +import com.facebook.presto.orc.metadata.OrcType.OrcTypeKind; +import com.facebook.presto.orc.stream.BooleanStreamSource; +import com.facebook.presto.orc.stream.ByteArrayStreamSource; +import com.facebook.presto.orc.stream.ByteStreamSource; +import com.facebook.presto.orc.stream.DoubleStreamSource; +import com.facebook.presto.orc.stream.FloatStreamSource; +import com.facebook.presto.orc.stream.LongStreamSource; +import com.facebook.presto.orc.stream.OrcByteSource; +import com.facebook.presto.orc.stream.OrcInputStream; +import com.facebook.presto.orc.stream.RowGroupDictionaryLengthStreamSource; +import com.facebook.presto.orc.stream.StreamSource; import com.google.common.collect.Iterables; import com.google.common.primitives.Ints; import java.util.List; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DWRF_DIRECT; -import static com.facebook.presto.hive.orc.metadata.CompressionKind.UNCOMPRESSED; -import static com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind.INT; -import static com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind.TIMESTAMP; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.IN_DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.LENGTH; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY_LENGTH; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.SECONDARY; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DWRF_DIRECT; +import static com.facebook.presto.orc.metadata.CompressionKind.UNCOMPRESSED; +import static com.facebook.presto.orc.metadata.OrcType.OrcTypeKind.INT; +import static com.facebook.presto.orc.metadata.OrcType.OrcTypeKind.TIMESTAMP; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DICTIONARY_DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.IN_DICTIONARY; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.LENGTH; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.ROW_GROUP_DICTIONARY_LENGTH; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.SECONDARY; public final class StreamSources { diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/TimestampStreamReader.java b/presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampStreamReader.java similarity index 89% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/TimestampStreamReader.java rename to presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampStreamReader.java index f326ecc99b560..c162f524cdb70 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/reader/TimestampStreamReader.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/reader/TimestampStreamReader.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.reader; - -import com.facebook.presto.hive.orc.LongVector; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.Vector; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding; -import com.facebook.presto.hive.orc.stream.BooleanStream; -import com.facebook.presto.hive.orc.stream.LongStream; -import com.facebook.presto.hive.orc.stream.StreamSource; -import com.facebook.presto.hive.orc.stream.StreamSources; +package com.facebook.presto.orc.reader; + +import com.facebook.presto.orc.LongVector; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.Vector; +import com.facebook.presto.orc.metadata.ColumnEncoding; +import com.facebook.presto.orc.stream.BooleanStream; +import com.facebook.presto.orc.stream.LongStream; +import com.facebook.presto.orc.stream.StreamSource; +import com.facebook.presto.orc.stream.StreamSources; import com.google.common.base.Objects; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -32,11 +32,11 @@ import java.util.Arrays; import java.util.List; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.DATA; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.PRESENT; -import static com.facebook.presto.hive.orc.metadata.Stream.StreamKind.SECONDARY; -import static com.facebook.presto.hive.orc.stream.MissingStreamSource.missingStreamSource; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.DATA; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.PRESENT; +import static com.facebook.presto.orc.metadata.Stream.StreamKind.SECONDARY; +import static com.facebook.presto.orc.stream.MissingStreamSource.missingStreamSource; import static com.google.common.base.Preconditions.checkNotNull; public class TimestampStreamReader diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/results.txt b/presto-orc/src/main/java/com/facebook/presto/orc/results.txt similarity index 100% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/results.txt rename to presto-orc/src/main/java/com/facebook/presto/orc/results.txt diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/BooleanStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/BooleanStream.java similarity index 99% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/BooleanStream.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/BooleanStream.java index b4cb21108d381..6f3e4598ebf24 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/BooleanStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/BooleanStream.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import java.io.IOException; import java.io.InputStream; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/BooleanStreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/BooleanStreamSource.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/BooleanStreamSource.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/BooleanStreamSource.java index 5a5615caa6df2..69aa35de17638 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/BooleanStreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/BooleanStreamSource.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import com.google.common.base.Objects; import com.google.common.io.ByteSource; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/ByteArrayStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteArrayStream.java similarity index 87% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/ByteArrayStream.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteArrayStream.java index 376ab1b1a7116..09cb1c524f886 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/ByteArrayStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteArrayStream.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import java.io.IOException; import java.io.InputStream; -import static com.facebook.presto.hive.orc.stream.OrcStreamUtils.readFully; -import static com.facebook.presto.hive.orc.stream.OrcStreamUtils.skipFully; +import static com.facebook.presto.orc.stream.OrcStreamUtils.readFully; +import static com.facebook.presto.orc.stream.OrcStreamUtils.skipFully; import static com.google.common.base.Preconditions.checkNotNull; public class ByteArrayStream diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/ByteArrayStreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteArrayStreamSource.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/ByteArrayStreamSource.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteArrayStreamSource.java index 148fac16109f6..1fa7fcf54bd1b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/ByteArrayStreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteArrayStreamSource.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import com.google.common.base.Objects; import com.google.common.io.ByteSource; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/ByteStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteStream.java similarity index 90% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/ByteStream.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteStream.java index e7630e70334bb..c8cf355e7deed 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/ByteStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteStream.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.stream.OrcStreamUtils.MIN_REPEAT_SIZE; -import static com.facebook.presto.hive.orc.stream.OrcStreamUtils.readFully; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.stream.OrcStreamUtils.MIN_REPEAT_SIZE; +import static com.facebook.presto.orc.stream.OrcStreamUtils.readFully; public class ByteStream { diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/ByteStreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteStreamSource.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/ByteStreamSource.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteStreamSource.java index f5ebc6300b702..ca13317e524cb 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/ByteStreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/ByteStreamSource.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import com.google.common.base.Objects; import com.google.common.io.ByteSource; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/DoubleStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/DoubleStream.java similarity index 91% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/DoubleStream.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/DoubleStream.java index 355b920e39983..735e5b84fa205 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/DoubleStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/DoubleStream.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; -import com.facebook.presto.hive.orc.Vector; +import com.facebook.presto.orc.Vector; import io.airlift.slice.Slice; import io.airlift.slice.Slices; import java.io.IOException; import java.io.InputStream; -import static com.facebook.presto.hive.orc.stream.OrcStreamUtils.readFully; -import static com.facebook.presto.hive.orc.stream.OrcStreamUtils.skipFully; +import static com.facebook.presto.orc.stream.OrcStreamUtils.readFully; +import static com.facebook.presto.orc.stream.OrcStreamUtils.skipFully; import static com.google.common.base.Preconditions.checkPositionIndex; import static io.airlift.slice.SizeOf.SIZE_OF_DOUBLE; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/DoubleStreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/DoubleStreamSource.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/DoubleStreamSource.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/DoubleStreamSource.java index b7c773593536e..69d767ab4a8d4 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/DoubleStreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/DoubleStreamSource.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import com.google.common.base.Objects; import com.google.common.io.ByteSource; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/FloatStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/FloatStream.java similarity index 91% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/FloatStream.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/FloatStream.java index e1efdc2aa5895..c51b4d57c9131 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/FloatStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/FloatStream.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; -import com.facebook.presto.hive.orc.Vector; +import com.facebook.presto.orc.Vector; import io.airlift.slice.Slice; import io.airlift.slice.Slices; import java.io.IOException; import java.io.InputStream; -import static com.facebook.presto.hive.orc.stream.OrcStreamUtils.readFully; -import static com.facebook.presto.hive.orc.stream.OrcStreamUtils.skipFully; +import static com.facebook.presto.orc.stream.OrcStreamUtils.readFully; +import static com.facebook.presto.orc.stream.OrcStreamUtils.skipFully; import static com.google.common.base.Preconditions.checkPositionIndex; import static io.airlift.slice.SizeOf.SIZE_OF_FLOAT; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/FloatStreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/FloatStreamSource.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/FloatStreamSource.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/FloatStreamSource.java index 43244f0c71d89..47880828ab4f3 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/FloatStreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/FloatStreamSource.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import com.google.common.base.Objects; import com.google.common.io.ByteSource; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongDecode.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongDecode.java similarity index 80% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongDecode.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/LongDecode.java index 4cdd4e371634b..0730a75586cd1 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongDecode.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongDecode.java @@ -11,26 +11,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; -import com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind; +import com.facebook.presto.orc.metadata.OrcType.OrcTypeKind; import java.io.IOException; import java.io.InputStream; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind.INT; -import static com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind.LONG; -import static com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind.SHORT; -import static com.facebook.presto.hive.orc.stream.LongDecode.FixedBitSizes.FIFTY_SIX; -import static com.facebook.presto.hive.orc.stream.LongDecode.FixedBitSizes.FORTY; -import static com.facebook.presto.hive.orc.stream.LongDecode.FixedBitSizes.FORTY_EIGHT; -import static com.facebook.presto.hive.orc.stream.LongDecode.FixedBitSizes.ONE; -import static com.facebook.presto.hive.orc.stream.LongDecode.FixedBitSizes.THIRTY; -import static com.facebook.presto.hive.orc.stream.LongDecode.FixedBitSizes.THIRTY_TWO; -import static com.facebook.presto.hive.orc.stream.LongDecode.FixedBitSizes.TWENTY_EIGHT; -import static com.facebook.presto.hive.orc.stream.LongDecode.FixedBitSizes.TWENTY_FOUR; -import static com.facebook.presto.hive.orc.stream.LongDecode.FixedBitSizes.TWENTY_SIX; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.OrcType.OrcTypeKind.INT; +import static com.facebook.presto.orc.metadata.OrcType.OrcTypeKind.LONG; +import static com.facebook.presto.orc.metadata.OrcType.OrcTypeKind.SHORT; +import static com.facebook.presto.orc.stream.LongDecode.FixedBitSizes.FIFTY_SIX; +import static com.facebook.presto.orc.stream.LongDecode.FixedBitSizes.FORTY; +import static com.facebook.presto.orc.stream.LongDecode.FixedBitSizes.FORTY_EIGHT; +import static com.facebook.presto.orc.stream.LongDecode.FixedBitSizes.ONE; +import static com.facebook.presto.orc.stream.LongDecode.FixedBitSizes.THIRTY; +import static com.facebook.presto.orc.stream.LongDecode.FixedBitSizes.THIRTY_TWO; +import static com.facebook.presto.orc.stream.LongDecode.FixedBitSizes.TWENTY_EIGHT; +import static com.facebook.presto.orc.stream.LongDecode.FixedBitSizes.TWENTY_FOUR; +import static com.facebook.presto.orc.stream.LongDecode.FixedBitSizes.TWENTY_SIX; // This is based on the Apache Hive ORC code public final class LongDecode diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStream.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStream.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStream.java index adb71b9c7153f..27d0c359745c2 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStream.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import java.io.IOException; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStreamDwrf.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStreamDwrf.java similarity index 92% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStreamDwrf.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStreamDwrf.java index 15b997c984a6b..695a57cf93a9d 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStreamDwrf.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStreamDwrf.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; -import com.facebook.presto.hive.orc.Vector; -import com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind; +import com.facebook.presto.orc.Vector; +import com.facebook.presto.orc.metadata.OrcType.OrcTypeKind; import com.google.common.primitives.Ints; import java.io.IOException; import java.io.InputStream; -import static com.facebook.presto.hive.orc.stream.LongDecode.readDwrfLong; +import static com.facebook.presto.orc.stream.LongDecode.readDwrfLong; import static com.google.common.base.Preconditions.checkPositionIndex; public class LongStreamDwrf diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStreamSource.java similarity index 80% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStreamSource.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStreamSource.java index f844a7f8963b5..0c6b011090c2c 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStreamSource.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind; -import com.facebook.presto.hive.orc.metadata.OrcType.OrcTypeKind; +import com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind; +import com.facebook.presto.orc.metadata.OrcType.OrcTypeKind; import com.google.common.base.Objects; import com.google.common.io.ByteSource; import java.io.IOException; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT_V2; -import static com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind.DWRF_DIRECT; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DICTIONARY_V2; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DIRECT_V2; +import static com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind.DWRF_DIRECT; public class LongStreamSource implements StreamSource diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStreamV1.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStreamV1.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStreamV1.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStreamV1.java index 8ae7331965dc6..1da60878e6e75 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStreamV1.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStreamV1.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import com.google.common.primitives.Ints; import java.io.IOException; import java.io.InputStream; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.stream.OrcStreamUtils.MIN_REPEAT_SIZE; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.stream.OrcStreamUtils.MIN_REPEAT_SIZE; public class LongStreamV1 implements LongStream diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStreamV2.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStreamV2.java similarity index 98% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStreamV2.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStreamV2.java index 21be5b12ae738..2f146a0e4af84 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/LongStreamV2.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/LongStreamV2.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import com.google.common.primitives.Ints; import java.io.IOException; import java.io.InputStream; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.stream.OrcStreamUtils.MIN_REPEAT_SIZE; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.stream.OrcStreamUtils.MIN_REPEAT_SIZE; /** * @see {@link org.apache.hadoop.hive.ql.io.orc.RunLengthIntegerWriterV2} for description of various lightweight compression techniques. diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/MissingStreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/MissingStreamSource.java similarity index 96% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/MissingStreamSource.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/MissingStreamSource.java index ab69378f3d27e..f7bcd94f081a3 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/MissingStreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/MissingStreamSource.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import javax.annotation.Nullable; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/OrcByteSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcByteSource.java similarity index 97% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/OrcByteSource.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcByteSource.java index ec374f0c50950..94c7b0b2e320b 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/OrcByteSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcByteSource.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import com.google.common.base.Objects; import com.google.common.io.ByteSource; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/OrcInputStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcInputStream.java similarity index 92% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/OrcInputStream.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcInputStream.java index 38350678d1336..1746b38e1780f 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/OrcInputStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcInputStream.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; -import com.facebook.presto.hive.orc.OrcCorruptionException; -import com.facebook.presto.hive.orc.metadata.CompressionKind; -import com.facebook.presto.hive.shaded.org.iq80.snappy.Snappy; +import com.facebook.presto.orc.OrcCorruptionException; +import com.facebook.presto.orc.metadata.CompressionKind; import io.airlift.slice.BasicSliceInput; import io.airlift.slice.Slice; import io.airlift.slice.Slices; +import org.iq80.snappy.Snappy; import java.io.IOException; import java.io.InputStream; import java.util.zip.DataFormatException; import java.util.zip.Inflater; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; -import static com.facebook.presto.hive.orc.metadata.CompressionKind.SNAPPY; -import static com.facebook.presto.hive.orc.metadata.CompressionKind.UNCOMPRESSED; -import static com.facebook.presto.hive.orc.metadata.CompressionKind.ZLIB; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.metadata.CompressionKind.SNAPPY; +import static com.facebook.presto.orc.metadata.CompressionKind.UNCOMPRESSED; +import static com.facebook.presto.orc.metadata.CompressionKind.ZLIB; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static io.airlift.slice.Slices.EMPTY_SLICE; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/OrcStreamUtils.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcStreamUtils.java similarity index 91% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/OrcStreamUtils.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcStreamUtils.java index 9b0ab3c902900..002d938401d2f 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/OrcStreamUtils.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/OrcStreamUtils.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import java.io.IOException; import java.io.InputStream; -import static com.facebook.presto.hive.orc.OrcCorruptionException.verifyFormat; +import static com.facebook.presto.orc.OrcCorruptionException.verifyFormat; public final class OrcStreamUtils { diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/RowGroupDictionaryLengthStream.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/RowGroupDictionaryLengthStream.java similarity index 95% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/RowGroupDictionaryLengthStream.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/RowGroupDictionaryLengthStream.java index 69b856fa42324..3f5443e265a17 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/RowGroupDictionaryLengthStream.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/RowGroupDictionaryLengthStream.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import java.io.IOException; import java.io.InputStream; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/RowGroupDictionaryLengthStreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/RowGroupDictionaryLengthStreamSource.java similarity index 94% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/RowGroupDictionaryLengthStreamSource.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/RowGroupDictionaryLengthStreamSource.java index 6ac441eddcaba..172651f9062a4 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/RowGroupDictionaryLengthStreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/RowGroupDictionaryLengthStreamSource.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; -import com.facebook.presto.hive.orc.metadata.ColumnEncoding.ColumnEncodingKind; +import com.facebook.presto.orc.metadata.ColumnEncoding.ColumnEncodingKind; import com.google.common.base.Objects; import com.google.common.io.ByteSource; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/StreamSource.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/StreamSource.java similarity index 94% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/StreamSource.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/StreamSource.java index 3e83cf4452b3f..0f3ae7e3fb246 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/StreamSource.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/StreamSource.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; import javax.annotation.Nullable; diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/StreamSources.java b/presto-orc/src/main/java/com/facebook/presto/orc/stream/StreamSources.java similarity index 86% rename from presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/StreamSources.java rename to presto-orc/src/main/java/com/facebook/presto/orc/stream/StreamSources.java index 19d3c8ff9d2ee..16caf28538702 100644 --- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/stream/StreamSources.java +++ b/presto-orc/src/main/java/com/facebook/presto/orc/stream/StreamSources.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc.stream; +package com.facebook.presto.orc.stream; -import com.facebook.presto.hive.orc.StreamDescriptor; -import com.facebook.presto.hive.orc.StreamId; -import com.facebook.presto.hive.orc.metadata.Stream.StreamKind; +import com.facebook.presto.orc.StreamDescriptor; +import com.facebook.presto.orc.StreamId; +import com.facebook.presto.orc.metadata.Stream.StreamKind; import com.google.common.collect.ImmutableMap; import javax.annotation.Nonnull; import java.util.Map; -import static com.facebook.presto.hive.orc.stream.MissingStreamSource.missingStreamSource; +import static com.facebook.presto.orc.stream.MissingStreamSource.missingStreamSource; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/orc/AbstractTestOrcReader.java b/presto-orc/src/test/java/com/facebook/presto/orc/AbstractTestOrcReader.java similarity index 99% rename from presto-hive/src/test/java/com/facebook/presto/hive/orc/AbstractTestOrcReader.java rename to presto-orc/src/test/java/com/facebook/presto/orc/AbstractTestOrcReader.java index 0dbde17b2691a..9cac2e3d5fe8e 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/orc/AbstractTestOrcReader.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/AbstractTestOrcReader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import com.google.common.base.Function; import com.google.common.collect.AbstractIterator; @@ -40,7 +40,7 @@ import java.util.Random; import java.util.concurrent.TimeUnit; -import static com.facebook.presto.hive.orc.OrcTester.HIVE_STORAGE_TIME_ZONE; +import static com.facebook.presto.orc.OrcTester.HIVE_STORAGE_TIME_ZONE; import static com.google.common.base.Functions.compose; import static com.google.common.base.Functions.toStringFunction; import static com.google.common.collect.Iterables.concat; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/orc/OrcTester.java b/presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java similarity index 94% rename from presto-hive/src/test/java/com/facebook/presto/hive/orc/OrcTester.java rename to presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java index 4cff58a1f099a..e680b063ac3c7 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/orc/OrcTester.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import com.facebook.hive.orc.OrcConf; -import com.facebook.presto.hive.orc.metadata.ColumnStatistics; -import com.facebook.presto.hive.orc.metadata.DwrfMetadataReader; -import com.facebook.presto.hive.orc.metadata.MetadataReader; -import com.facebook.presto.hive.orc.metadata.OrcMetadataReader; +import com.facebook.presto.orc.metadata.ColumnStatistics; +import com.facebook.presto.orc.metadata.DwrfMetadataReader; +import com.facebook.presto.orc.metadata.MetadataReader; +import com.facebook.presto.orc.metadata.OrcMetadataReader; import com.google.common.base.Function; import com.google.common.base.Throwables; import com.google.common.collect.AbstractIterator; @@ -29,9 +29,6 @@ import io.airlift.json.JsonCodecFactory; import io.airlift.units.DataSize; import io.airlift.units.DataSize.Unit; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FSDataInputStream; -import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.ql.exec.FileSinkOperator.RecordWriter; import org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat; @@ -70,10 +67,10 @@ import java.util.Properties; import java.util.Set; -import static com.facebook.presto.hive.orc.OrcTester.Compression.NONE; -import static com.facebook.presto.hive.orc.OrcTester.Compression.ZLIB; -import static com.facebook.presto.hive.orc.OrcTester.Format.DWRF; -import static com.facebook.presto.hive.orc.OrcTester.Format.ORC_12; +import static com.facebook.presto.orc.OrcTester.Compression.NONE; +import static com.facebook.presto.orc.OrcTester.Compression.ZLIB; +import static com.facebook.presto.orc.OrcTester.Format.DWRF; +import static com.facebook.presto.orc.OrcTester.Format.ORC_12; import static com.google.common.base.Functions.constant; import static com.google.common.collect.Iterables.transform; import static com.google.common.collect.Iterators.advance; @@ -400,33 +397,22 @@ private static Vector createResultsVector(ObjectInspector objectInspector) private static OrcRecordReader createCustomOrcRecordReader(TempFile tempFile, MetadataReader metadataReader) throws IOException { - Path path = new Path(tempFile.getFile().toURI()); - FileSystem fileSystem = path.getFileSystem(new Configuration()); - - long size = fileSystem.getFileStatus(path).getLen(); - FSDataInputStream inputStream = fileSystem.open(path); - try { - HdfsOrcDataSource orcDataSource = new HdfsOrcDataSource(path.toString(), inputStream, size); - OrcReader orcReader = new OrcReader(orcDataSource, metadataReader); - return orcReader.createRecordReader( - ImmutableSet.of(0), - new OrcPredicate() + OrcDataSource orcDataSource = new FileOrcDataSource(tempFile.getFile()); + OrcReader orcReader = new OrcReader(orcDataSource, metadataReader); + return orcReader.createRecordReader( + ImmutableSet.of(0), + new OrcPredicate() + { + @Override + public boolean matches(long numberOfRows, Map statisticsByHiveColumnIndex) { - @Override - public boolean matches(long numberOfRows, Map statisticsByHiveColumnIndex) - { - return true; - } - }, - 0, - tempFile.getFile().length(), - HIVE_STORAGE_TIME_ZONE, - HIVE_STORAGE_TIME_ZONE); - } - catch (Throwable e) { - inputStream.close(); - throw e; - } + return true; + } + }, + 0, + tempFile.getFile().length(), + HIVE_STORAGE_TIME_ZONE, + HIVE_STORAGE_TIME_ZONE); } public static DataSize writeOrcColumn(File outputFile, Format format, Compression compression, ObjectInspector columnObjectInspector, Iterator values) diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/orc/TestFullOrcReader.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestFullOrcReader.java similarity index 95% rename from presto-hive/src/test/java/com/facebook/presto/hive/orc/TestFullOrcReader.java rename to presto-orc/src/test/java/com/facebook/presto/orc/TestFullOrcReader.java index eed99fea3f427..364301da7c0fb 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/orc/TestFullOrcReader.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestFullOrcReader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import org.testng.annotations.Test; diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/orc/TestOrcReader.java b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcReader.java similarity index 95% rename from presto-hive/src/test/java/com/facebook/presto/hive/orc/TestOrcReader.java rename to presto-orc/src/test/java/com/facebook/presto/orc/TestOrcReader.java index 4354d68e7ce6d..d032f9af040cb 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/orc/TestOrcReader.java +++ b/presto-orc/src/test/java/com/facebook/presto/orc/TestOrcReader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.facebook.presto.hive.orc; +package com.facebook.presto.orc; import org.testng.annotations.Test;