You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2020/02/25 22:14:42 UTC
[orc] branch master updated (e66df33 -> 5613a88)
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/orc.git.
from e66df33 Move blog post for ORC adopter Spark (#485)
new b594deb Fix missing @Override annotation
new 5613a88 Fix spurious travis-ci failures by bumping up macos versions.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 4 ++--
java/core/src/java/org/apache/orc/OrcFile.java | 2 ++
java/core/src/java/org/apache/orc/Reader.java | 1 +
java/core/src/java/org/apache/orc/RecordReader.java | 1 +
java/core/src/java/org/apache/orc/Writer.java | 1 +
.../core/src/java/org/apache/orc/impl/DynamicIntArray.java | 1 +
java/core/src/java/org/apache/orc/impl/InStream.java | 3 +++
.../src/java/org/apache/orc/impl/MemoryManagerImpl.java | 2 ++
java/core/src/java/org/apache/orc/impl/OutStream.java | 1 +
.../src/java/org/apache/orc/impl/PhysicalFsWriter.java | 1 +
java/core/src/java/org/apache/orc/impl/ReaderImpl.java | 1 +
java/core/src/java/org/apache/orc/impl/StreamName.java | 1 +
.../src/java/org/apache/orc/impl/StringRedBlackTree.java | 6 ++++++
java/core/src/java/org/apache/orc/impl/WriterImpl.java | 14 ++++++++++++++
.../java/org/apache/orc/impl/writer/TreeWriterBase.java | 3 +++
.../org/apache/orc/impl/writer/WriterEncryptionKey.java | 1 +
.../apache/orc/impl/writer/WriterEncryptionVariant.java | 1 +
.../core/src/java/org/apache/orc/util/BloomFilterUtf8.java | 2 ++
.../src/java/org/apache/orc/mapred/OrcInputFormat.java | 1 +
.../src/java/org/apache/orc/mapreduce/OrcInputFormat.java | 1 +
java/shims/src/java/org/apache/orc/impl/HadoopShims.java | 1 +
.../src/java/org/apache/orc/impl/HadoopShimsCurrent.java | 1 +
.../src/java/org/apache/orc/impl/HadoopShimsPre2_3.java | 1 +
.../src/java/org/apache/orc/impl/HadoopShimsPre2_6.java | 5 ++++-
.../src/java/org/apache/orc/impl/HadoopShimsPre2_7.java | 3 ++-
java/shims/src/java/org/apache/orc/impl/ZeroCopyShims.java | 2 ++
java/tools/src/java/org/apache/orc/tools/FileDump.java | 1 +
.../src/java/org/apache/orc/tools/convert/JsonReader.java | 12 ++++++++++++
.../tools/src/java/org/apache/orc/tools/json/ListType.java | 1 +
.../src/java/org/apache/orc/tools/json/StructType.java | 1 +
.../src/java/org/apache/orc/tools/json/UnionType.java | 1 +
31 files changed, 73 insertions(+), 4 deletions(-)
[orc] 01/02: Fix missing @Override annotation
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/orc.git
commit b594deb86b38a48af951084dc2a633eed3fb8110
Author: lamber-ken <la...@163.com>
AuthorDate: Sat Jan 18 01:51:04 2020 +0800
Fix missing @Override annotation
---
java/core/src/java/org/apache/orc/OrcFile.java | 2 ++
java/core/src/java/org/apache/orc/Reader.java | 1 +
java/core/src/java/org/apache/orc/RecordReader.java | 1 +
java/core/src/java/org/apache/orc/Writer.java | 1 +
.../core/src/java/org/apache/orc/impl/DynamicIntArray.java | 1 +
java/core/src/java/org/apache/orc/impl/InStream.java | 3 +++
.../src/java/org/apache/orc/impl/MemoryManagerImpl.java | 2 ++
java/core/src/java/org/apache/orc/impl/OutStream.java | 1 +
.../src/java/org/apache/orc/impl/PhysicalFsWriter.java | 1 +
java/core/src/java/org/apache/orc/impl/ReaderImpl.java | 1 +
java/core/src/java/org/apache/orc/impl/StreamName.java | 1 +
.../src/java/org/apache/orc/impl/StringRedBlackTree.java | 6 ++++++
java/core/src/java/org/apache/orc/impl/WriterImpl.java | 14 ++++++++++++++
.../java/org/apache/orc/impl/writer/TreeWriterBase.java | 3 +++
.../org/apache/orc/impl/writer/WriterEncryptionKey.java | 1 +
.../apache/orc/impl/writer/WriterEncryptionVariant.java | 1 +
.../core/src/java/org/apache/orc/util/BloomFilterUtf8.java | 2 ++
.../src/java/org/apache/orc/mapred/OrcInputFormat.java | 1 +
.../src/java/org/apache/orc/mapreduce/OrcInputFormat.java | 1 +
java/shims/src/java/org/apache/orc/impl/HadoopShims.java | 1 +
.../src/java/org/apache/orc/impl/HadoopShimsCurrent.java | 1 +
.../src/java/org/apache/orc/impl/HadoopShimsPre2_3.java | 1 +
.../src/java/org/apache/orc/impl/HadoopShimsPre2_6.java | 5 ++++-
.../src/java/org/apache/orc/impl/HadoopShimsPre2_7.java | 3 ++-
java/shims/src/java/org/apache/orc/impl/ZeroCopyShims.java | 2 ++
java/tools/src/java/org/apache/orc/tools/FileDump.java | 1 +
.../src/java/org/apache/orc/tools/convert/JsonReader.java | 12 ++++++++++++
.../tools/src/java/org/apache/orc/tools/json/ListType.java | 1 +
.../src/java/org/apache/orc/tools/json/StructType.java | 1 +
.../src/java/org/apache/orc/tools/json/UnionType.java | 1 +
30 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/java/core/src/java/org/apache/orc/OrcFile.java b/java/core/src/java/org/apache/orc/OrcFile.java
index 45249ef..2e06f52 100644
--- a/java/core/src/java/org/apache/orc/OrcFile.java
+++ b/java/core/src/java/org/apache/orc/OrcFile.java
@@ -403,6 +403,7 @@ public class OrcFile {
this.id = id;
}
+ @Override
public String toString() {
return id;
}
@@ -502,6 +503,7 @@ public class OrcFile {
/**
* @return a SHALLOW clone
*/
+ @Override
public WriterOptions clone() {
try {
return (WriterOptions) super.clone();
diff --git a/java/core/src/java/org/apache/orc/Reader.java b/java/core/src/java/org/apache/orc/Reader.java
index 9838d89..23d7a3e 100644
--- a/java/core/src/java/org/apache/orc/Reader.java
+++ b/java/core/src/java/org/apache/orc/Reader.java
@@ -372,6 +372,7 @@ public interface Reader extends Closeable {
return includeAcidColumns;
}
+ @Override
public Options clone() {
try {
Options result = (Options) super.clone();
diff --git a/java/core/src/java/org/apache/orc/RecordReader.java b/java/core/src/java/org/apache/orc/RecordReader.java
index 2bd94c9..51d1153 100644
--- a/java/core/src/java/org/apache/orc/RecordReader.java
+++ b/java/core/src/java/org/apache/orc/RecordReader.java
@@ -56,6 +56,7 @@ public interface RecordReader extends Closeable {
* Release the resources associated with the given reader.
* @throws java.io.IOException
*/
+ @Override
void close() throws IOException;
/**
diff --git a/java/core/src/java/org/apache/orc/Writer.java b/java/core/src/java/org/apache/orc/Writer.java
index d4749fa..586f4a1 100644
--- a/java/core/src/java/org/apache/orc/Writer.java
+++ b/java/core/src/java/org/apache/orc/Writer.java
@@ -56,6 +56,7 @@ public interface Writer extends Closeable {
* should be called afterwards.
* @throws IOException
*/
+ @Override
void close() throws IOException;
/**
diff --git a/java/core/src/java/org/apache/orc/impl/DynamicIntArray.java b/java/core/src/java/org/apache/orc/impl/DynamicIntArray.java
index 3b2884b..437f9c9 100644
--- a/java/core/src/java/org/apache/orc/impl/DynamicIntArray.java
+++ b/java/core/src/java/org/apache/orc/impl/DynamicIntArray.java
@@ -119,6 +119,7 @@ public final class DynamicIntArray {
initializedChunks = 0;
}
+ @Override
public String toString() {
int i;
StringBuilder sb = new StringBuilder(length * 4);
diff --git a/java/core/src/java/org/apache/orc/impl/InStream.java b/java/core/src/java/org/apache/orc/impl/InStream.java
index 170d101..a374dc2 100644
--- a/java/core/src/java/org/apache/orc/impl/InStream.java
+++ b/java/core/src/java/org/apache/orc/impl/InStream.java
@@ -55,6 +55,7 @@ public abstract class InStream extends InputStream {
this.length = length;
}
+ @Override
public String toString() {
return name.toString();
}
@@ -138,6 +139,7 @@ public abstract class InStream extends InputStream {
return 0xff & decrypted.get();
}
+ @Override
protected void setCurrent(DiskRangeList newRange, boolean isJump) {
currentRange = newRange;
if (newRange != null) {
@@ -442,6 +444,7 @@ public abstract class InStream extends InputStream {
uncompressed = allocateBuffer(size, isDirect);
}
+ @Override
protected void setCurrent(DiskRangeList newRange,
boolean isJump) {
currentRange = newRange;
diff --git a/java/core/src/java/org/apache/orc/impl/MemoryManagerImpl.java b/java/core/src/java/org/apache/orc/impl/MemoryManagerImpl.java
index 4e78450..b5141b7 100644
--- a/java/core/src/java/org/apache/orc/impl/MemoryManagerImpl.java
+++ b/java/core/src/java/org/apache/orc/impl/MemoryManagerImpl.java
@@ -76,6 +76,7 @@ public class MemoryManagerImpl implements MemoryManager {
* @param path the file that is being written
* @param requestedAllocation the requested buffer size
*/
+ @Override
public synchronized void addWriter(Path path, long requestedAllocation,
Callback callback) throws IOException {
WriterInfo oldVal = writerList.get(path);
@@ -97,6 +98,7 @@ public class MemoryManagerImpl implements MemoryManager {
* Remove the given writer from the pool.
* @param path the file that has been closed
*/
+ @Override
public synchronized void removeWriter(Path path) throws IOException {
WriterInfo val = writerList.get(path);
if (val != null) {
diff --git a/java/core/src/java/org/apache/orc/impl/OutStream.java b/java/core/src/java/org/apache/orc/impl/OutStream.java
index 68c4820..45e636e 100644
--- a/java/core/src/java/org/apache/orc/impl/OutStream.java
+++ b/java/core/src/java/org/apache/orc/impl/OutStream.java
@@ -115,6 +115,7 @@ public class OutStream extends PositionedOutputStream {
* Change the current Initialization Vector (IV) for the encryption.
* @param modifier a function to modify the IV in place
*/
+ @Override
public void changeIv(Consumer<byte[]> modifier) {
if (iv != null) {
modifier.accept(iv);
diff --git a/java/core/src/java/org/apache/orc/impl/PhysicalFsWriter.java b/java/core/src/java/org/apache/orc/impl/PhysicalFsWriter.java
index 71d616c..b0163a4 100644
--- a/java/core/src/java/org/apache/orc/impl/PhysicalFsWriter.java
+++ b/java/core/src/java/org/apache/orc/impl/PhysicalFsWriter.java
@@ -536,6 +536,7 @@ public class PhysicalFsWriter implements PhysicalWriter {
}
}
+ @Override
public void suppress() {
isSuppressed = true;
output.clear();
diff --git a/java/core/src/java/org/apache/orc/impl/ReaderImpl.java b/java/core/src/java/org/apache/orc/impl/ReaderImpl.java
index fff09db..f70219b 100644
--- a/java/core/src/java/org/apache/orc/impl/ReaderImpl.java
+++ b/java/core/src/java/org/apache/orc/impl/ReaderImpl.java
@@ -201,6 +201,7 @@ public class ReaderImpl implements Reader {
throw new IllegalArgumentException("Can't find user metadata " + key);
}
+ @Override
public boolean hasMetadataValue(String key) {
for(OrcProto.UserMetadataItem item: userMetadata) {
if (item.hasName() && item.getName().equals(key)) {
diff --git a/java/core/src/java/org/apache/orc/impl/StreamName.java b/java/core/src/java/org/apache/orc/impl/StreamName.java
index 050aa4c..5c62916 100644
--- a/java/core/src/java/org/apache/orc/impl/StreamName.java
+++ b/java/core/src/java/org/apache/orc/impl/StreamName.java
@@ -47,6 +47,7 @@ public class StreamName implements Comparable<StreamName> {
this.encryption = encryption;
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof StreamName) {
StreamName other = (StreamName) obj;
diff --git a/java/core/src/java/org/apache/orc/impl/StringRedBlackTree.java b/java/core/src/java/org/apache/orc/impl/StringRedBlackTree.java
index ef2e658..ae1d858 100644
--- a/java/core/src/java/org/apache/orc/impl/StringRedBlackTree.java
+++ b/java/core/src/java/org/apache/orc/impl/StringRedBlackTree.java
@@ -121,19 +121,23 @@ public class StringRedBlackTree extends RedBlackTree {
private int end;
private final Text text = new Text();
+ @Override
public int getOriginalPosition() {
return originalPosition;
}
+ @Override
public Text getText() {
byteArray.setText(text, start, end - start);
return text;
}
+ @Override
public void writeBytes(OutputStream out) throws IOException {
byteArray.write(out, start, end - start);
}
+ @Override
public int getLength() {
return end - start;
}
@@ -171,6 +175,7 @@ public class StringRedBlackTree extends RedBlackTree {
/**
* Reset the table to empty.
*/
+ @Override
public void clear() {
super.clear();
byteArray.clear();
@@ -200,6 +205,7 @@ public class StringRedBlackTree extends RedBlackTree {
* Calculate the approximate size in memory.
* @return the number of bytes used in storing the tree.
*/
+ @Override
public long getSizeInBytes() {
return byteArray.getSizeInBytes() + keyOffsets.getSizeInBytes() +
super.getSizeInBytes();
diff --git a/java/core/src/java/org/apache/orc/impl/WriterImpl.java b/java/core/src/java/org/apache/orc/impl/WriterImpl.java
index 819e43b..6c8165c 100644
--- a/java/core/src/java/org/apache/orc/impl/WriterImpl.java
+++ b/java/core/src/java/org/apache/orc/impl/WriterImpl.java
@@ -325,6 +325,7 @@ public class WriterImpl implements WriterInternal, MemoryManager.Callback {
* @param name the name for the stream
* @return The output outStream that the section needs to be written to.
*/
+ @Override
public OutStream createStream(StreamName name) throws IOException {
StreamOptions options = SerializationUtils.getCustomizedCodec(
unencryptedOptions, compressionStrategy, name.getKind());
@@ -344,6 +345,7 @@ public class WriterImpl implements WriterInternal, MemoryManager.Callback {
/**
* Get the stride rate of the row index.
*/
+ @Override
public int getRowIndexStride() {
return rowIndexStride;
}
@@ -352,6 +354,7 @@ public class WriterImpl implements WriterInternal, MemoryManager.Callback {
* Should be building the row index.
* @return true if we are building the index
*/
+ @Override
public boolean buildIndex() {
return buildIndex;
}
@@ -360,6 +363,7 @@ public class WriterImpl implements WriterInternal, MemoryManager.Callback {
* Is the ORC file compressed?
* @return are the streams compressed
*/
+ @Override
public boolean isCompressed() {
return unencryptedOptions.getCodec() != null;
}
@@ -368,6 +372,7 @@ public class WriterImpl implements WriterInternal, MemoryManager.Callback {
* Get the encoding strategy to use.
* @return encoding strategy
*/
+ @Override
public OrcFile.EncodingStrategy getEncodingStrategy() {
return encodingStrategy;
}
@@ -376,6 +381,7 @@ public class WriterImpl implements WriterInternal, MemoryManager.Callback {
* Get the bloom filter columns
* @return bloom filter columns
*/
+ @Override
public boolean[] getBloomFilterColumns() {
return bloomFilterColumns;
}
@@ -384,6 +390,7 @@ public class WriterImpl implements WriterInternal, MemoryManager.Callback {
* Get bloom filter false positive percentage.
* @return fpp
*/
+ @Override
public double getBloomFilterFPP() {
return bloomFilterFpp;
}
@@ -392,6 +399,7 @@ public class WriterImpl implements WriterInternal, MemoryManager.Callback {
* Get the writer's configuration.
* @return configuration
*/
+ @Override
public Configuration getConfiguration() {
return conf;
}
@@ -399,6 +407,7 @@ public class WriterImpl implements WriterInternal, MemoryManager.Callback {
/**
* Get the version of the file to write.
*/
+ @Override
public OrcFile.Version getVersion() {
return version;
}
@@ -413,15 +422,18 @@ public class WriterImpl implements WriterInternal, MemoryManager.Callback {
return physicalWriter;
}
+ @Override
public OrcFile.BloomFilterVersion getBloomFilterVersion() {
return bloomFilterVersion;
}
+ @Override
public void writeIndex(StreamName name,
OrcProto.RowIndex.Builder index) throws IOException {
physicalWriter.writeIndex(name, index);
}
+ @Override
public void writeBloomFilter(StreamName name,
OrcProto.BloomFilterIndex.Builder bloom
) throws IOException {
@@ -463,10 +475,12 @@ public class WriterImpl implements WriterInternal, MemoryManager.Callback {
physicalWriter.writeStatistics(name, stats);
}
+ @Override
public boolean getUseUTCTimestamp() {
return useUTCTimeZone;
}
+ @Override
public double getDictionaryKeySizeThreshold(int columnId) {
return directEncodingColumns[columnId] ? 0.0 : dictionaryKeySizeThreshold;
}
diff --git a/java/core/src/java/org/apache/orc/impl/writer/TreeWriterBase.java b/java/core/src/java/org/apache/orc/impl/writer/TreeWriterBase.java
index b494203..885c32c 100644
--- a/java/core/src/java/org/apache/orc/impl/writer/TreeWriterBase.java
+++ b/java/core/src/java/org/apache/orc/impl/writer/TreeWriterBase.java
@@ -163,6 +163,7 @@ public abstract class TreeWriterBase implements TreeWriter {
* @param offset the row to start on
* @param length the number of rows to write
*/
+ @Override
public void writeRootBatch(VectorizedRowBatch batch, int offset,
int length) throws IOException {
writeBatch(batch.cols[0], offset, length);
@@ -318,6 +319,7 @@ public abstract class TreeWriterBase implements TreeWriter {
* statistics before they are cleared. Finally, it records the start of the
* next index and ensures all of the children columns also create an entry.
*/
+ @Override
public void createRowIndexEntry() throws IOException {
stripeColStatistics.merge(indexStatistics);
rowIndexEntry.setStatistics(indexStatistics.serialize());
@@ -379,6 +381,7 @@ public abstract class TreeWriterBase implements TreeWriter {
* Estimate how much memory the writer is consuming excluding the streams.
* @return the number of bytes.
*/
+ @Override
public long estimateMemory() {
long result = 0;
if (isPresent != null) {
diff --git a/java/core/src/java/org/apache/orc/impl/writer/WriterEncryptionKey.java b/java/core/src/java/org/apache/orc/impl/writer/WriterEncryptionKey.java
index 8443dc0..e967c44 100644
--- a/java/core/src/java/org/apache/orc/impl/writer/WriterEncryptionKey.java
+++ b/java/core/src/java/org/apache/orc/impl/writer/WriterEncryptionKey.java
@@ -58,6 +58,7 @@ public class WriterEncryptionKey implements EncryptionKey {
return metadata.getVersion();
}
+ @Override
public EncryptionAlgorithm getAlgorithm() {
return metadata.getAlgorithm();
}
diff --git a/java/core/src/java/org/apache/orc/impl/writer/WriterEncryptionVariant.java b/java/core/src/java/org/apache/orc/impl/writer/WriterEncryptionVariant.java
index 786ef43..462c9f6 100644
--- a/java/core/src/java/org/apache/orc/impl/writer/WriterEncryptionVariant.java
+++ b/java/core/src/java/org/apache/orc/impl/writer/WriterEncryptionVariant.java
@@ -50,6 +50,7 @@ public class WriterEncryptionVariant implements EncryptionVariant {
return key;
}
+ @Override
public TypeDescription getRoot() {
return root;
}
diff --git a/java/core/src/java/org/apache/orc/util/BloomFilterUtf8.java b/java/core/src/java/org/apache/orc/util/BloomFilterUtf8.java
index a629e3a..345073f 100644
--- a/java/core/src/java/org/apache/orc/util/BloomFilterUtf8.java
+++ b/java/core/src/java/org/apache/orc/util/BloomFilterUtf8.java
@@ -35,6 +35,7 @@ public class BloomFilterUtf8 extends BloomFilter {
}
+ @Override
public void addString(String val) {
if (val == null) {
add(null);
@@ -43,6 +44,7 @@ public class BloomFilterUtf8 extends BloomFilter {
}
}
+ @Override
public boolean testString(String val) {
if (val == null) {
return test(null);
diff --git a/java/mapreduce/src/java/org/apache/orc/mapred/OrcInputFormat.java b/java/mapreduce/src/java/org/apache/orc/mapred/OrcInputFormat.java
index 97d6164..75f1281 100644
--- a/java/mapreduce/src/java/org/apache/orc/mapred/OrcInputFormat.java
+++ b/java/mapreduce/src/java/org/apache/orc/mapred/OrcInputFormat.java
@@ -164,6 +164,7 @@ public class OrcInputFormat<V extends WritableComparable>
* @return a list of files that need to be read
* @throws IOException
*/
+ @Override
protected FileStatus[] listStatus(JobConf job) throws IOException {
FileStatus[] result = super.listStatus(job);
List<FileStatus> ok = new ArrayList<>(result.length);
diff --git a/java/mapreduce/src/java/org/apache/orc/mapreduce/OrcInputFormat.java b/java/mapreduce/src/java/org/apache/orc/mapreduce/OrcInputFormat.java
index c588c6d..078cf24 100644
--- a/java/mapreduce/src/java/org/apache/orc/mapreduce/OrcInputFormat.java
+++ b/java/mapreduce/src/java/org/apache/orc/mapreduce/OrcInputFormat.java
@@ -73,6 +73,7 @@ public class OrcInputFormat<V extends WritableComparable>
file, split.getStart(), split.getLength()));
}
+ @Override
protected List<FileStatus> listStatus(JobContext job) throws IOException {
List<FileStatus> complete = super.listStatus(job);
List<FileStatus> result = new ArrayList<>(complete.size());
diff --git a/java/shims/src/java/org/apache/orc/impl/HadoopShims.java b/java/shims/src/java/org/apache/orc/impl/HadoopShims.java
index ac58b63..6c8d5ca 100644
--- a/java/shims/src/java/org/apache/orc/impl/HadoopShims.java
+++ b/java/shims/src/java/org/apache/orc/impl/HadoopShims.java
@@ -109,6 +109,7 @@ public interface HadoopShims {
/**
* Close the underlying stream.
*/
+ @Override
void close() throws IOException;
}
diff --git a/java/shims/src/java/org/apache/orc/impl/HadoopShimsCurrent.java b/java/shims/src/java/org/apache/orc/impl/HadoopShimsCurrent.java
index c32ed2e..68f9838 100644
--- a/java/shims/src/java/org/apache/orc/impl/HadoopShimsCurrent.java
+++ b/java/shims/src/java/org/apache/orc/impl/HadoopShimsCurrent.java
@@ -37,6 +37,7 @@ import java.util.Random;
*/
public class HadoopShimsCurrent implements HadoopShims {
+ @Override
public DirectDecompressor getDirectDecompressor(DirectCompressionType codec) {
return HadoopShimsPre2_6.getDecompressor(codec);
}
diff --git a/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_3.java b/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_3.java
index 07e45b2..0f5f545 100644
--- a/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_3.java
+++ b/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_3.java
@@ -36,6 +36,7 @@ public class HadoopShimsPre2_3 implements HadoopShims {
HadoopShimsPre2_3() {
}
+ @Override
public DirectDecompressor getDirectDecompressor(
DirectCompressionType codec) {
return null;
diff --git a/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_6.java b/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_6.java
index 75a1145..3ff8870 100644
--- a/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_6.java
+++ b/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_6.java
@@ -47,6 +47,7 @@ public class HadoopShimsPre2_6 implements HadoopShims {
this.root = root;
}
+ @Override
public void decompress(ByteBuffer input, ByteBuffer output) throws IOException {
if (!isFirstCall) {
root.reset();
@@ -75,6 +76,7 @@ public class HadoopShimsPre2_6 implements HadoopShims {
this.root = root;
}
+ @Override
public void decompress(ByteBuffer input, ByteBuffer output) throws IOException {
if (!isFirstCall) {
root.reset();
@@ -112,7 +114,8 @@ public class HadoopShimsPre2_6 implements HadoopShims {
}
}
- public DirectDecompressor getDirectDecompressor( DirectCompressionType codec) {
+ @Override
+ public DirectDecompressor getDirectDecompressor(DirectCompressionType codec) {
return getDecompressor(codec);
}
diff --git a/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_7.java b/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_7.java
index 552c6c5..92b2409 100644
--- a/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_7.java
+++ b/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_7.java
@@ -48,7 +48,8 @@ public class HadoopShimsPre2_7 implements HadoopShims {
LoggerFactory.getLogger(HadoopShimsPre2_7.class);
- public DirectDecompressor getDirectDecompressor( DirectCompressionType codec) {
+ @Override
+ public DirectDecompressor getDirectDecompressor(DirectCompressionType codec) {
return HadoopShimsPre2_6.getDecompressor(codec);
}
diff --git a/java/shims/src/java/org/apache/orc/impl/ZeroCopyShims.java b/java/shims/src/java/org/apache/orc/impl/ZeroCopyShims.java
index de02c8b..7c49b97 100644
--- a/java/shims/src/java/org/apache/orc/impl/ZeroCopyShims.java
+++ b/java/shims/src/java/org/apache/orc/impl/ZeroCopyShims.java
@@ -62,6 +62,7 @@ class ZeroCopyShims {
}
}
+ @Override
public final ByteBuffer readBuffer(int maxLength, boolean verifyChecksums)
throws IOException {
EnumSet<ReadOption> options = NO_CHECK_SUM;
@@ -71,6 +72,7 @@ class ZeroCopyShims {
return this.in.read(this.pool, maxLength, options);
}
+ @Override
public final void releaseBuffer(ByteBuffer buffer) {
this.in.releaseBuffer(buffer);
}
diff --git a/java/tools/src/java/org/apache/orc/tools/FileDump.java b/java/tools/src/java/org/apache/orc/tools/FileDump.java
index 3a06e5b..74683e7 100644
--- a/java/tools/src/java/org/apache/orc/tools/FileDump.java
+++ b/java/tools/src/java/org/apache/orc/tools/FileDump.java
@@ -65,6 +65,7 @@ public final class FileDump {
public static final int DEFAULT_BLOCK_SIZE = 256 * 1024 * 1024;
public static final String DEFAULT_BACKUP_PATH = System.getProperty("java.io.tmpdir");
public static final PathFilter HIDDEN_AND_SIDE_FILE_FILTER = new PathFilter() {
+ @Override
public boolean accept(Path p) {
String name = p.getName();
return !name.startsWith("_") && !name.startsWith(".") && !name.endsWith(
diff --git a/java/tools/src/java/org/apache/orc/tools/convert/JsonReader.java b/java/tools/src/java/org/apache/orc/tools/convert/JsonReader.java
index c3720af..29d306c 100644
--- a/java/tools/src/java/org/apache/orc/tools/convert/JsonReader.java
+++ b/java/tools/src/java/org/apache/orc/tools/convert/JsonReader.java
@@ -72,6 +72,7 @@ public class JsonReader implements RecordReader {
}
static class BooleanColumnConverter implements JsonConverter {
+ @Override
public void convert(JsonElement value, ColumnVector vect, int row) {
if (value == null || value.isJsonNull()) {
vect.noNulls = false;
@@ -84,6 +85,7 @@ public class JsonReader implements RecordReader {
}
static class LongColumnConverter implements JsonConverter {
+ @Override
public void convert(JsonElement value, ColumnVector vect, int row) {
if (value == null || value.isJsonNull()) {
vect.noNulls = false;
@@ -96,6 +98,7 @@ public class JsonReader implements RecordReader {
}
static class DoubleColumnConverter implements JsonConverter {
+ @Override
public void convert(JsonElement value, ColumnVector vect, int row) {
if (value == null || value.isJsonNull()) {
vect.noNulls = false;
@@ -108,6 +111,7 @@ public class JsonReader implements RecordReader {
}
static class StringColumnConverter implements JsonConverter {
+ @Override
public void convert(JsonElement value, ColumnVector vect, int row) {
if (value == null || value.isJsonNull()) {
vect.noNulls = false;
@@ -121,6 +125,7 @@ public class JsonReader implements RecordReader {
}
static class BinaryColumnConverter implements JsonConverter {
+ @Override
public void convert(JsonElement value, ColumnVector vect, int row) {
if (value == null || value.isJsonNull()) {
vect.noNulls = false;
@@ -138,6 +143,7 @@ public class JsonReader implements RecordReader {
}
class TimestampColumnConverter implements JsonConverter {
+ @Override
public void convert(JsonElement value, ColumnVector vect, int row) {
if (value == null || value.isJsonNull()) {
vect.noNulls = false;
@@ -165,6 +171,7 @@ public class JsonReader implements RecordReader {
}
static class DecimalColumnConverter implements JsonConverter {
+ @Override
public void convert(JsonElement value, ColumnVector vect, int row) {
if (value == null || value.isJsonNull()) {
vect.noNulls = false;
@@ -189,6 +196,7 @@ public class JsonReader implements RecordReader {
fieldNames = schema.getFieldNames();
}
+ @Override
public void convert(JsonElement value, ColumnVector vect, int row) {
if (value == null || value.isJsonNull()) {
vect.noNulls = false;
@@ -211,6 +219,7 @@ public class JsonReader implements RecordReader {
childrenConverter = createConverter(schema.getChildren().get(0));
}
+ @Override
public void convert(JsonElement value, ColumnVector vect, int row) {
if (value == null || value.isJsonNull()) {
vect.noNulls = false;
@@ -242,6 +251,7 @@ public class JsonReader implements RecordReader {
valueConverter = createConverter(schema.getChildren().get(1));
}
+ @Override
public void convert(JsonElement value, ColumnVector vect, int row) {
if (value == null || value.isJsonNull()) {
vect.noNulls = false;
@@ -326,6 +336,7 @@ public class JsonReader implements RecordReader {
}
}
+ @Override
public boolean nextBatch(VectorizedRowBatch batch) throws IOException {
batch.reset();
int maxSize = batch.getMaxSize();
@@ -360,6 +371,7 @@ public class JsonReader implements RecordReader {
return totalSize != 0 && pos < totalSize ? (float) pos / totalSize : 1;
}
+ @Override
public void close() throws IOException {
input.close();
}
diff --git a/java/tools/src/java/org/apache/orc/tools/json/ListType.java b/java/tools/src/java/org/apache/orc/tools/json/ListType.java
index 7ef80fd..22ebddd 100644
--- a/java/tools/src/java/org/apache/orc/tools/json/ListType.java
+++ b/java/tools/src/java/org/apache/orc/tools/json/ListType.java
@@ -76,6 +76,7 @@ class ListType extends HiveType {
}
}
+ @Override
public void printFlat(PrintStream out, String prefix) {
elementType.printFlat(out, prefix + "._list");
}
diff --git a/java/tools/src/java/org/apache/orc/tools/json/StructType.java b/java/tools/src/java/org/apache/orc/tools/json/StructType.java
index a3b7be0..f2edd28 100644
--- a/java/tools/src/java/org/apache/orc/tools/json/StructType.java
+++ b/java/tools/src/java/org/apache/orc/tools/json/StructType.java
@@ -121,6 +121,7 @@ class StructType extends HiveType {
}
}
+ @Override
public void printFlat(PrintStream out, String prefix) {
prefix = prefix + ".";
for (Map.Entry<String, HiveType> field : fields.entrySet()) {
diff --git a/java/tools/src/java/org/apache/orc/tools/json/UnionType.java b/java/tools/src/java/org/apache/orc/tools/json/UnionType.java
index bd2fd89..7176c06 100644
--- a/java/tools/src/java/org/apache/orc/tools/json/UnionType.java
+++ b/java/tools/src/java/org/apache/orc/tools/json/UnionType.java
@@ -103,6 +103,7 @@ class UnionType extends HiveType {
}
}
+ @Override
public void printFlat(PrintStream out, String prefix) {
prefix = prefix + ".";
int id = 0;
[orc] 02/02: Fix spurious travis-ci failures by bumping up macos
versions.
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omalley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/orc.git
commit 5613a88a59a7c6656444605e6d24984d1ac335ce
Author: Owen O'Malley <om...@apache.org>
AuthorDate: Tue Feb 25 13:43:16 2020 -0800
Fix spurious travis-ci failures by bumping up macos versions.
Signed-off-by: Owen O'Malley <om...@apache.org>
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 0ab8fc3..cbb23e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ matrix:
- export CXX=clang++-4.0
- compiler: clang
os: osx
- osx_image: xcode7.3
+ osx_image: xcode9.4
script:
- brew link --overwrite --force openssl
- mkdir build
@@ -41,7 +41,7 @@ matrix:
- make package test-out
- compiler: clang
os: osx
- osx_image: xcode10.3
+ osx_image: xcode11.3
script:
- brew link --overwrite --force openssl
- mkdir build