Skip to content

Fix Couchbase FTS support #2350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tchlyah wants to merge 9 commits into from
Closed

Fix Couchbase FTS support #2350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
46c9b13
Fix Couchbase FTS support
tchlyah Feb 12, 2020
88be13d
Code review changes
tchlyah Feb 12, 2020
6fb992c
Merge branch 'master' into couchbase-fts
tchlyah Mar 4, 2020
5dc0dd3
Merge branch 'master' into couchbase-fts
tchlyah Mar 12, 2020
28d9008
Code review changes
tchlyah Mar 13, 2020
ec0d43a
Remove test Couchbase v6.0
tchlyah Mar 13, 2020
51a6916
Merge branch 'master' into couchbase-fts
tchlyah Mar 13, 2020
fd757eb
Merge branch 'master' into couchbase-fts
tchlyah Mar 30, 2020
3102a2e
Merge branch 'master' into couchbase-fts
tchlyah Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package org.testcontainers.couchbase;

import com.couchbase.client.core.service.ServiceType;
import com.couchbase.client.core.utils.Base64;
import com.couchbase.client.java.Bucket;
import com.couchbase.client.java.CouchbaseCluster;
Expand Down Expand Up @@ -288,13 +289,16 @@ public void createBucket(BucketSettings bucketSetting, UserSettings userSettings
} catch (Exception e) {
logger().warn("Unable to insert user '" + bucketSetting.name() + "', maybe you are using older version");
}
Bucket bucket = getCouchbaseCluster().openBucket(bucketSettings.name(), bucketSettings.password());
if (index) {
Bucket bucket = getCouchbaseCluster().openBucket(bucketSettings.name(), bucketSettings.password());
new CouchbaseQueryServiceWaitStrategy(bucket).waitUntilReady(this);
if (primaryIndex) {
bucket.query(Index.createPrimaryIndex().on(bucketSetting.name()));
}
}
if (fts) {
new CouchbaseServiceWaitStrategy(bucket, ServiceType.SEARCH).waitUntilReady(this);
}
}

public void callCouchbaseRestAPI(String url, String payload) throws IOException {
Expand Down Expand Up @@ -453,7 +457,8 @@ private List<UserRole> getDefaultAdminRoles(String bucketName) {
new UserRole("query_update", bucketName),
new UserRole("query_select", bucketName),
new UserRole("query_insert", bucketName),
new UserRole("query_delete", bucketName)
new UserRole("query_delete", bucketName),
new UserRole("fts_admin", bucketName)
);
}

Expand Down
42 changes: 2 additions & 40 deletions ...uchbase/src/main/java/org/testcontainers/couchbase/CouchbaseQueryServiceWaitStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,17 @@
package org.testcontainers.couchbase;

import com.couchbase.client.core.message.cluster.GetClusterConfigRequest;
import com.couchbase.client.core.message.cluster.GetClusterConfigResponse;
import com.couchbase.client.core.service.ServiceType;
import com.couchbase.client.java.Bucket;
import lombok.extern.slf4j.Slf4j;
import org.rnorth.ducttape.TimeoutException;
import org.testcontainers.containers.ContainerLaunchException;
import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;

import java.time.Duration;
import java.util.concurrent.TimeUnit;

import static org.rnorth.ducttape.unreliables.Unreliables.retryUntilSuccess;

/**
* @author ctayeb
* Created on 06/06/2017
*/
@Slf4j
public class CouchbaseQueryServiceWaitStrategy extends AbstractWaitStrategy {

private final Bucket bucket;
public class CouchbaseQueryServiceWaitStrategy extends CouchbaseServiceWaitStrategy {

public CouchbaseQueryServiceWaitStrategy(Bucket bucket) {
this.bucket = bucket;
startupTimeout = Duration.ofSeconds(120);
}

@Override
protected void waitUntilReady() {
log.info("Waiting for {} seconds for QUERY service", startupTimeout.getSeconds());

// try to connect to the URL
try {
retryUntilSuccess((int) startupTimeout.getSeconds(), TimeUnit.SECONDS, () -> {
getRateLimiter().doWhenReady(() -> {
GetClusterConfigResponse clusterConfig = bucket.core()
.<GetClusterConfigResponse>send(new GetClusterConfigRequest())
.toBlocking().single();
boolean queryServiceEnabled = clusterConfig.config()
.bucketConfig(bucket.name())
.serviceEnabled(ServiceType.QUERY);
if (!queryServiceEnabled) {
throw new ContainerLaunchException("Query service not ready yet");
}
});
return true;
});
} catch (TimeoutException e) {
throw new ContainerLaunchException("Timed out waiting for QUERY service");
}
super(bucket, ServiceType.QUERY);
}
}
54 changes: 54 additions & 0 deletions ...es/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseServiceWaitStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package org.testcontainers.couchbase;

import com.couchbase.client.core.message.cluster.GetClusterConfigRequest;
import com.couchbase.client.core.message.cluster.GetClusterConfigResponse;
import com.couchbase.client.core.service.ServiceType;
import com.couchbase.client.java.Bucket;
import lombok.extern.slf4j.Slf4j;
import org.rnorth.ducttape.TimeoutException;
import org.testcontainers.containers.ContainerLaunchException;
import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;

import java.time.Duration;
import java.util.concurrent.TimeUnit;

import static org.rnorth.ducttape.unreliables.Unreliables.retryUntilSuccess;

@Slf4j
class CouchbaseServiceWaitStrategy extends AbstractWaitStrategy {

private final Bucket bucket;

private final ServiceType serviceType;

public CouchbaseServiceWaitStrategy(Bucket bucket, ServiceType serviceType) {
this.bucket = bucket;
this.serviceType = serviceType;
startupTimeout = Duration.ofSeconds(120);
}

@Override
protected void waitUntilReady() {
log.info("Waiting for {} seconds for {} service", startupTimeout.getSeconds(), serviceType);

// try to connect to the URL
try {
retryUntilSuccess((int) startupTimeout.getSeconds(), TimeUnit.SECONDS, () -> {
getRateLimiter().doWhenReady(() -> {
GetClusterConfigResponse clusterConfig = bucket.core()
.<GetClusterConfigResponse>send(new GetClusterConfigRequest())
.toBlocking().single();
boolean serviceEnabled = clusterConfig.config()
.bucketConfig(bucket.name())
.serviceEnabled(serviceType);
if (!serviceEnabled) {
throw new ContainerLaunchException(serviceType + " service not ready yet");
}
});
return true;
});
} catch (TimeoutException e) {
throw new ContainerLaunchException("Timed out waiting for QUERY service");
}
}
}
60 changes: 60 additions & 0 deletions ...s/couchbase/src/test/java/org/testcontainers/couchbase/BaseCouchbaseContainerFtsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package org.testcontainers.couchbase;

import com.couchbase.client.core.message.search.GetSearchIndexRequest;
import com.couchbase.client.core.message.search.GetSearchIndexResponse;
import com.couchbase.client.core.message.search.UpsertSearchIndexRequest;
import com.couchbase.client.core.message.search.UpsertSearchIndexResponse;
import org.junit.Assert;
import org.junit.Test;

public abstract class BaseCouchbaseContainerFtsTest extends BaseCouchbaseContainerTest {
private static final String FTS_INDEX_NAME = "testIndex";
private static final String FTS_INDEX =
"{\n" +
" \"name\": \"name\",\n" +
" \"type\": \"fulltext-index\",\n" +
" \"params\": {\n" +
" \"mapping\": {\n" +
" \"default_mapping\": {\n" +
" \"enabled\": true,\n" +
" \"dynamic\": true\n" +
" },\n" +
" \"default_type\": \"_default\",\n" +
" \"default_analyzer\": \"standard\",\n" +
" \"default_datetime_parser\": \"dateTimeOptional\",\n" +
" \"default_field\": \"_all\",\n" +
" \"store_dynamic\": false,\n" +
" \"index_dynamic\": true\n" +
" },\n" +
" \"store\": {\n" +
" \"indexType\": \"scorch\",\n" +
" \"kvStoreName\": \"\"\n" +
" },\n" +
" \"doc_config\": {\n" +
" \"mode\": \"type_field\",\n" +
" \"type_field\": \"type\",\n" +
" \"docid_prefix_delim\": \"\",\n" +
" \"docid_regexp\": \"\"\n" +
" }\n" +
" },\n" +
" \"sourceType\": \"couchbase\",\n" +
" \"sourceName\": \"" + TEST_BUCKET + "\"\n" +
"}";

@Test
public void shouldCreateFtsIndex() {
UpsertSearchIndexResponse upsertSearchIndexResponse = getBucket().core()
.send(new UpsertSearchIndexRequest(FTS_INDEX_NAME, FTS_INDEX, TEST_BUCKET, DEFAULT_PASSWORD))
.map(UpsertSearchIndexResponse.class::cast)
.toBlocking()
.single();
Assert.assertTrue(upsertSearchIndexResponse.status().isSuccess());

GetSearchIndexResponse getSearchIndexResponse = getBucket().core()
.send(new GetSearchIndexRequest(FTS_INDEX_NAME, TEST_BUCKET, DEFAULT_PASSWORD))
.map(GetSearchIndexResponse.class::cast)
.toBlocking()
.single();
Assert.assertTrue(getSearchIndexResponse.status().isSuccess());
}
}
14 changes: 14 additions & 0 deletions modules/couchbase/src/test/java/org/testcontainers/couchbase/Couchbase6_5Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package org.testcontainers.couchbase;

import org.junit.Rule;

public class Couchbase6_5Test extends BaseCouchbaseContainerFtsTest {

@Rule
public CouchbaseContainer container = initCouchbaseContainer("couchbase:6.5.0").withFts(true);

@Override
public CouchbaseContainer getCouchbaseContainer() {
return container;
}
}