Add proposed changes from review

apache · Jun 7, 2021 · bcba99c · bcba99c
1 parent 2295736
commit bcba99c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTableScan.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcTableScan.java
@@ -16,6 +16,7 @@
  */
 package org.apache.calcite.adapter.jdbc;
 
+import org.apache.calcite.plan.Convention;
 import org.apache.calcite.plan.RelOptCluster;
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.plan.RelTraitSet;
@@ -30,6 +31,8 @@
 
 import static org.apache.calcite.linq4j.Nullness.castNonNull;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * Relational expression representing a scan of a table in a JDBC data source.
  */
@@ -58,7 +61,8 @@ protected JdbcTableScan(
   }
 
   @Override public RelNode withHints(List<RelHint> hintList) {
+    Convention convention = requireNonNull(getConvention(), "getConvention()");
     return new JdbcTableScan(getCluster(), hintList, getTable(), jdbcTable,
-        (JdbcConvention) getConvention());
+        (JdbcConvention) convention);
   }
 }
diff --git a/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java b/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java
@@ -533,7 +533,7 @@ public Result visit(TableScan e) {
     SqlNode node = identifier;
     if (e instanceof Hintable) {
       final ImmutableList<RelHint> hints = e.getHints();
-      if (hints != null && ! hints.isEmpty()) {
+      if (! hints.isEmpty()) {
         SqlParserPos pos = identifier.getParserPosition();
         node = new SqlTableRef(pos, identifier,
             nodeListOf(pos, hints.stream().map(h -> RelToSqlConverter.toSqlHint(h, pos))));

diff --git a/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java b/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java
@@ -563,7 +563,7 @@ class JdbcAdapterTest {
               return builder
                   .scan("foodmart", "expense_fact")
                   .hints(RelHint.builder("PLACEHOLDERS")
-                      .hintOptions(ImmutableMap.of("a", "b"))
+                      .hintOption("a", "b")
                       .build())
                   .project(builder.field("store_id"))
                   .build();