Fixes #1032, re-does #1005: exclude $vector and $vectorize from defau…

…lt projection
stargate · Apr 17, 2024 · 7a2acaf · 7a2acaf
1 parent 9c94930
commit 7a2acaf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/src/main/java/io/stargate/sgv2/jsonapi/service/projection/DocumentProjector.java b/src/main/java/io/stargate/sgv2/jsonapi/service/projection/DocumentProjector.java
@@ -52,21 +52,11 @@ private DocumentProjector(
   }
 
   public static DocumentProjector defaultProjector() {
-    /* 16-Apr-2024, tatu: For v1.0.6 need to revert to default being
-         "include all", and then go back to "exclude $vector/$vectorize"
-         for v1.0.7 or later.
-    */
-    // return DefaultProjectorWrapper.defaultProjector();
-    return INCLUDE_ALL_PROJECTOR;
+    return DefaultProjectorWrapper.defaultProjector();
   }
 
   public static DocumentProjector defaultProjectorWithSimilarity() {
-    /* 16-Apr-2024, tatu: For v1.0.6 need to revert to default being
-         "include all", and then go back to "exclude $vector/$vectorize"
-         for v1.0.7 or later.
-    */
-    // return DefaultProjectorWrapper.defaultProjectorWithSimilarity();
-    return INCLUDE_ALL_PROJECTOR_WITH_SIMILARITY;
+    return DefaultProjectorWrapper.defaultProjectorWithSimilarity();
   }
 
   public static DocumentProjector includeAllProjector() {

diff --git a/src/test/java/io/stargate/sgv2/jsonapi/api/v1/FindOneAndUpdateNoIndexIntegrationTest.java b/src/test/java/io/stargate/sgv2/jsonapi/api/v1/FindOneAndUpdateNoIndexIntegrationTest.java
@@ -124,7 +124,6 @@ public void byIdAfterUpdate() {
                         "name": "Joe",
                         "age": 42,
                         "enabled": true,
-                        "$vector" : [ 0.5, -0.25 ],
                         "value": -1
                       }
                       """))

diff --git a/src/test/java/io/stargate/sgv2/jsonapi/service/projection/DocumentProjectorTest.java b/src/test/java/io/stargate/sgv2/jsonapi/service/projection/DocumentProjectorTest.java
@@ -310,8 +310,6 @@ public void defaultProjectionMixAll() throws Exception {
                       {
                          "_id" : 1,
                          "value1": 42,
-                         "$vectorize": "Quick brown fox",
-                         "$vector": [0.0, 1.0],
                          "value2": -3
                       }
                       """));