fix: IN operator did not work for tags

Author: Julien Ruaux

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

@@ -55,6 +55,7 @@
 import com.redis.lettucemod.search.Reducers.Sum;
 import com.redis.lettucemod.search.querybuilder.Node;
 import com.redis.lettucemod.search.querybuilder.QueryBuilder;
+import com.redis.lettucemod.search.querybuilder.QueryNode;
 import com.redis.lettucemod.search.querybuilder.Value;
 import com.redis.lettucemod.search.querybuilder.Values;
 import com.redis.lettucemod.util.RedisModulesUtils;
@@ -151,13 +152,25 @@ private Optional<Node> buildPredicate(RediSearchColumnHandle column, Domain doma
 				}
 			}
 		}
+		singleValues(column, singleValues).ifPresent(disjuncts::add);
+		return Optional.of(QueryBuilder.union(disjuncts.toArray(Node[]::new)));
+	}
+
+	private Optional<QueryNode> singleValues(RediSearchColumnHandle column, Set<Object> singleValues) {
+		if (singleValues.isEmpty()) {
+			return Optional.empty();
+		}
 		if (singleValues.size() == 1) {
-			disjuncts.add(QueryBuilder.intersect(columnName, value(Iterables.getOnlyElement(singleValues), column)));
-		} else if (singleValues.size() > 1) {
-			disjuncts.add(QueryBuilder.union(columnName,
-					singleValues.stream().map(v -> value(v, column)).toArray(Value[]::new)));
+			return Optional.of(
+					QueryBuilder.intersect(column.getName(), value(Iterables.getOnlyElement(singleValues), column)));
 		}
-		return Optional.of(QueryBuilder.union(disjuncts.toArray(Node[]::new)));
+		if (column.getType() instanceof VarcharType && column.getFieldType() == Field.Type.TAG) {
+			// Takes care of IN: col IN ('value1', 'value2', ...)
+			return Optional
+					.of(QueryBuilder.intersect(column.getName(), Values.tags(singleValues.toArray(String[]::new))));
+		}
+		Value[] values = singleValues.stream().map(v -> value(v, column)).toArray(Value[]::new);
+		return Optional.of(QueryBuilder.union(column.getName(), values));
 	}
 
 	private Value value(Object trinoNativeValue, RediSearchColumnHandle column) {

src/test/java/com/redis/trino/TestRediSearchConnectorSmokeTest.java

@@ -191,4 +191,14 @@ public void testLikePredicate() {
 		assertQuery("SELECT name, regionkey FROM nation WHERE name LIKE 'EGY%'");
 	}
 
+	@Test
+	public void testInPredicate() {
+		assertQuery("SELECT name, regionkey FROM nation WHERE name in ('EGYPT', 'FRANCE')");
+	}
+
+	@Test
+	public void testInPredicateNumeric() {
+		assertQuery("SELECT name, regionkey FROM nation WHERE regionKey in (1, 2, 3)");
+	}
+
 }