diff options
author | Volodymyr Vysotskyi <vvovyk@gmail.com> | 2018-04-23 11:38:39 +0300 |
---|---|---|
committer | Volodymyr Vysotskyi <vvovyk@gmail.com> | 2018-08-28 20:04:25 +0300 |
commit | 44e63bd0deda72af726f51e0ff78fc2b636c64eb (patch) | |
tree | 6729d28338ead5c071a1c23f2cbcabe1e340387f /contrib/storage-mongo | |
parent | d8f9fb6a5cf22a01fa3f48bd40e7dbeb3cb6e4e4 (diff) |
DRILL-6422: Update guava to 23.0 and shade it
- Fix compilation errors for new version of Guava.
- Remove usage of deprecated API
- Shade guava and add dependencies to the shaded version
- Ban unshaded package
- Introduce drill-shaded module and move guava-shaded under it
- Add methods to convert shaded guava lists to the unshaded ones
- Add instruction for publishing artifacts to the Apache repository
Diffstat (limited to 'contrib/storage-mongo')
-rw-r--r-- | contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java index cff3f5700..c328ae41a 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java @@ -17,6 +17,7 @@ */ package org.apache.drill.exec.store.mongo; +import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -41,7 +42,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Preconditions; -import com.google.common.collect.Iterators; @JsonTypeName("mongo-shard-read") public class MongoSubScan extends AbstractBase implements SubScan { @@ -120,7 +120,7 @@ public class MongoSubScan extends AbstractBase implements SubScan { @Override public Iterator<PhysicalOperator> iterator() { - return Iterators.emptyIterator(); + return Collections.emptyIterator(); } public static class MongoSubScanSpec { |