feat: Support projecting non-indexed fields. Resolves #4

Author: Julien Ruaux

subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchSession.java

@@ -12,15 +12,16 @@
 import static java.util.concurrent.TimeUnit.MINUTES;
 
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import com.redis.lettucemod.RedisModulesUtils;
@@ -29,6 +30,7 @@
 import com.redis.lettucemod.search.AggregateWithCursorResults;
 import com.redis.lettucemod.search.CreateOptions;
 import com.redis.lettucemod.search.CursorOptions;
+import com.redis.lettucemod.search.Document;
 import com.redis.lettucemod.search.Field;
 import com.redis.lettucemod.search.Group;
 import com.redis.lettucemod.search.IndexInfo;
@@ -158,26 +160,40 @@ public void dropColumn(SchemaTableName schemaTableName, String columnName) {
 	}
 
 	private RediSearchTable loadTableSchema(SchemaTableName schemaTableName) {
-		IndexInfo indexInfo = getIndexInfo(schemaTableName.getSchemaName(), schemaTableName.getTableName());
-
-		ImmutableList.Builder<RediSearchColumnHandle> columnHandles = ImmutableList.builder();
-
-		for (Field columnMetadata : indexInfo.getFields()) {
+		String index = schemaTableName.getTableName();
+		Optional<IndexInfo> indexInfo = indexInfo(index);
+		if (indexInfo.isEmpty()) {
+			throw new TableNotFoundException(schemaTableName, format("Index '%s' not found", index), null);
+		}
+		Map<String, RediSearchColumnHandle> columns = new LinkedHashMap<>();
+		for (Field columnMetadata : indexInfo.get().getFields()) {
 			RediSearchColumnHandle columnHandle = buildColumnHandle(columnMetadata);
-			columnHandles.add(columnHandle);
+			columns.put(columnHandle.getName(), columnHandle);
 		}
 
+		SearchResults<String, String> results = connection.sync().search(index, "*");
+		for (Document<String, String> doc : results) {
+			Set<String> fields = doc.keySet();
+			fields.removeAll(columns.keySet());
+			for (String field : fields) {
+				columns.put(field, new RediSearchColumnHandle(field, VarcharType.VARCHAR, false));
+			}
+		}
 		RediSearchTableHandle tableHandle = new RediSearchTableHandle(RediSearchTableHandle.Type.SEARCH,
 				schemaTableName);
-		return new RediSearchTable(tableHandle, columnHandles.build());
+		return new RediSearchTable(tableHandle, columns.values());
 	}
 
-	private IndexInfo getIndexInfo(String schemaName, String tableName) throws TableNotFoundException {
-		if (connection.sync().list().contains(tableName)) {
-			return RedisModulesUtils.indexInfo(connection.sync().indexInfo(tableName));
+	private Optional<IndexInfo> indexInfo(String index) {
+		try {
+			List<Object> indexInfoList = connection.sync().indexInfo(index);
+			if (indexInfoList != null) {
+				return Optional.of(RedisModulesUtils.indexInfo(indexInfoList));
+			}
+		} catch (Exception e) {
+			// Ignore as index might not exist
 		}
-		throw new TableNotFoundException(new SchemaTableName(schemaName, tableName),
-				format("Index '%s' not found", tableName), null);
+		return Optional.empty();
 	}
 
 	private RediSearchColumnHandle buildColumnHandle(Field field) {

subprojects/trino-redisearch/src/main/java/com/redis/trino/RediSearchTable.java

@@ -1,17 +1,18 @@
 package com.redis.trino;
 
-import com.google.common.collect.ImmutableList;
+import static com.google.common.base.MoreObjects.toStringHelper;
 
+import java.util.Collection;
 import java.util.List;
 
-import static com.google.common.base.MoreObjects.toStringHelper;
+import com.google.common.collect.ImmutableList;
 
 public class RediSearchTable {
 
 	private final RediSearchTableHandle tableHandle;
 	private final List<RediSearchColumnHandle> columns;
 
-	public RediSearchTable(RediSearchTableHandle tableHandle, List<RediSearchColumnHandle> columns) {
+	public RediSearchTable(RediSearchTableHandle tableHandle, Collection<RediSearchColumnHandle> columns) {
 		this.tableHandle = tableHandle;
 		this.columns = ImmutableList.copyOf(columns);
 	}

subprojects/trino-redisearch/src/test/java/com/redis/trino/TestRediSearchConnectorSmokeTest.java

@@ -9,11 +9,14 @@
 import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.io.IOException;
+
 import org.testng.SkipException;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Throwables;
+import com.redis.lettucemod.test.Beers;
 
 import io.airlift.log.Logger;
 import io.trino.spi.TrinoException;
@@ -100,6 +103,12 @@ protected QueryRunner createQueryRunner() throws Exception {
 		return RediSearchQueryRunner.createRediSearchQueryRunner(redisearch, CUSTOMER, NATION, ORDERS, REGION);
 	}
 
+	@Test
+	public void testNonIndexFields() throws IOException {
+		Beers.populateIndex(redisearch.getTestContext().getConnection());
+		getQueryRunner().execute("select id,last_mod from beers");
+	}
+
 	@Test
 	public void testHaving() {
 		throw new SkipException("Not supported by RediSearch connector");