Added PostgreSQL Adapter and Trino plugin

Author: jruaux

.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+hs_err*.log
 
 ### STS ###
 .apt_generated
@@ -35,4 +36,4 @@ out/
 
 ### VS Code ###
 .vscode/
-.DS_Store
+.DS_Store

build.gradle

@@ -1,8 +1,8 @@
 config {
 	info {
-		description = 'Calcite adapter for RediSearch'
+		description = 'SQL interface for Redis'
 		inceptionYear = '2021'
-		tags = ['calcite', 'redisearch']
+		tags = ['redis', 'sql']
 
 		links {
 			website = "https://github.com/redis-field-engineering/${project.rootProject.name}"

gradle.properties

@@ -8,4 +8,12 @@ kordampPluginVersion=0.47.0
 lettucemodVersion=1.8.1
 testcontainersRedisVersion=1.4.6
 calciteVersion=1.21.0
-jredisearchVersion=2.2.0
+jredisearchVersion=2.2.0
+trinoVersion=365
+ulidVersion=4.1.2
+
+commonsCliVersion=1.4
+guavaVersion=31.0.1-jre
+jsonSimpleVersion=1.1.1
+mockitoVersion=3.2.4
+postgresqlVersion=42.2.5

settings.gradle

@@ -14,14 +14,14 @@ buildscript {
 
 apply plugin: 'org.kordamp.gradle.kordamp-parentbuild'
 
-rootProject.name = 'calcite-redisearch'
+rootProject.name = 'sql-redis'
 
 projects {
     directories = ['subprojects']
 
     plugins {
         all {
-            id 'idea'
+            id 'eclipse'
         }
         path(':') {
             id 'org.kordamp.gradle.java-project'

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

@@ -23,16 +23,12 @@ public class RediSearchSchema extends AbstractSchema {
     public RediSearchSchema(StatefulRedisModulesConnection<String, String> connection, String index) {
         this.connection = connection;
         if (index == null) {
-            this.tableMap = this.createTables(this.indicesFromRediSearch());
+            this.tableMap = this.createTables(connection.sync().list());
         } else {
             this.tableMap = this.createTables(Collections.singletonList(index));
         }
     }
 
-    private List<String> indicesFromRediSearch() {
-        return connection.sync().list();
-    }
-
     private Map<String, Table> createTables(List<String> indices) {
         ImmutableMap.Builder<String, Table> builder = ImmutableMap.builder();
 

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

@@ -1,45 +1,41 @@
 package org.apache.calcite.adapter.redisearch;
 
-import com.google.common.base.Strings;
-import com.redis.lettucemod.RedisModulesClient;
-import com.redis.lettucemod.api.StatefulRedisModulesConnection;
-import io.lettuce.core.RedisURI;
+import java.util.Map;
+import java.util.Objects;
+
 import org.apache.calcite.schema.Schema;
 import org.apache.calcite.schema.SchemaFactory;
 import org.apache.calcite.schema.SchemaPlus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import java.util.Map;
-import java.util.Objects;
+import com.google.common.base.Strings;
+import com.redis.lettucemod.RedisModulesClient;
+import com.redis.lettucemod.api.StatefulRedisModulesConnection;
 
+import io.lettuce.core.RedisURI;
 
 /**
  * Factory that creates a {@link RediSearchSchema}.
  */
-@SuppressWarnings("UnusedDeclaration")
 public class RediSearchSchemaFactory implements SchemaFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(RediSearchSchemaFactory.class);
-
-    @Override
-    public Schema create(SchemaPlus parentSchema, String name, Map<String, Object> operand) {
-        Map map = operand;
-        String uri = (String) map.get("uri");
-        String index = (String) map.get("index");
-        String username = (String) map.get("username");
-        String password = (String) map.get("password");
-        return new RediSearchSchema(connect(uri, username, password), index);
-    }
+	@Override
+	public Schema create(SchemaPlus parentSchema, String name, Map<String, Object> operand) {
+		Map<String, Object> map = operand;
+		String uri = (String) map.get("uri");
+		String index = (String) map.get("index");
+		String username = (String) map.get("username");
+		String password = (String) map.get("password");
+		return new RediSearchSchema(connect(uri, username, password), index);
+	}
 
-    private StatefulRedisModulesConnection<String, String> connect(String uri, String username, String password) {
-        Objects.requireNonNull(uri, "URI");
-        RedisURI redisURI = RedisURI.create(uri);
-        if (!Strings.isNullOrEmpty(username) && !Strings.isNullOrEmpty(password)) {
-            redisURI.setUsername(username);
-            redisURI.setPassword(password.toCharArray());
-        }
-        RedisModulesClient client = RedisModulesClient.create(redisURI);
-        return client.connect();
-    }
+	private StatefulRedisModulesConnection<String, String> connect(String uri, String username, String password) {
+		Objects.requireNonNull(uri, "URI");
+		RedisURI redisURI = RedisURI.create(uri);
+		if (!Strings.isNullOrEmpty(username) && !Strings.isNullOrEmpty(password)) {
+			redisURI.setUsername(username);
+			redisURI.setPassword(password.toCharArray());
+		}
+		RedisModulesClient client = RedisModulesClient.create(redisURI);
+		return client.connect();
+	}
 }

subprojects/postgredis/gradle.properties

@@ -0,0 +1 @@
+project_description = Redis PostgreSQL Adapter

subprojects/postgredis/postgredis.gradle

@@ -0,0 +1,12 @@
+dependencies {
+    implementation project(':calcite-redisearch')
+    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 group: 'com.google.guava', name: 'guava', version: guavaVersion
+    implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion
+    implementation group: 'commons-cli', name: 'commons-cli', version: commonsCliVersion
+    implementation group: 'org.postgresql', name: 'postgresql', version: postgresqlVersion
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
+    testImplementation group: 'com.redis', name: 'lettucemod', version: lettucemodVersion, classifier: 'tests'
+}