Merge branch 'main' into feat/ssb

Author: bevzzz

src/it/java/io/weaviate/containers/Weaviate.java

@@ -300,7 +300,8 @@ public Weaviate build() {
         c.withEnv("ENABLE_MODULES", String.join(",", enableModules));
       }
 
-      c.withEnv("OBJECTS_TTL_DELETE_SCHEDULE", "0 */6 * * *");
+      // Required in v1.36.1, but we'll just set it by default.
+      c.withEnv("OBJECTS_TTL_DELETE_SCHEDULE", "@hourly");
 
       var apiKeyUsers = new HashSet<String>();
       apiKeyUsers.addAll(adminUsers);

src/it/java/io/weaviate/integration/CollectionsITest.java

@@ -20,6 +20,7 @@
 import io.weaviate.client6.v1.api.collections.Replication;
 import io.weaviate.client6.v1.api.collections.Replication.AsyncReplicationConfig;
 import io.weaviate.client6.v1.api.collections.VectorConfig;
+import io.weaviate.client6.v1.api.collections.config.PropertyIndexType;
 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.generative.DummyGenerative;
@@ -330,6 +331,47 @@ public void test_objectTtl() throws IOException {
         .returns(false, ObjectTtl::enabled);
   }
 
+  @Test
+  public void test_dropPropertyIndex() throws IOException {
+    Weaviate.Version.V136.orSkip();
+
+    // Arrange
+    var nsThings = ns("Things");
+    var things = client.collections.create(nsThings,
+        c -> c.properties(
+            Property.text("title", p -> p
+                .indexFilterable(true)
+                .indexSearchable(true)),
+            Property.integer("size", p -> p
+                .indexRangeFilters(true))));
+
+    var config = things.config.get();
+    Assertions.assertThat(config).get()
+        .extracting(CollectionConfig::properties, InstanceOfAssertFactories.list(Property.class))
+        .allSatisfy(property -> {
+          boolean isNumeric = property.dataTypes().contains(DataType.INT);
+
+          Assertions.assertThat(property)
+              .returns(true, Property::indexFilterable)
+              .returns(!isNumeric, Property::indexSearchable)
+              .returns(isNumeric, Property::indexRangeFilters);
+        });
+
+    things.config.dropPropertyIndex("title", PropertyIndexType.FILTERABLE);
+    things.config.dropPropertyIndex("title", PropertyIndexType.SEARCHABLE);
+
+    things.config.dropPropertyIndex("size", PropertyIndexType.FILTERABLE);
+    things.config.dropPropertyIndex("size", PropertyIndexType.RANGE_FILTERS);
+
+    config = things.config.get();
+    Assertions.assertThat(config).get()
+        .extracting(CollectionConfig::properties, InstanceOfAssertFactories.list(Property.class))
+        .allSatisfy(property -> Assertions.assertThat(property)
+            .returns(false, Property::indexFilterable)
+            .returns(false, Property::indexSearchable)
+            .returns(false, Property::indexRangeFilters));
+    }
+ 
   @Test
   public void test_asyncReplicationConfig() throws IOException {
     Weaviate.Version.latest().orSkip();

src/main/java/io/weaviate/client6/v1/api/collections/config/DeletePropertyIndexRequest.java

@@ -0,0 +1,14 @@
+package io.weaviate.client6.v1.api.collections.config;
+
+import java.util.Collections;
+
+import io.weaviate.client6.v1.internal.rest.Endpoint;
+import io.weaviate.client6.v1.internal.rest.SimpleEndpoint;
+
+public record DeletePropertyIndexRequest(String collectionName, String propertyName, PropertyIndexType indexType) {
+  public static final Endpoint<DeletePropertyIndexRequest, Void> _ENDPOINT = SimpleEndpoint.sideEffect(
+      request -> "DELETE",
+      request -> "/schema/" + request.collectionName + "/properties/" + request.propertyName + "/index/"
+          + request.indexType.toString(),
+      request -> Collections.emptyMap());
+}

src/main/java/io/weaviate/client6/v1/api/collections/config/PropertyIndexType.java

@@ -0,0 +1,18 @@
+package io.weaviate.client6.v1.api.collections.config;
+
+public enum PropertyIndexType {
+  FILTERABLE("filterable"),
+  SEARCHABLE("searchable"),
+  RANGE_FILTERS("rangeFilters");
+
+  private final String value;
+
+  private PropertyIndexType(String value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+}

src/main/java/io/weaviate/client6/v1/api/collections/config/WeaviateConfigClient.java

@@ -52,6 +52,12 @@ public void addProperty(Property property) throws IOException {
         AddPropertyRequest._ENDPOINT);
   }
 
+  public void dropPropertyIndex(String propertyName, PropertyIndexType indexType) throws IOException {
+    this.restTransport.performRequest(
+        new DeletePropertyIndexRequest(collection.collectionName(), propertyName, indexType),
+        DeletePropertyIndexRequest._ENDPOINT);
+  }
+
   public void addReference(String propertyName, String... dataTypes) throws IOException {
     this.addProperty(ReferenceProperty.to(propertyName, dataTypes).toProperty());
   }

src/main/java/io/weaviate/client6/v1/api/collections/config/WeaviateConfigClientAsync.java

@@ -53,6 +53,12 @@ public CompletableFuture<Void> addProperty(Property property) throws IOException
         AddPropertyRequest._ENDPOINT);
   }
 
+  public CompletableFuture<Void> dropPropertyIndex(String propertyName, PropertyIndexType indexType) {
+    return this.restTransport.performRequestAsync(
+        new DeletePropertyIndexRequest(collection.collectionName(), propertyName, indexType),
+        DeletePropertyIndexRequest._ENDPOINT);
+  }
+
   public CompletableFuture<Void> addReference(String name, String... dataTypes) throws IOException {
     return this.addProperty(ReferenceProperty.to(name, dataTypes).toProperty());
   }