build: Fixed dockerfile

Author: Julien Ruaux

.github/workflows/release.yml

@@ -32,9 +32,7 @@ jobs:
         run: |
           VERSION=${{ github.event.inputs.version }}
           sed -i -e "s/^\:project-version\:\ .*/:project-version: $VERSION/g" README.adoc
-          sed -i -e "s/^ARG TRINO_VERSION=.*/ARG TRINO_VERSION=$VERSION/g" Dockerfile
           git add README.adoc
-          git add Dockerfile
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config --global user.name "GitHub Action"
           git commit -a -m "Releasing version $VERSION"

Dockerfile

@@ -12,7 +12,7 @@ COPY --from=builder --chown=trino:trino /root/trino-redisearch/target/trino-redi
 
 USER root:root
 RUN apt-get update
-RUN apt-get install -y -q gettext
+RUN apt-get install -y -q gettext uuid-runtime
 COPY --chown=trino:trino docker/etc /etc/trino
 COPY docker/template docker/setup.sh /tmp/
 

README.adoc

@@ -3,7 +3,7 @@
 :project-owner:   redis-field-engineering
 :project-name:    redis-sql
 :project-group:   com.redis
-:project-version: 393
+:project-version: 0.2.4-SNAPSHOT
 :artifact-id:     trino-redisearch
 :codecov-token:   CQFF495IPH
 

pom.xml

@@ -16,7 +16,7 @@
 
 	<properties>
 		<trino.version>395</trino.version>
-		<lettucemod.version>3.1.2</lettucemod.version>
+		<lettucemod.version>3.1.5</lettucemod.version>
 		<lettuce.version>6.2.0.RELEASE</lettuce.version>
 		<testcontainers-redis.version>1.6.2</testcontainers-redis.version>
 		<ulid.version>5.0.0</ulid.version>
@@ -367,4 +367,29 @@
 		</dependency>
 	</dependencies>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.8</version>
+				<executions>
+					<execution>
+						<id>prepare-agent</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>

src/main/java/com/redis/trino/MetricAggregation.java

@@ -45,6 +45,7 @@
 import io.trino.spi.type.Type;
 
 public class MetricAggregation {
+
 	public static final String MAX = "max";
 	public static final String MIN = "min";
 	public static final String AVG = "avg";

src/main/java/com/redis/trino/RediSearchClientModule.java

@@ -32,11 +32,7 @@
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Scopes;
-import com.redis.lettucemod.util.RedisClientBuilder;
-import com.redis.lettucemod.util.RedisClientOptions;
-import com.redis.lettucemod.util.RedisClientOptions.Builder;
 
-import io.lettuce.core.SslVerifyMode;
 import io.trino.spi.type.TypeManager;
 
 public class RediSearchClientModule implements Module {
@@ -55,19 +51,7 @@ public void configure(Binder binder) {
 	@Provides
 	public static RediSearchSession createRediSearchSession(TypeManager typeManager, RediSearchConfig config) {
 		requireNonNull(config, "config is null");
-		Builder options = RedisClientOptions.builder();
-		options.uriString(config.getUri());
-		options.ssl(config.isTls());
-		options.username(config.getUsername());
-		options.password(config.getPassword());
-		if (config.isInsecure()) {
-			options.sslVerifyMode(SslVerifyMode.NONE);
-		}
-		if (config.getTimeout() > 0) {
-			options.timeoutInSeconds(config.getTimeout());
-		}
-		RedisClientBuilder clientBuilder = RedisClientBuilder.create(options.build());
-		return new RediSearchSession(typeManager, clientBuilder.client(), config);
+		return new RediSearchSession(typeManager, config);
 	}
 
 }

src/main/java/com/redis/trino/RediSearchConfig.java

@@ -23,6 +23,7 @@
  */
 package com.redis.trino;
 
+import java.io.File;
 import java.time.Duration;
 import java.util.Optional;
 
@@ -33,6 +34,7 @@
 import io.airlift.configuration.Config;
 import io.airlift.configuration.ConfigDescription;
 import io.airlift.configuration.ConfigSecuritySensitive;
+import io.airlift.configuration.validation.FileExists;
 
 public class RediSearchConfig {
 
@@ -46,13 +48,18 @@ public class RediSearchConfig {
 	private Optional<String> username = Optional.empty();
 	private Optional<String> password = Optional.empty();
 	private boolean insecure;
-	private boolean tls;
 	private long timeout; // Use Lettuce default
 	private boolean caseInsensitiveNameMatching;
 	private long defaultLimit = DEFAULT_LIMIT;
 	private long cursorCount; // Use RediSearch default
 	private long tableCacheExpiration = DEFAULT_TABLE_CACHE_EXPIRATION.toSeconds();
 	private long tableCacheRefresh = DEFAULT_TABLE_CACHE_REFRESH.toSeconds();
+	private boolean cluster;
+	private boolean tls;
+	private File caCertPath;
+	private File keyPath;
+	private File certPath;
+	private String keyPassword;
 
 	@Min(0)
 	public long getCursorCount() {
@@ -169,26 +176,78 @@ public RediSearchConfig setInsecure(boolean insecure) {
 		return this;
 	}
 
+	@Min(0)
+	public long getTimeout() {
+		return timeout;
+	}
+
+	@Config("redisearch.timeout")
+	@ConfigDescription("Redis command timeout in seconds")
+	public RediSearchConfig setTimeout(long timeout) {
+		this.timeout = timeout;
+		return this;
+	}
+
 	public boolean isTls() {
 		return tls;
 	}
 
-	@Config("redisearch.tls")
+	@Config("redisearch.tls.enabled")
 	@ConfigDescription("Establish a secure TLS connection")
 	public RediSearchConfig setTls(boolean tls) {
 		this.tls = tls;
 		return this;
 	}
 
-	@Min(0)
-	public long getTimeout() {
-		return timeout;
+	public boolean isCluster() {
+		return cluster;
 	}
 
-	@Config("redisearch.timeout")
-	@ConfigDescription("Redis command timeout in seconds")
-	public RediSearchConfig setTimeout(long timeout) {
-		this.timeout = timeout;
+	@Config("redisearch.cluster")
+	@ConfigDescription("Connect to a Redis Cluster")
+	public RediSearchConfig setCluster(boolean cluster) {
+		this.cluster = cluster;
+		return this;
+	}
+
+	public Optional<@FileExists File> getCaCertPath() {
+		return Optional.ofNullable(caCertPath);
+	}
+
+	@Config("redisearch.tls.ca-cert-path")
+	public RediSearchConfig setCaCertPath(File path) {
+		this.caCertPath = path;
+		return this;
+	}
+
+	public Optional<@FileExists File> getCertPath() {
+		return Optional.ofNullable(certPath);
+	}
+
+	@Config("redisearch.tls.cert-path")
+	public RediSearchConfig setCertPath(File path) {
+		this.certPath = path;
+		return this;
+	}
+
+	public Optional<@FileExists File> getKeyPath() {
+		return Optional.ofNullable(keyPath);
+	}
+
+	@Config("redisearch.tls.key-path")
+	public RediSearchConfig setKeyPath(File path) {
+		this.keyPath = path;
+		return this;
+	}
+
+	public Optional<String> getKeyPassword() {
+		return Optional.ofNullable(keyPassword);
+	}
+
+	@Config("redisearch.tls.key-password")
+	@ConfigSecuritySensitive
+	public RediSearchConfig setKeyPassword(String password) {
+		this.keyPassword = password;
 		return this;
 	}
 

src/main/java/com/redis/trino/RediSearchMetadata.java

@@ -25,9 +25,7 @@
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toList;
 
 import java.util.Collection;
 import java.util.List;
@@ -88,7 +86,7 @@ public RediSearchMetadata(RediSearchSession rediSearchSession) {
 
 	@Override
 	public List<String> listSchemaNames(ConnectorSession session) {
-		return ImmutableList.of(schemaName);
+		return List.of(schemaName);
 	}
 
 	@Override
@@ -152,7 +150,7 @@ private List<SchemaTableName> listTables(ConnectorSession session, SchemaTablePr
 		if (prefix.getTable().isEmpty()) {
 			return listTables(session, prefix.getSchema());
 		}
-		return ImmutableList.of(prefix.toSchemaTableName());
+		return List.of(prefix.toSchemaTableName());
 	}
 
 	@Override
@@ -196,7 +194,7 @@ public ConnectorOutputTableHandle beginCreateTable(ConnectorSession session, Con
 		setRollback(() -> rediSearchSession.dropTable(tableMetadata.getTable()));
 
 		return new RediSearchOutputTableHandle(tableMetadata.getTable(),
-				columns.stream().filter(c -> !c.isHidden()).collect(toList()));
+				columns.stream().filter(c -> !c.isHidden()).toList());
 	}
 
 	@Override
@@ -217,7 +215,7 @@ public ConnectorInsertTableHandle beginInsert(ConnectorSession session, Connecto
 		List<RediSearchColumnHandle> columns = rediSearchSession.getTable(table.getSchemaTableName()).getColumns();
 
 		return new RediSearchInsertTableHandle(table.getSchemaTableName(),
-				columns.stream().filter(column -> !column.isHidden()).collect(toImmutableList()));
+				columns.stream().filter(column -> !column.isHidden()).toList());
 	}
 
 	@Override
@@ -231,7 +229,7 @@ public Optional<ConnectorOutputMetadata> finishInsert(ConnectorSession session,
 	public ConnectorTableProperties getTableProperties(ConnectorSession session, ConnectorTableHandle table) {
 		RediSearchTableHandle handle = (RediSearchTableHandle) table;
 		return new ConnectorTableProperties(handle.getConstraint(), Optional.empty(), Optional.empty(),
-				Optional.empty(), ImmutableList.of());
+				Optional.empty(), List.of());
 	}
 
 	@Override
@@ -334,15 +332,14 @@ private static SchemaTableName getTableName(ConnectorTableHandle tableHandle) {
 	private ConnectorTableMetadata getTableMetadata(ConnectorSession session, SchemaTableName tableName) {
 		RediSearchTableHandle tableHandle = rediSearchSession.getTable(tableName).getTableHandle();
 
-		List<ColumnMetadata> columns = ImmutableList
-				.copyOf(getColumnHandles(session, tableHandle).values().stream().map(RediSearchColumnHandle.class::cast)
-						.map(RediSearchColumnHandle::toColumnMetadata).collect(toList()));
+		List<ColumnMetadata> columns = ImmutableList.copyOf(getColumnHandles(session, tableHandle).values().stream()
+				.map(RediSearchColumnHandle.class::cast).map(RediSearchColumnHandle::toColumnMetadata).toList());
 
 		return new ConnectorTableMetadata(tableName, columns);
 	}
 
 	private static List<RediSearchColumnHandle> buildColumnHandles(ConnectorTableMetadata tableMetadata) {
 		return tableMetadata.getColumns().stream()
-				.map(m -> new RediSearchColumnHandle(m.getName(), m.getType(), m.isHidden())).collect(toList());
+				.map(m -> new RediSearchColumnHandle(m.getName(), m.getType(), m.isHidden())).toList();
 	}
 }

src/main/java/com/redis/trino/RediSearchPageSink.java

@@ -83,8 +83,8 @@ public class RediSearchPageSink implements ConnectorPageSink {
 	private final List<RediSearchColumnHandle> columns;
 	private final UlidFactory factory = UlidFactory.newInstance(new Random());
 
-	public RediSearchPageSink(RediSearchConfig config, RediSearchSession rediSearchSession,
-			SchemaTableName schemaTableName, List<RediSearchColumnHandle> columns) {
+	public RediSearchPageSink(RediSearchSession rediSearchSession, SchemaTableName schemaTableName,
+			List<RediSearchColumnHandle> columns) {
 		this.rediSearchSession = rediSearchSession;
 		this.schemaTableName = schemaTableName;
 		this.columns = columns;
@@ -140,8 +140,8 @@ private String getObjectValue(Type type, Block block, int position) {
 		if (type instanceof VarcharType) {
 			return type.getSlice(block, position).toStringUtf8();
 		}
-		if (type instanceof CharType) {
-			return padSpaces(type.getSlice(block, position), ((CharType) type)).toStringUtf8();
+		if (type instanceof CharType charType) {
+			return padSpaces(type.getSlice(block, position), charType).toStringUtf8();
 		}
 		if (type.equals(VarbinaryType.VARBINARY)) {
 			return new String(type.getSlice(block, position).getBytes());
@@ -162,8 +162,8 @@ private String getObjectValue(Type type, Block block, int position) {
 			long millisUtc = unpackMillisUtc(type.getLong(block, position));
 			return String.valueOf(millisUtc);
 		}
-		if (type instanceof DecimalType) {
-			return readBigDecimal((DecimalType) type, block, position).toPlainString();
+		if (type instanceof DecimalType decimalType) {
+			return readBigDecimal(decimalType, block, position).toPlainString();
 		}
 		throw new TrinoException(NOT_SUPPORTED, "unsupported type: " + type);
 	}

src/main/java/com/redis/trino/RediSearchPageSinkProvider.java

@@ -23,37 +23,35 @@
  */
 package com.redis.trino;
 
+import javax.inject.Inject;
+
 import io.trino.spi.connector.ConnectorInsertTableHandle;
 import io.trino.spi.connector.ConnectorOutputTableHandle;
 import io.trino.spi.connector.ConnectorPageSink;
 import io.trino.spi.connector.ConnectorPageSinkProvider;
 import io.trino.spi.connector.ConnectorSession;
 import io.trino.spi.connector.ConnectorTransactionHandle;
 
-import javax.inject.Inject;
-
 public class RediSearchPageSinkProvider implements ConnectorPageSinkProvider {
 
-	private final RediSearchConfig config;
 	private final RediSearchSession rediSearchSession;
 
 	@Inject
-	public RediSearchPageSinkProvider(RediSearchConfig config, RediSearchSession rediSearchSession) {
-		this.config = config;
+	public RediSearchPageSinkProvider(RediSearchSession rediSearchSession) {
 		this.rediSearchSession = rediSearchSession;
 	}
 
 	@Override
 	public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session,
 			ConnectorOutputTableHandle outputTableHandle) {
 		RediSearchOutputTableHandle handle = (RediSearchOutputTableHandle) outputTableHandle;
-		return new RediSearchPageSink(config, rediSearchSession, handle.getSchemaTableName(), handle.getColumns());
+		return new RediSearchPageSink(rediSearchSession, handle.getSchemaTableName(), handle.getColumns());
 	}
 
 	@Override
 	public ConnectorPageSink createPageSink(ConnectorTransactionHandle transactionHandle, ConnectorSession session,
 			ConnectorInsertTableHandle insertTableHandle) {
 		RediSearchInsertTableHandle handle = (RediSearchInsertTableHandle) insertTableHandle;
-		return new RediSearchPageSink(config, rediSearchSession, handle.getSchemaTableName(), handle.getColumns());
+		return new RediSearchPageSink(rediSearchSession, handle.getSchemaTableName(), handle.getColumns());
 	}
 }