SQL leftovers (#2640)

hazelcast · Nov 5, 2020 · 4ec1e18 · 4ec1e18
1 parent 6a74b4a
commit 4ec1e18
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/hazelcast-jet-core/src/main/java/com/hazelcast/jet/core/JobStatus.java b/hazelcast-jet-core/src/main/java/com/hazelcast/jet/core/JobStatus.java
@@ -68,8 +68,8 @@ public enum JobStatus {
 
     /**
      * Returns {@code true} if this state is terminal - a job in this state
-     * will never have any other state and will not execute again. It's {@link
-     * #COMPLETED} or {@link #FAILED}.
+     * will never have any other state and will never execute again. It's
+     * {@link #COMPLETED} or {@link #FAILED}.
      */
     public boolean isTerminal() {
         return this == COMPLETED || this == FAILED;

diff --git a/...cast-jet-sql/src/main/java/com/hazelcast/jet/sql/impl/connector/map/IMapSqlConnector.java b/...cast-jet-sql/src/main/java/com/hazelcast/jet/sql/impl/connector/map/IMapSqlConnector.java
@@ -144,7 +144,7 @@ public Vertex sink(
         QueryDataType[] types = fields.stream().map(TableField::getType).toArray(QueryDataType[]::new);
 
         Vertex vStart = dag.newVertex(
-                "Project(IMap" + "[" + table.getSchemaName() + "." + table.getSqlName() + "])",
+                "Project(" + toString(table) + ")",
                 KvProcessors.entryProjector(
                         paths,
                         types,
@@ -154,11 +154,15 @@ public Vertex sink(
         );
 
         Vertex vEnd = dag.newVertex(
-                "IMap[" + table.getSchemaName() + "." + table.getSqlName() + ']',
+                toString(table),
                 SinkProcessors.writeMapP(table.getMapName())
         );
 
         dag.edge(between(vStart, vEnd));
         return vStart;
     }
+
+    private static String toString(PartitionedMapTable table) {
+        return "IMap" + "[" + table.getSchemaName() + "." + table.getSqlName() + "]";
+    }
 }
diff --git a/hazelcast-jet-sql/src/main/java/com/hazelcast/jet/sql/impl/opt/logical/LogicalRules.java b/hazelcast-jet-sql/src/main/java/com/hazelcast/jet/sql/impl/opt/logical/LogicalRules.java
@@ -60,11 +60,12 @@ public static RuleSet getRuleSet() {
                 ValuesReduceRule.PROJECT_FILTER_INSTANCE,
                 ValuesUnionLogicalRule.INSTANCE,
 
-                PruneEmptyRules.PROJECT_INSTANCE,
-                PruneEmptyRules.FILTER_INSTANCE,
-
                 // Insert rules
-                InsertLogicalRule.INSTANCE
+                InsertLogicalRule.INSTANCE,
+
+                // Miscellaneous
+                PruneEmptyRules.PROJECT_INSTANCE,
+                PruneEmptyRules.FILTER_INSTANCE
         );
     }
 }
diff --git a/hazelcast-jet-sql/src/main/java/com/hazelcast/jet/sql/impl/type/converter/ToConverter.java b/hazelcast-jet-sql/src/main/java/com/hazelcast/jet/sql/impl/type/converter/ToConverter.java
@@ -24,7 +24,7 @@
  * Complementary interface to {@link Converter} that converts values back to
  * the class returned by {@link Converter#getValueClass()}.
  */
-public abstract class   ToConverter {
+public abstract class ToConverter {
 
     private final Class<?> normalizedValueClass;