Skip to content

Commit

Permalink
upgraded to LettuSearch 3.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@jruaux
jruaux committed Mar 1, 2021
1 parent 08d0d12 commit 6b43070
Show file tree
Hide file tree
Showing 2 changed files with 99 additions and 126 deletions.
28 changes: 10 additions & 18 deletions connectors/gen/src/main/java/com/redislabs/riot/gen/GenerateCommand.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
package com.redislabs.riot.gen;

import com.redislabs.lettusearch.RediSearchClient;
import com.redislabs.lettusearch.RediSearchCommands;
import com.redislabs.lettusearch.RediSearchUtils;
import com.redislabs.lettusearch.StatefulRediSearchConnection;
import com.redislabs.lettusearch.index.IndexInfo;
import com.redislabs.lettusearch.index.field.Field;
import com.redislabs.lettusearch.index.field.GeoField;
import com.redislabs.lettusearch.index.field.TagField;
import com.redislabs.lettusearch.index.field.TextField;
import com.redislabs.lettusearch.*;
import com.redislabs.riot.AbstractImportCommand;
import com.redislabs.riot.KeyValueProcessingOptions;
import io.lettuce.core.RedisURI;
Expand Down Expand Up @@ -50,16 +42,16 @@ protected Flow flow() {
}

private String expression(Field<String> field) {
if (field instanceof TextField) {
return "lorem.paragraph";
switch (field.getType()) {
case TEXT:
return "lorem.paragraph";
case TAG:
return "number.digits(10)";
case GEO:
return "address.longitude.concat(',').concat(address.latitude)";
default:
return "number.randomDouble(3,-1000,1000)";
}
if (field instanceof TagField) {
return "number.digits(10)";
}
if (field instanceof GeoField) {
return "address.longitude.concat(',').concat(address.latitude)";
}
return "number.randomDouble(3,-1000,1000)";
}

private Map<String, String> fakerFields(RedisURI uri) {
Expand Down
197 changes: 89 additions & 108 deletions connectors/gen/src/test/java/com/redislabs/riot/gen/TestGen.java
View file
Original file line number Diff line number Diff line change
@@ -1,120 +1,101 @@
package com.redislabs.riot.gen;

import java.util.List;
import java.util.Map;
import java.util.Set;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import com.redislabs.lettusearch.RediSearchClient;
import com.redislabs.lettusearch.RediSearchCommands;
import com.redislabs.lettusearch.StatefulRediSearchConnection;
import com.redislabs.lettusearch.index.CreateOptions;
import com.redislabs.lettusearch.index.Schema;
import com.redislabs.lettusearch.index.field.NumericField;
import com.redislabs.lettusearch.index.field.PhoneticMatcher;
import com.redislabs.lettusearch.index.field.TagField;
import com.redislabs.lettusearch.index.field.TextField;
import com.redislabs.lettusearch.search.Document;
import com.redislabs.lettusearch.search.SearchResults;
import com.redislabs.lettusearch.*;
import com.redislabs.riot.RiotApp;
import com.redislabs.riot.test.AbstractStandaloneRedisTest;

import io.lettuce.core.Range;
import io.lettuce.core.RedisURI;
import io.lettuce.core.StreamMessage;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class TestGen extends AbstractStandaloneRedisTest {

private RediSearchClient searchClient;

@Override
protected RiotApp app() {
return new RiotGen();
}

@Override
protected String appName() {
return "riot-gen";
}

@Test
public void genFakerHash() throws Exception {
executeFile("/import-hmset.txt");
List<String> keys = sync.keys("person:*");
Assertions.assertEquals(1000, keys.size());
Map<String, String> person = sync.hgetall(keys.get(0));
Assertions.assertTrue(person.containsKey("firstName"));
Assertions.assertTrue(person.containsKey("lastName"));
Assertions.assertTrue(person.containsKey("address"));
}

public void genFakerScriptProcessorHash() throws Exception {
executeFile("/script-processor.txt");
List<String> keys = sync.keys("person:*");
Assertions.assertEquals(100, keys.size());
Map<String, String> person = sync.hgetall(keys.get(0));
Assertions.assertTrue(person.containsKey("firstName"));
Assertions.assertTrue(person.containsKey("lastName"));
Assertions.assertTrue(person.containsKey("address"));
Assertions.assertEquals(person.get("address").toUpperCase(), person.get("address"));
}

@Test
public void genFakerSet() throws Exception {
executeFile("/import-sadd.txt");
Set<String> names = sync.smembers("got:characters");
Assertions.assertTrue(names.size() > 10);
Assertions.assertTrue(names.contains("Lysa Meadows"));
}

@Test
public void genFakerZset() throws Exception {
executeFile("/import-zadd.txt");
List<String> keys = sync.keys("leases:*");
Assertions.assertTrue(keys.size() > 100);
String key = keys.get(0);
Assertions.assertTrue(sync.zcard(key) > 0);
}

@Test
public void genFakerStream() throws Exception {
executeFile("/import-xadd.txt");
List<StreamMessage<String, String>> messages = sync.xrange("teststream:1", Range.unbounded());
Assertions.assertTrue(messages.size() > 0);
}
import java.util.List;
import java.util.Map;
import java.util.Set;

@BeforeEach
public void setupSearch() {
searchClient = RediSearchClient.create(RedisURI.create(redis.getHost(), redis.getFirstMappedPort()));
}
public class TestGen extends AbstractStandaloneRedisTest {

@Test
public void genFakerIndexIntrospection() throws Exception {
String INDEX = "beerIntrospection";
String FIELD_ID = "id";
String FIELD_ABV = "abv";
String FIELD_NAME = "name";
String FIELD_STYLE = "style";
String FIELD_OUNCES = "ounces";
sync.flushall();
Schema<String> schema = Schema.<String>builder()
.field(TagField.<String>builder().name(FIELD_ID).sortable(true).build())
.field(TextField.<String>builder().name(FIELD_NAME).sortable(true).build())
.field(TextField.<String>builder().name(FIELD_STYLE).matcher(PhoneticMatcher.English).sortable(true)
.build())
.field(NumericField.<String>builder().name(FIELD_ABV).sortable(true).build())
.field(NumericField.<String>builder().name(FIELD_OUNCES).sortable(true).build()).build();
StatefulRediSearchConnection<String, String> connection = searchClient.connect();
RediSearchCommands<String, String> searchCommands = connection.sync();
searchCommands.create(INDEX, schema, CreateOptions.<String, String>builder().prefixes("beer:").build());
executeFile("/index-introspection.txt");
SearchResults<String, String> results = searchCommands.search(INDEX, "*");
Assertions.assertEquals(1000, results.getCount());
Document<String, String> doc1 = results.get(0);
Assertions.assertNotNull(doc1.get(FIELD_ABV));
}
private RediSearchClient searchClient;

@Override
protected RiotApp app() {
return new RiotGen();
}

@Override
protected String appName() {
return "riot-gen";
}

@Test
public void genFakerHash() throws Exception {
executeFile("/import-hmset.txt");
List<String> keys = sync.keys("person:*");
Assertions.assertEquals(1000, keys.size());
Map<String, String> person = sync.hgetall(keys.get(0));
Assertions.assertTrue(person.containsKey("firstName"));
Assertions.assertTrue(person.containsKey("lastName"));
Assertions.assertTrue(person.containsKey("address"));
}

public void genFakerScriptProcessorHash() throws Exception {
executeFile("/script-processor.txt");
List<String> keys = sync.keys("person:*");
Assertions.assertEquals(100, keys.size());
Map<String, String> person = sync.hgetall(keys.get(0));
Assertions.assertTrue(person.containsKey("firstName"));
Assertions.assertTrue(person.containsKey("lastName"));
Assertions.assertTrue(person.containsKey("address"));
Assertions.assertEquals(person.get("address").toUpperCase(), person.get("address"));
}

@Test
public void genFakerSet() throws Exception {
executeFile("/import-sadd.txt");
Set<String> names = sync.smembers("got:characters");
Assertions.assertTrue(names.size() > 10);
Assertions.assertTrue(names.contains("Lysa Meadows"));
}

@Test
public void genFakerZset() throws Exception {
executeFile("/import-zadd.txt");
List<String> keys = sync.keys("leases:*");
Assertions.assertTrue(keys.size() > 100);
String key = keys.get(0);
Assertions.assertTrue(sync.zcard(key) > 0);
}

@Test
public void genFakerStream() throws Exception {
executeFile("/import-xadd.txt");
List<StreamMessage<String, String>> messages = sync.xrange("teststream:1", Range.unbounded());
Assertions.assertTrue(messages.size() > 0);
}

@BeforeEach
public void setupSearch() {
searchClient = RediSearchClient.create(RedisURI.create(redis.getHost(), redis.getFirstMappedPort()));
}

@Test
public void genFakerIndexIntrospection() throws Exception {
String INDEX = "beerIntrospection";
String FIELD_ID = "id";
String FIELD_ABV = "abv";
String FIELD_NAME = "name";
String FIELD_STYLE = "style";
String FIELD_OUNCES = "ounces";
sync.flushall();
StatefulRediSearchConnection<String, String> connection = searchClient.connect();
RediSearchCommands<String, String> searchCommands = connection.sync();
searchCommands.create(INDEX, CreateOptions.<String, String>builder().prefix("beer:").build(), Field.tag(FIELD_ID).sortable(true).build(), Field.text(FIELD_NAME).sortable(true).build(), Field.text(FIELD_STYLE).matcher(Field.Text.PhoneticMatcher.English).sortable(true).build(), Field.numeric(FIELD_ABV).sortable(true).build(), Field.numeric(FIELD_OUNCES).sortable(true).build());
executeFile("/index-introspection.txt");
SearchResults<String, String> results = searchCommands.search(INDEX, "*");
Assertions.assertEquals(1000, results.getCount());
Document<String, String> doc1 = results.get(0);
Assertions.assertNotNull(doc1.get(FIELD_ABV));
}

}

0 comments on commit 6b43070

Please sign in to comment.