fix: add backwards compatibility to internal filter (#107)

aaron-steinfeld · web-flow · commit 0316e85296ea · 2021-09-27T08:43:58.000-07:00
diff --git a/attribute-service-impl/src/main/java/org/hypertrace/core/attribute/service/AttributeServiceImpl.java b/attribute-service-impl/src/main/java/org/hypertrace/core/attribute/service/AttributeServiceImpl.java
@@ -388,8 +388,13 @@ private Query getQueryForFilter(
     }
 
     if (attributeMetadataFilter.hasInternal()) {
-      andFilters.add(
-          new Filter(Op.EQ, ATTRIBUTE_INTERNAL_KEY, attributeMetadataFilter.getInternal()));
+      Filter internalFilter =
+          new Filter(Op.EQ, ATTRIBUTE_INTERNAL_KEY, attributeMetadataFilter.getInternal());
+      if (!attributeMetadataFilter.getInternal()) {
+        // For backwards compatibility, treat an attribute missing internal attribute as external
+        internalFilter = internalFilter.or(new Filter(Op.NOT_EXISTS, ATTRIBUTE_INTERNAL_KEY, null));
+      }
+      andFilters.add(internalFilter);
     }
 
     Filter queryFilter = new Filter();

Original file line number	Diff line number	Diff line change
`@@ -388,8 +388,13 @@ private Query getQueryForFilter(`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`if (attributeMetadataFilter.hasInternal()) {`
`391`		`- andFilters.add(`
`392`		`- new Filter(Op.EQ, ATTRIBUTE_INTERNAL_KEY, attributeMetadataFilter.getInternal()));`
	`391`	`+ Filter internalFilter =`
	`392`	`+ new Filter(Op.EQ, ATTRIBUTE_INTERNAL_KEY, attributeMetadataFilter.getInternal());`
	`393`	`+ if (!attributeMetadataFilter.getInternal()) {`
	`394`	`+ // For backwards compatibility, treat an attribute missing internal attribute as external`
	`395`	`+ internalFilter = internalFilter.or(new Filter(Op.NOT_EXISTS, ATTRIBUTE_INTERNAL_KEY, null));`
	`396`	`+ }`
	`397`	`+ andFilters.add(internalFilter);`
`393`	`398`	`}`
`394`	`399`
`395`	`400`	`Filter queryFilter = new Filter();`