ALS-4947: Change filter logic to be AND not OR between 2 any record o…

…f filters
hms-dbmi · Aug 24, 2023 · 5912b01 · 5912b01
1 parent bd7ab07
commit 5912b01
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/...essing/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/processing/AbstractProcessor.java b/...essing/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/processing/AbstractProcessor.java
@@ -262,20 +262,16 @@ private void addIdSetsForRequiredFields(Query query, ArrayList<Set<Integer>> fil
 
 	private void addIdSetsForAnyRecordOf(Query query, ArrayList<Set<Integer>> filteredIdSets) {
 		if(!query.getAnyRecordOf().isEmpty()) {
-			Set<Integer> patientsInScope = new ConcurrentSkipListSet<Integer>();
-			VariantBucketHolder<VariantMasks> bucketCache = new VariantBucketHolder<VariantMasks>();
-			query.getAnyRecordOf().parallelStream().forEach(path->{
-				if(patientsInScope.size()<Math.max(
-						phenotypeMetaStore.getPatientIds().size(),
-						variantService.getPatientIds().length)) {
-					if(VariantUtils.pathIsVariantSpec(path)) {
-						addIdSetsForVariantSpecCategoryFilters(new String[]{"0/1","1/1"}, path, patientsInScope, bucketCache);
-					} else {
-						patientsInScope.addAll(getCube(path).keyBasedIndex());
-					}
+			VariantBucketHolder<VariantMasks> bucketCache = new VariantBucketHolder<>();
+			filteredIdSets.addAll(query.getAnyRecordOf().parallelStream().map(path->{
+				if(VariantUtils.pathIsVariantSpec(path)) {
+					TreeSet<Integer> patientsInScope = new TreeSet<>();
+					addIdSetsForVariantSpecCategoryFilters(new String[]{"0/1","1/1"}, path, patientsInScope, bucketCache);
+					return patientsInScope;
+				} else {
+					return new TreeSet<Integer>(getCube(path).keyBasedIndex());
 				}
-			});
-			filteredIdSets.add(patientsInScope);
+			}).collect(Collectors.toSet()));
 		}
 	}