Revert "Fixed failing test cases"

This reverts commit ce28574.

Author: suddendust

document-store/src/integrationTest/java/org/hypertrace/core/documentstore/DocStoreQueryV1Test.java

@@ -68,7 +68,6 @@
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -3277,7 +3276,7 @@ void testFlatPostgresCollectionCount(String dataStoreName) {
 
       // Test count method - all documents
       long totalCount = flatCollection.count(Query.builder().build());
-      assertEquals(14, totalCount);
+      assertEquals(10, totalCount);
 
       // Test count with filter - soap documents only
       Query soapQuery =
@@ -3570,8 +3569,8 @@ void testFlatVsNestedCollectionConsistency(String dataStoreName) throws IOExcept
       Query countAllQuery = Query.builder().build();
       long nestedCount = nestedCollection.count(countAllQuery);
       long flatCount = flatCollection.count(countAllQuery);
-      assertEquals(14, nestedCount, "Nested collection should have 14 documents");
-      assertEquals(14, flatCount, "Flat collection should have 14 documents");
+      assertEquals(8, nestedCount, "Nested collection should have 8 documents");
+      assertEquals(10, flatCount, "Flat collection should have 10 documents");
 
       // Test 2: Filter by top-level field - item
       Query itemFilterQuery =
@@ -3598,16 +3597,16 @@ void testFlatVsNestedCollectionConsistency(String dataStoreName) throws IOExcept
 
       long nestedPriceCount = nestedCollection.count(priceFilterQuery);
       long flatPriceCount = flatCollection.count(priceFilterQuery);
-      assertEquals(4, nestedPriceCount, "Nested should have 4 docs with price > 10");
-      assertEquals(4, flatPriceCount, "Flat should have 4 docs with price > 10");
+      assertEquals(2, nestedPriceCount, "Nested should have 2 docs with price > 10");
+      assertEquals(3, flatPriceCount, "Flat should have 3 docs with price > 10");
 
       // Test 4: Compare actual document content for same filter
       CloseableIterator<Document> nestedIterator = nestedCollection.find(itemFilterQuery);
       CloseableIterator<Document> flatIterator = flatCollection.find(itemFilterQuery);
 
       // Collect documents from both collections
-      List<String> nestedDocs = new ArrayList<>();
-      List<String> flatDocs = new ArrayList<>();
+      java.util.List<String> nestedDocs = new java.util.ArrayList<>();
+      java.util.List<String> flatDocs = new java.util.ArrayList<>();
 
       while (nestedIterator.hasNext()) {
         nestedDocs.add(nestedIterator.next().toJson());
@@ -3716,7 +3715,7 @@ void testFlatPostgresCollectionUnnestTags(String dataStoreName) throws IOExcepti
 
       Iterator<Document> resultIterator = flatCollection.aggregate(unnestQuery);
       assertDocsAndSizeEqualWithoutOrder(
-          dataStoreName, resultIterator, "query/flat_unnest_tags_response.json", 19);
+          dataStoreName, resultIterator, "query/flat_unnest_tags_response.json", 17);
     }
 
     /**

document-store/src/integrationTest/resources/query/collection_data.json

@@ -183,47 +183,5 @@
     "price": 10,
     "quantity": 5,
     "date": "2016-02-06T20:20:13Z"
-  },
-  {
-    "_id": 9,
-    "item": "Bottle",
-    "price": 15,
-    "quantity": 3,
-    "date": "2016-03-01T10:00:00Z"
-  },
-  {
-    "_id": 10,
-    "item": "Cup",
-    "price": 8,
-    "quantity": 2,
-    "date": "2016-04-01T10:00:00Z"
-  },
-  {
-    "_id": 11,
-    "item": "Pencil",
-    "price": 2,
-    "quantity": 50,
-    "date": "2016-05-01T10:00:00Z"
-  },
-  {
-    "_id": 12,
-    "item": "Eraser",
-    "price": 1,
-    "quantity": 100,
-    "date": "2016-06-01T10:00:00Z"
-  },
-  {
-    "_id": 13,
-    "item": "Notebook",
-    "price": 25,
-    "quantity": 10,
-    "date": "2016-07-01T10:00:00Z"
-  },
-  {
-    "_id": 14,
-    "item": "Pen",
-    "price": 5,
-    "quantity": 20,
-    "date": "2016-08-01T10:00:00Z"
   }
 ]

document-store/src/integrationTest/resources/query/flat_integer_array_filter_response.json

@@ -2,9 +2,5 @@
   {
     "item": "Mirror",
     "price": 20
-  },
-  {
-    "item": "Pen",
-    "price": 5
   }
-]
+]

document-store/src/integrationTest/resources/query/flat_jsonb_brand_selection_response.json

@@ -20,9 +20,5 @@
   {},
   {},
   {},
-  {},
-  {},
-  {},
-  {},
   {}
-]
+]

document-store/src/integrationTest/resources/query/flat_jsonb_city_selection_response.json

@@ -8,7 +8,8 @@
       }
     }
   },
-  {},
+  {
+  },
   {
     "props": {
       "seller": {
@@ -18,7 +19,8 @@
       }
     }
   },
-  {},
+  {
+  },
   {
     "props": {
       "seller": {
@@ -28,7 +30,8 @@
       }
     }
   },
-  {},
+  {
+  },
   {
     "props": {
       "seller": {
@@ -40,9 +43,5 @@
   },
   {},
   {},
-  {},
-  {},
-  {},
-  {},
   {}
-]
+]

document-store/src/integrationTest/resources/query/flat_jsonb_colors_selection_response.json

@@ -7,15 +7,13 @@
       ]
     }
   },
-  {},
   {
     "props": {
       "colors": [
         "Black"
       ]
     }
   },
-  {},
   {
     "props": {
       "colors": [
@@ -24,7 +22,6 @@
       ]
     }
   },
-  {},
   {
     "props": {
       "colors": []
@@ -35,6 +32,5 @@
   {},
   {},
   {},
-  {},
   {}
-]
+]

document-store/src/integrationTest/resources/query/flat_jsonb_group_by_brand_test_response.json

@@ -1,6 +1,6 @@
 [
   {
-    "count": 11
+    "count": 7
   },
   {
     "props": {

document-store/src/integrationTest/resources/query/flat_unnest_mixed_case_response.json

@@ -1,26 +1,7 @@
 [
-  {
-    "categoryTags": "PersonalCare",
-    "count": 2
-  },
-  {
-    "categoryTags": "HomeDecor",
-    "count": 1
-  },
-  {
-    "categoryTags": "Hygiene",
-    "count": 3
-  },
-  {
-    "categoryTags": "Stationery",
-    "count": 1
-  },
-  {
-    "categoryTags": "HairCare",
-    "count": 2
-  },
-  {
-    "categoryTags": "Grooming",
-    "count": 2
-  }
-]
+  {"categoryTags": "Hygiene", "count": 3},
+  {"categoryTags": "PersonalCare", "count": 2},
+  {"categoryTags": "HairCare", "count": 2},
+  {"categoryTags": "HomeDecor", "count": 1},
+  {"categoryTags": "Grooming", "count": 2}
+]

document-store/src/integrationTest/resources/query/flat_unnest_not_preserving_empty_array_response.json

@@ -1,5 +1,5 @@
 [
   {
-    "count": 28
+    "count": 25
   }
 ]

document-store/src/integrationTest/resources/query/flat_unnest_preserving_empty_array_response.json

@@ -1,5 +1,5 @@
 [
   {
-    "count": 32
+    "count": 27
   }
 ]