diff --git ql/pom.xml ql/pom.xml
index e5eed46947..016f8d2588 100644
--- ql/pom.xml
+++ ql/pom.xml
@@ -1023,8 +1023,12 @@
org.apache.hive.com.zaxxer.hikari
- com.google.guava
- org.apache.hive.com.google.guava
+ com.google.common
+ org.apache.hive.com.google.common
+
+
+ com.google.thirdparty.publicsuffix
+ org.apache.hive.com.google.thirdparty.publicsuffix
diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelDecorrelator.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelDecorrelator.java
index 068b6875b3..3a1779e434 100644
--- ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelDecorrelator.java
+++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelDecorrelator.java
@@ -2428,7 +2428,7 @@ public void onMatch(RelOptRuleCall call) {
operand(LogicalCorrelate.class,
operand(RelNode.class, any()),
operand(Project.class,
- operand(Aggregate.class, null, Aggregate.IS_SIMPLE,
+ operandJ(Aggregate.class, null, Aggregate::isSimple,
operand(Project.class,
operand(RelNode.class, any()))))));
}
diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSubQueryRemoveRule.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSubQueryRemoveRule.java
index 2a2c384d0c..6017aa4a89 100644
--- ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSubQueryRemoveRule.java
+++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSubQueryRemoveRule.java
@@ -46,13 +46,13 @@
import org.apache.calcite.util.Pair;
import org.apache.calcite.util.Util;
-import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import java.util.function.Predicate;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSubqueryRuntimeException;
@@ -79,10 +79,10 @@
*/
public class HiveSubQueryRemoveRule extends RelOptRule {
- private HiveConf conf;
+ private final HiveConf conf;
public HiveSubQueryRemoveRule(HiveConf conf) {
- super(operand(RelNode.class, null, HiveSubQueryFinder.RELNODE_PREDICATE, any()),
+ super(operandJ(RelNode.class, null, HiveSubQueryFinder.RELNODE_PREDICATE, any()),
HiveRelFactories.HIVE_BUILDER, "SubQueryRemoveRule:Filter");
this.conf = conf;
}
@@ -597,7 +597,7 @@ private RexInputRef field(HiveSubQRemoveRelBuilder builder, int inputCount, int
* Returns whether a {@link Project} contains a sub-query.
*/
public static final Predicate RELNODE_PREDICATE = new Predicate() {
- @Override public boolean apply(RelNode relNode) {
+ @Override public boolean test(RelNode relNode) {
if (relNode instanceof Project) {
Project project = (Project) relNode;
for (RexNode node : project.getProjects()) {