Refactored and moved to calcite package for logging purposes

Author: jruaux

subprojects/calcite-redisearch/src/main/java/com/redis/calcite/JavaTypeFactoryExtImpl.java

@@ -1,4 +1,4 @@
-package com.redis.calcite;
+package org.apache.calcite.adapter.redisearch;
 
 import com.google.common.collect.ImmutableMap;
 import org.apache.calcite.plan.RelOptCluster;

subprojects/calcite-redisearch/src/main/java/com/redis/calcite/RediSearchSchema.java

@@ -1,7 +1,6 @@
-package com.redis.calcite;
+package org.apache.calcite.adapter.redisearch;
 
 import com.redis.lettucemod.api.search.Document;
-import com.redis.lettucemod.api.search.Field;
 import com.redis.lettucemod.api.search.SearchResults;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.linq4j.Enumerator;
@@ -10,21 +9,20 @@
 import org.apache.calcite.rel.type.RelDataTypeSystem;
 import org.apache.calcite.rel.type.RelProtoDataType;
 import org.apache.calcite.sql.type.SqlTypeFactoryImpl;
+import org.apache.calcite.sql.type.SqlTypeName;
 
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Enumerator that reads from a RediSearch Regions.
  */
 @Slf4j
 class RediSearchEnumerator implements Enumerator<Object> {
 
-    private final Map<String, Field.Type> indexFields;
     private final Iterator<Document<String, String>> iterator;
-    private final List<RelDataTypeField> fieldTypes;
+    private final List<RelDataTypeField> fields;
     private Document<String, String> current;
 
     /**
@@ -33,15 +31,14 @@ class RediSearchEnumerator implements Enumerator<Object> {
      * @param results      RediSearch search results ({@link SearchResults})
      * @param protoRowType The type of resulting rows
      */
-    RediSearchEnumerator(Map<String, Field.Type> indexFields, SearchResults<String, String> results, RelProtoDataType protoRowType) {
+    RediSearchEnumerator(SearchResults<String, String> results, RelProtoDataType protoRowType) {
         if (results == null) {
             log.warn("Null RediSearch results!");
         }
-        this.indexFields = indexFields;
         this.iterator = (results == null) ? Collections.emptyIterator() : results.iterator();
         this.current = null;
         final RelDataTypeFactory typeFactory = new SqlTypeFactoryImpl(RelDataTypeSystem.DEFAULT);
-        this.fieldTypes = protoRowType.apply(typeFactory).getFieldList();
+        this.fields = protoRowType.apply(typeFactory).getFieldList();
     }
 
     /**
@@ -51,7 +48,35 @@ class RediSearchEnumerator implements Enumerator<Object> {
      */
     @Override
     public Object current() {
-        return RediSearchUtils.convertToRowValues(fieldTypes, indexFields, current);
+        if (fields.size() == 1) {
+            // If we just have one field, produce it directly
+            RelDataTypeField field = fields.get(0);
+            return currentRowField(field.getName(), field.getType().getSqlTypeName());
+        } else {
+            // Build an array with all fields in this row
+            Object[] row = new Object[fields.size()];
+            for (int i = 0; i < fields.size(); i++) {
+                RelDataTypeField field = fields.get(i);
+                row[i] = currentRowField(field.getName(), field.getType().getSqlTypeName());
+            }
+            return row;
+        }
+    }
+
+    /** Get a field for the current row from the underlying object.
+     *
+     * @param name Name of the field within the Row object
+     * @param type Type of the field in this row
+     */
+    private Object currentRowField(String name, SqlTypeName type) {
+        String fieldValue = current.get(name);
+        if (fieldValue == null) {
+            return null;
+        }
+        if (type.equals(SqlTypeName.DOUBLE)) {
+            return Double.parseDouble(fieldValue);
+        }
+        return fieldValue;
     }
 
     @Override

subprojects/calcite-redisearch/src/main/java/com/redis/calcite/RediSearchUtils.java

@@ -1,4 +1,4 @@
-package com.redis.calcite;
+package org.apache.calcite.adapter.redisearch;
 
 import com.google.common.base.Preconditions;
 import com.redis.lettucemod.api.search.Field;
@@ -39,7 +39,7 @@ public class RediSearchFilter extends Filter implements RediSearchRel {
 
     public RediSearchFilter(RelOptCluster cluster, RelTraitSet traitSet, RelNode child, RexNode condition, Map<String, Field.Type> indexFields) {
         super(cluster, traitSet, child, condition);
-        assert getConvention() == RediSearchRel.CONVENTION;
+        assert getConvention() == CONVENTION;
         assert getConvention() == child.getConvention();
         this.indexFields = indexFields;
     }
@@ -67,15 +67,11 @@ public void implement(RediSearchImplementContext rediSearchImplementContext) {
      * Translates {@link RexNode} expressions into RediSearch expression strings.
      */
     public static class Translator {
-        @SuppressWarnings("unused")
-        private final RelDataType rowType;
         private final List<String> fieldNames;
         private final Map<String, Field.Type> indexFields;
-        @SuppressWarnings("unused")
-        private RexBuilder rexBuilder;
+        private final RexBuilder rexBuilder;
 
         Translator(RelDataType rowType, RexBuilder rexBuilder, Map<String, Field.Type> indexFields) {
-            this.rowType = rowType;
             this.rexBuilder = rexBuilder;
             this.fieldNames = RediSearchRules.rediSearchFieldNames(rowType);
             this.indexFields = indexFields;

subprojects/calcite-redisearch/src/main/java/com/redis/calcite/package-info.java

@@ -1,4 +1,4 @@
-package com.redis.calcite;
+package org.apache.calcite.adapter.redisearch;
 
 import org.apache.calcite.plan.RelOptCluster;
 import org.apache.calcite.plan.RelOptCost;

subprojects/calcite-redisearch/src/main/java/com/redis/calcite/RediSearchAggregate.java renamed to subprojects/calcite-redisearch/src/main/java/org/apache/calcite/adapter/redisearch/RediSearchAggregate.java

@@ -1,4 +1,4 @@
-package com.redis.calcite;
+package org.apache.calcite.adapter.redisearch;
 
 import org.apache.calcite.plan.Convention;
 import org.apache.calcite.plan.RelOptTable;

subprojects/calcite-redisearch/src/main/java/com/redis/calcite/RediSearchEnumerator.java renamed to subprojects/calcite-redisearch/src/main/java/org/apache/calcite/adapter/redisearch/RediSearchEnumerator.java

@@ -1,4 +1,4 @@
-package com.redis.calcite;
+package org.apache.calcite.adapter.redisearch;
 
 import org.apache.calcite.plan.Convention;
 import org.apache.calcite.plan.RelOptRule;
@@ -39,22 +39,6 @@ public class RediSearchRules {
     private RediSearchRules() {
     }
 
-    /**
-     * Returns 'string' if it is a call to item['string'], null otherwise.
-     */
-    static String isItem(RexCall call) {
-        if (call.getOperator() != SqlStdOperatorTable.ITEM) {
-            return null;
-        }
-        final RexNode op0 = call.getOperands().get(0);
-        final RexNode op1 = call.getOperands().get(1);
-
-        if (op0 instanceof RexInputRef && ((RexInputRef) op0).getIndex() == 0 && op1 instanceof RexLiteral && ((RexLiteral) op1).getValue2() instanceof String) {
-            return (String) ((RexLiteral) op1).getValue2();
-        }
-        return null;
-    }
-
     static List<String> rediSearchFieldNames(final RelDataType rowType) {
         return SqlValidatorUtil.uniquify(rowType.getFieldNames(), true);
     }
@@ -333,8 +317,7 @@ abstract static class RediSearchConverterRule extends ConverterRule {
 
         final Convention out;
 
-        protected RediSearchConverterRule(Class<? extends RelNode> clazz, RelTrait in, Convention out,
-                                          String description) {
+        protected RediSearchConverterRule(Class<? extends RelNode> clazz, RelTrait in, Convention out, String description) {
             super(clazz, in, out, description);
             this.out = out;
         }