Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions src/it/java/io/weaviate/integration/CollectionsITest.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import io.weaviate.client6.v1.api.collections.Property;
import io.weaviate.client6.v1.api.collections.Replication;
import io.weaviate.client6.v1.api.collections.VectorIndex;
import io.weaviate.client6.v1.api.collections.config.Shard;
import io.weaviate.client6.v1.api.collections.config.ShardStatus;
import io.weaviate.client6.v1.api.collections.vectorindex.Hnsw;
import io.weaviate.client6.v1.api.collections.vectorizers.NoneVectorizer;
import io.weaviate.containers.Container;
Expand Down Expand Up @@ -159,4 +161,27 @@ public void testUpdateCollection() throws IOException {
.extracting(CollectionConfig::replication).returns(false, Replication::asyncEnabled);
});
}

@Test
public void testShards() throws IOException {
var nsShatteredCups = ns("ShatteredCups");
client.collections.create(nsShatteredCups);
var cups = client.collections.use(nsShatteredCups);

// Act: get initial shard state
var shards = cups.config.getShards();

Assertions.assertThat(shards).as("single-tenant collections has 1 shard").hasSize(1);
var singleShard = shards.get(0);

// Act: flip the status
var wantStatus = singleShard.status().equals("READY") ? ShardStatus.READONLY : ShardStatus.READY;
var updated = cups.config.updateShards(wantStatus, singleShard.name());

Assertions.assertThat(updated)
.as("shard status changed")
.hasSize(1)
.extracting(Shard::status)
.containsOnly(wantStatus.name());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package io.weaviate.client6.v1.api.collections.config;

import java.util.Collections;
import java.util.List;

import org.apache.hc.core5.http.HttpStatus;

import com.google.gson.reflect.TypeToken;

import io.weaviate.client6.v1.internal.json.JSON;
import io.weaviate.client6.v1.internal.rest.Endpoint;

public record GetShardsRequest(String collectionName) {

@SuppressWarnings("unchecked")
public static final Endpoint<GetShardsRequest, List<Shard>> _ENDPOINT = Endpoint.of(
request -> "GET",
request -> "/schema/" + request.collectionName + "/shards", // TODO: tenant support
(gson, request) -> null,
request -> Collections.emptyMap(),
code -> code != HttpStatus.SC_SUCCESS,
(gson, response) -> (List<Shard>) JSON.deserialize(response, TypeToken.getParameterized(
List.class, Shard.class)));
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package io.weaviate.client6.v1.api.collections.config;

import com.google.gson.annotations.SerializedName;

public record Shard(
@SerializedName("name") String name,
@SerializedName("status") String status,
@SerializedName("vectorQueueSize") long vectorQueueSize) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package io.weaviate.client6.v1.api.collections.config;

import com.google.gson.annotations.SerializedName;

public enum ShardStatus {
@SerializedName("READY")
READY,
@SerializedName("READONLY")
READONLY;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package io.weaviate.client6.v1.api.collections.config;

import java.util.Collections;
import java.util.Map;

import org.apache.hc.core5.http.HttpStatus;

import io.weaviate.client6.v1.internal.json.JSON;
import io.weaviate.client6.v1.internal.rest.Endpoint;

public record UpdateShardStatusRequest(String collection, String shard, ShardStatus status) {
public static final Endpoint<UpdateShardStatusRequest, Void> _ENDPOINT = Endpoint.of(
request -> "PUT",
request -> "/schema/" + request.collection + "/shards/" + request.shard,
(gson, request) -> JSON.serialize(Map.of("status", request.status)),
request -> Collections.emptyMap(),
code -> code != HttpStatus.SC_SUCCESS,
(gson, response) -> null);
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package io.weaviate.client6.v1.api.collections.config;

import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.function.Function;

Expand Down Expand Up @@ -45,4 +47,21 @@ public void update(String collectionName,
this.restTransport.performRequest(UpdateCollectionRequest.of(thisCollection, fn),
UpdateCollectionRequest._ENDPOINT);
}

public List<Shard> getShards() throws IOException {
return this.restTransport.performRequest(new GetShardsRequest(collection.name()), GetShardsRequest._ENDPOINT);
}

public List<Shard> updateShards(ShardStatus status, String... shards) throws IOException {
return updateShards(status, Arrays.asList(shards));
}

public List<Shard> updateShards(ShardStatus status, List<String> shards) throws IOException {
for (var shard : shards) {
this.restTransport.performRequest(
new UpdateShardStatusRequest(collection.name(), shard, status),
UpdateShardStatusRequest._ENDPOINT);
}
return getShards();
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package io.weaviate.client6.v1.api.collections.config;

import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
Expand Down Expand Up @@ -48,4 +50,22 @@ public CompletableFuture<Void> update(String collectionName,
UpdateCollectionRequest._ENDPOINT);
});
}

public CompletableFuture<List<Shard>> getShards() {
return this.restTransport.performRequestAsync(new GetShardsRequest(collectionDescriptor.name()),
GetShardsRequest._ENDPOINT);
}

public CompletableFuture<List<Shard>> updateShards(ShardStatus status, String... shards) throws IOException {
return updateShards(status, Arrays.asList(shards));
}

public CompletableFuture<List<Shard>> updateShards(ShardStatus status, List<String> shards) throws IOException {
var updates = shards.stream().map(
shard -> this.restTransport.performRequestAsync(
new UpdateShardStatusRequest(collectionDescriptor.name(), shard, status),
UpdateShardStatusRequest._ENDPOINT))
.toArray(CompletableFuture[]::new);
return CompletableFuture.allOf(updates).thenCompose(__ -> getShards());
}
}