Refactored schema factory

Author: jruaux

.gitignore

@@ -35,3 +35,4 @@ out/
 
 ### VS Code ###
 .vscode/
+.DS_Store

build.gradle

@@ -76,4 +76,8 @@ subprojects {
 		enabled = true
 		archiveClassifier = ''
 	}
+
+	sourceCompatibility = 8
+    targetCompatibility = 8
+
 }

gradle.properties

@@ -1,14 +1,11 @@
 group=com.redis
-sourceCompatibility=1.8
-targetCompatibility=1.8
 
-bootPluginVersion=2.5.4
+bootPluginVersion=2.6.1
 dependencyPluginVersion=1.0.11.RELEASE
 kordampBuildVersion=2.6.0
 kordampPluginVersion=0.47.0
-lombokPluginVersion=6.2.0
 
-lettucemodVersion=1.7.3
-testcontainersVersion=1.15.3
-testcontainersRedisVersion=1.3.3
-calciteVersion=1.21.0
+lettucemodVersion=1.8.1
+testcontainersRedisVersion=1.4.6
+calciteVersion=1.21.0
+jredisearchVersion=2.2.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -9,7 +9,6 @@ buildscript {
         classpath "org.kordamp.gradle:kordamp-parentbuild:$kordampBuildVersion"
         classpath "org.springframework.boot:spring-boot-gradle-plugin:$bootPluginVersion"
         classpath "io.spring.gradle:dependency-management-plugin:$dependencyPluginVersion"
-        classpath "io.freefair.gradle:lombok-plugin:$lombokPluginVersion"
     }
 }
 
@@ -32,15 +31,10 @@ projects {
             id 'java-library-distribution'
             id 'org.springframework.boot'
             id 'io.spring.dependency-management'
-            id 'io.freefair.lombok'
         }
     }
 }
 
 enforce {
-    mergeStrategy = 'append'
-
-    rule(enforcer.rules.ForceDependencies) { r ->
-        r.dependencies.addAll "commons-logging:commons-logging:1.2"
-    }
+    enabled = false
 }

subprojects/calcite-redisearch/calcite-redisearch.gradle

@@ -5,17 +5,14 @@ dependencyManagement {
 }
 
 dependencies {
-    compileOnly group: 'org.apache.calcite', name: 'calcite-core', version: calciteVersion
-    compileOnly group: 'org.apache.calcite', name: 'calcite-linq4j', version: calciteVersion
+    implementation group: 'org.apache.calcite', name: 'calcite-core', version: calciteVersion
+    implementation group: 'org.apache.calcite', name: 'calcite-linq4j', version: calciteVersion
     implementation group: 'com.redis', name: 'lettucemod', version: lettucemodVersion
-    implementation 'com.redislabs:jredisearch:2.0.0'
-    testImplementation group: 'org.apache.calcite', name: 'calcite-core', version: calciteVersion
+    implementation group: 'com.redislabs', name: 'jredisearch', version: jredisearchVersion
     testImplementation group: 'org.apache.calcite', name: 'calcite-core', version: calciteVersion, classifier: 'tests'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'
     testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv'
-    testImplementation group: 'com.redis.testcontainers', name: 'testcontainers-redis', version: testcontainersRedisVersion
-    testImplementation group: 'com.redis.testcontainers', name: 'junit-jupiter', version: testcontainersVersion
-
+    testImplementation group: 'com.redis.testcontainers', name: 'testcontainers-redis-junit-jupiter', version: testcontainersRedisVersion
 }

subprojects/calcite-redisearch/src/main/java/org/apache/calcite/adapter/redisearch/RediSearchEnumerator.java

@@ -1,25 +1,28 @@
 package org.apache.calcite.adapter.redisearch;
 
-import com.redis.lettucemod.api.search.Document;
-import com.redis.lettucemod.api.search.SearchResults;
-import lombok.extern.slf4j.Slf4j;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
 import org.apache.calcite.linq4j.Enumerator;
 import org.apache.calcite.rel.type.RelDataTypeFactory;
 import org.apache.calcite.rel.type.RelDataTypeField;
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import com.redis.lettucemod.search.Document;
+import com.redis.lettucemod.search.SearchResults;
 
 /**
  * Enumerator that reads from a RediSearch Regions.
  */
-@Slf4j
 class RediSearchEnumerator implements Enumerator<Object> {
+	
+	private static final Logger log = LoggerFactory.getLogger(RediSearchEnumerator.class);
 
     private final Iterator<Document<String, String>> iterator;
     private final List<RelDataTypeField> fields;

subprojects/calcite-redisearch/src/main/java/org/apache/calcite/adapter/redisearch/RediSearchFilter.java

@@ -1,11 +1,12 @@
 package org.apache.calcite.adapter.redisearch;
 
-import com.google.common.base.Preconditions;
-import com.redis.lettucemod.api.search.Field;
-import io.redisearch.querybuilder.QueryBuilder;
-import io.redisearch.querybuilder.QueryNode;
-import io.redisearch.querybuilder.Value;
-import io.redisearch.querybuilder.Values;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.apache.calcite.plan.RelOptCluster;
 import org.apache.calcite.plan.RelOptCost;
 import org.apache.calcite.plan.RelOptPlanner;
@@ -22,12 +23,13 @@
 import org.apache.calcite.rex.RexNode;
 import org.apache.calcite.sql.SqlKind;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import com.google.common.base.Preconditions;
+import com.redis.lettucemod.search.Field;
+
+import io.redisearch.querybuilder.QueryBuilder;
+import io.redisearch.querybuilder.QueryNode;
+import io.redisearch.querybuilder.Value;
+import io.redisearch.querybuilder.Values;
 
 /**
  * Implementation of

subprojects/calcite-redisearch/src/main/java/org/apache/calcite/adapter/redisearch/RediSearchRules.java

@@ -1,5 +1,8 @@
 package org.apache.calcite.adapter.redisearch;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.calcite.plan.Convention;
 import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.plan.RelOptRuleCall;
@@ -24,9 +27,6 @@
 import org.apache.calcite.sql.type.SqlTypeName;
 import org.apache.calcite.sql.validate.SqlValidatorUtil;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Rules and relational operators for {@link RediSearchRel#CONVENTION}
  * calling convention.

subprojects/calcite-redisearch/src/main/java/org/apache/calcite/adapter/redisearch/RediSearchSchema.java

@@ -1,71 +1,55 @@
 package org.apache.calcite.adapter.redisearch;
 
-import com.google.common.collect.ImmutableMap;
-import com.redis.lettucemod.RedisModulesClient;
-import com.redis.lettucemod.Utils;
-import com.redis.lettucemod.api.StatefulRedisModulesConnection;
-import com.redis.lettucemod.api.search.Field;
-import com.redis.lettucemod.api.search.IndexInfo;
-import io.lettuce.core.RedisURI;
-import org.apache.calcite.rel.type.RelDataTypeFactory;
-import org.apache.calcite.rel.type.RelDataTypeImpl;
-import org.apache.calcite.rel.type.RelDataTypeSystem;
-import org.apache.calcite.rel.type.RelProtoDataType;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.calcite.schema.Table;
 import org.apache.calcite.schema.impl.AbstractSchema;
-import org.apache.calcite.sql.type.SqlTypeFactoryImpl;
-import org.apache.calcite.sql.type.SqlTypeName;
 
-import java.util.Map;
+import com.google.common.collect.ImmutableMap;
+import com.redis.lettucemod.RedisModulesUtils;
+import com.redis.lettucemod.api.StatefulRedisModulesConnection;
+import com.redis.lettucemod.search.IndexInfo;
 
 /**
  * Schema mapped onto a RediSearch index.
  */
 public class RediSearchSchema extends AbstractSchema {
 
-    private final String index;
     private final StatefulRedisModulesConnection<String, String> connection;
-
-    public RediSearchSchema(String uri, String index, String username, String password) {
-        this.index = index;
-        RedisURI redisURI = RedisURI.create(uri);
-        if (username != null && password != null) {
-            redisURI.setUsername(username);
-            redisURI.setPassword(password.toCharArray());
+    private final Map<String, Table> tableMap;
+
+    public RediSearchSchema(StatefulRedisModulesConnection<String, String> connection, String index) {
+        this.connection = connection;
+        if (index == null) {
+            this.tableMap = this.createTables(this.indicesFromRediSearch());
+        } else {
+            this.tableMap = this.createTables(Collections.singletonList(index));
         }
-        RedisModulesClient client = RedisModulesClient.create(redisURI);
-        this.connection = client.connect();
     }
 
-    @Override
-    protected Map<String, Table> getTableMap() {
-        final ImmutableMap.Builder<String, Table> builder = ImmutableMap.builder();
-        builder.put(index, new RediSearchTable(this, index));
-        return builder.build();
+    private List<String> indicesFromRediSearch() {
+        return connection.sync().list();
     }
 
-    public StatefulRedisModulesConnection<String, String> getConnection() {
-        return connection;
-    }
+    private Map<String, Table> createTables(List<String> indices) {
+        ImmutableMap.Builder<String, Table> builder = ImmutableMap.builder();
 
-    public IndexInfo getIndexInfo() {
-        return Utils.indexInfo(connection.sync().indexInfo(index));
+        for (String index : indices) {
+            builder.put(index, new RediSearchTable(connection, indexInfo(index)));
+        }
+
+        return builder.build();
     }
 
-    private SqlTypeName sqlTypeName(Field field) {
-        if (field.getType() == Field.Type.NUMERIC) {
-            return SqlTypeName.DOUBLE;
-        }
-        return SqlTypeName.VARCHAR;
+    @Override
+    protected Map<String, Table> getTableMap() {
+        return this.tableMap;
     }
 
-    public RelProtoDataType getRelDataType() {
-        final RelDataTypeFactory typeFactory = new SqlTypeFactoryImpl(RelDataTypeSystem.DEFAULT);
-        final RelDataTypeFactory.Builder fieldInfo = typeFactory.builder();
-        IndexInfo indexInfo = getIndexInfo();
-        for (Field field : indexInfo.getFields()) {
-            fieldInfo.add(field.getName(), typeFactory.createSqlType(sqlTypeName(field))).nullable(true);
-        }
-        return RelDataTypeImpl.proto(fieldInfo.build());
+    private IndexInfo indexInfo(String index) {
+        return RedisModulesUtils.indexInfo(connection.sync().indexInfo(index));
     }
+
 }