diff --git a/src/main/java/com/datastax/oss/cass_stac/service/ItemService.java b/src/main/java/com/datastax/oss/cass_stac/service/ItemService.java index b2ba50e..6c7225b 100644 --- a/src/main/java/com/datastax/oss/cass_stac/service/ItemService.java +++ b/src/main/java/com/datastax/oss/cass_stac/service/ItemService.java @@ -283,10 +283,6 @@ public Map parseDatetime(String datetime) { result.put("maxDate", datetime); result.put("maxOffsetDate", datetime); } - //logger.info(result.get("minDate").toString()); - //logger.info(result.get("minOffsetDate").toString()); - //logger.info(result.get("maxDate").toString()); - //logger.info(result.get("maxOffsetDate").toString()); return result; } @@ -315,8 +311,6 @@ else if (ids != null) { return null; }).filter(Objects::nonNull).toList()); } - //logger.info(partitions.toString()); - //logger.info(String.valueOf(partitions.size())); return partitions.stream().distinct().toList(); } @@ -328,22 +322,17 @@ private List fetchItemsForPartition(String partitionId, Integer pageSize) { List itemPage; - Query dbQuery = Query.query(Criteria.where("partition_id").is(partitionId)) -; - if (collectionsArray != null) { - dbQuery = dbQuery.and(Criteria.where("collection").in(collectionsArray)); + Query dbQuery = Query.query(Criteria.where("partition_id").is(partitionId)); + + if (collectionsArray != null && !collectionsArray.isEmpty()) { + dbQuery = dbQuery.and(Criteria.where("collection").in(collectionsArray)).withAllowFiltering(); } dbQuery = dbQuery.and(Criteria.where("datetime").lte(maxDate)) .and(Criteria.where("datetime").gte(minDate)); - //logger.info("dbQuery.toString()"); - //logger.info(dbQuery.toString()); itemPage = cassandraTemplate.select(dbQuery, Item.class); - //logger.info("itemPage.toString()"); - //logger.info(itemPage.toString()); - return itemPage; } @@ -357,23 +346,17 @@ private CompletableFuture> fetchItemsForPartitionAsync(String partiti Integer pageSize) { List itemPage; - Query dbQuery = Query.query(Criteria.where("partition_id").is(partitionId)) -; - if (collectionsArray != null) { - dbQuery = dbQuery.and(Criteria.where("collection").in(collectionsArray)); + Query dbQuery = Query.query(Criteria.where("partition_id").is(partitionId)); + + if (collectionsArray != null && !collectionsArray.isEmpty()) { + dbQuery = dbQuery.and(Criteria.where("collection").in(collectionsArray)).withAllowFiltering(); } dbQuery = dbQuery.and(Criteria.where("datetime").lte(maxDate)) .and(Criteria.where("datetime").gte(minDate)); - //logger.info("dbQuery.toString()"); - //logger.info(dbQuery.toString()); itemPage = cassandraTemplate.select(dbQuery, Item.class); - //logger.info("itemPage.toString()"); - //logger.info(itemPage.toString()); - - return CompletableFuture.completedFuture(itemPage); }