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-jdbc/src | |
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-jdbc/src')
2 files changed, 3 insertions, 5 deletions
diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/DrillJdbcRuleBase.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/DrillJdbcRuleBase.java index 9d29a228a..a6438c37f 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/DrillJdbcRuleBase.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/DrillJdbcRuleBase.java @@ -20,7 +20,6 @@ package org.apache.drill.exec.store.jdbc; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import com.google.common.base.Predicates; import org.apache.calcite.adapter.jdbc.JdbcConvention; import org.apache.calcite.adapter.jdbc.JdbcRules; import org.apache.calcite.plan.Convention; @@ -52,7 +51,7 @@ abstract class DrillJdbcRuleBase extends ConverterRule { protected final JdbcConvention out; private DrillJdbcRuleBase(Class<? extends RelNode> clazz, RelTrait in, JdbcConvention out, String description) { - super(clazz, Predicates.<RelNode>alwaysTrue(), in, out, DrillRelFactories.LOGICAL_BUILDER, description); + super(clazz, input -> true, in, out, DrillRelFactories.LOGICAL_BUILDER, description); this.out = out; } diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java index 4de3cf8a1..872e206e5 100755 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java @@ -28,7 +28,6 @@ import java.util.Set; import javax.sql.DataSource; -import com.google.common.base.Predicates; import org.apache.calcite.adapter.jdbc.JdbcConvention; import org.apache.calcite.adapter.jdbc.JdbcRules; import org.apache.calcite.adapter.jdbc.JdbcSchema; @@ -202,7 +201,7 @@ public class JdbcStoragePlugin extends AbstractStoragePlugin { private static class JdbcPrule extends ConverterRule { private JdbcPrule() { - super(JdbcDrel.class, Predicates.<RelNode>alwaysTrue(), DrillRel.DRILL_LOGICAL, + super(JdbcDrel.class, input -> true, DrillRel.DRILL_LOGICAL, Prel.DRILL_PHYSICAL, DrillRelFactories.LOGICAL_BUILDER, "JDBC_PREL_Converter"); } @@ -220,7 +219,7 @@ public class JdbcStoragePlugin extends AbstractStoragePlugin { private class JdbcDrelConverterRule extends ConverterRule { public JdbcDrelConverterRule(DrillJdbcConvention in) { - super(RelNode.class, Predicates.<RelNode>alwaysTrue(), in, DrillRel.DRILL_LOGICAL, + super(RelNode.class, input -> true, in, DrillRel.DRILL_LOGICAL, DrillRelFactories.LOGICAL_BUILDER, "JDBC_DREL_Converter" + in.getName()); } |