aboutsummaryrefslogtreecommitdiff
path: root/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical
diff options
context:
space:
mode:
authorVolodymyr Vysotskyi <vvovyk@gmail.com>2018-04-23 11:38:39 +0300
committerVolodymyr Vysotskyi <vvovyk@gmail.com>2018-08-28 20:04:25 +0300
commit44e63bd0deda72af726f51e0ff78fc2b636c64eb (patch)
tree6729d28338ead5c071a1c23f2cbcabe1e340387f /exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical
parentd8f9fb6a5cf22a01fa3f48bd40e7dbeb3cb6e4e4 (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 'exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical')
-rw-r--r--exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ValuesPrel.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ValuesPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ValuesPrel.java
index 095519fa1..e464b1ad2 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ValuesPrel.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ValuesPrel.java
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import com.google.common.collect.ImmutableList;
import org.apache.calcite.plan.RelOptCluster;
import org.apache.calcite.plan.RelTraitSet;
import org.apache.calcite.rel.RelNode;
@@ -40,11 +39,14 @@ import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode;
*/
public class ValuesPrel extends DrillValuesRelBase implements Prel {
- public ValuesPrel(RelOptCluster cluster, RelDataType rowType, ImmutableList<ImmutableList<RexLiteral>> tuples, RelTraitSet traits) {
+ public ValuesPrel(RelOptCluster cluster, RelDataType rowType, List<? extends List<RexLiteral>> tuples, RelTraitSet traits) {
super(cluster, rowType, tuples, traits);
}
- public ValuesPrel(RelOptCluster cluster, RelDataType rowType, ImmutableList<ImmutableList<RexLiteral>> tuples, RelTraitSet traits, JSONOptions content) {
+ public ValuesPrel(RelOptCluster cluster,
+ RelDataType rowType,
+ List<? extends List<RexLiteral>> tuples, RelTraitSet traits,
+ JSONOptions content) {
super(cluster, rowType, tuples, traits, content);
}