Skip to content

Commit 4e243ff

Browse files
author
Julien Ruaux
committed
fix: Reverted non-indexed field change
1 parent ae67305 commit 4e243ff

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,15 @@
1212
import static java.util.concurrent.TimeUnit.MINUTES;
1313

1414
import java.util.Collections;
15-
import java.util.LinkedHashMap;
1615
import java.util.List;
17-
import java.util.Map;
1816
import java.util.Optional;
1917
import java.util.Set;
2018
import java.util.stream.Collectors;
2119

2220
import com.google.common.cache.CacheBuilder;
2321
import com.google.common.cache.CacheLoader;
2422
import com.google.common.cache.LoadingCache;
23+
import com.google.common.collect.ImmutableList;
2524
import com.google.common.collect.ImmutableSet;
2625
import com.google.common.util.concurrent.UncheckedExecutionException;
2726
import com.redis.lettucemod.RedisModulesUtils;
@@ -30,7 +29,6 @@
3029
import com.redis.lettucemod.search.AggregateWithCursorResults;
3130
import com.redis.lettucemod.search.CreateOptions;
3231
import com.redis.lettucemod.search.CursorOptions;
33-
import com.redis.lettucemod.search.Document;
3432
import com.redis.lettucemod.search.Field;
3533
import com.redis.lettucemod.search.Group;
3634
import com.redis.lettucemod.search.IndexInfo;
@@ -165,23 +163,13 @@ private RediSearchTable loadTableSchema(SchemaTableName schemaTableName) {
165163
if (indexInfo.isEmpty()) {
166164
throw new TableNotFoundException(schemaTableName, format("Index '%s' not found", index), null);
167165
}
168-
Map<String, RediSearchColumnHandle> columns = new LinkedHashMap<>();
166+
ImmutableList.Builder<RediSearchColumnHandle> columnHandles = ImmutableList.builder();
169167
for (Field columnMetadata : indexInfo.get().getFields()) {
170-
RediSearchColumnHandle columnHandle = buildColumnHandle(columnMetadata);
171-
columns.put(columnHandle.getName(), columnHandle);
172-
}
173-
174-
SearchResults<String, String> results = connection.sync().search(index, "*");
175-
for (Document<String, String> doc : results) {
176-
Set<String> fields = doc.keySet();
177-
fields.removeAll(columns.keySet());
178-
for (String field : fields) {
179-
columns.put(field, new RediSearchColumnHandle(field, VarcharType.VARCHAR, false));
180-
}
168+
columnHandles.add(buildColumnHandle(columnMetadata));
181169
}
182170
RediSearchTableHandle tableHandle = new RediSearchTableHandle(RediSearchTableHandle.Type.SEARCH,
183171
schemaTableName);
184-
return new RediSearchTable(tableHandle, columns.values());
172+
return new RediSearchTable(tableHandle, columnHandles.build());
185173
}
186174

187175
private Optional<IndexInfo> indexInfo(String index) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ protected QueryRunner createQueryRunner() throws Exception {
104104
}
105105

106106
@Test
107-
public void testNonIndexFields() throws IOException {
107+
public void testNonIndexedFields() throws IOException {
108108
Beers.populateIndex(redisearch.getTestContext().getConnection());
109-
getQueryRunner().execute("select id,last_mod from beers");
109+
getQueryRunner().execute("select id, name from beers");
110110
}
111111

112112
@Test

0 commit comments

Comments
 (0)