Avoid excessive key parsing in TLD keep methods. (NationalSecurityAge…

…ncy#1188)
plainolneesh · May 26, 2021 · cf8025d · cf8025d
1 parent 70cf80d
commit cf8025d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/warehouse/query-core/src/main/java/datawave/query/tld/TLDIndexBuildingVisitor.java b/warehouse/query-core/src/main/java/datawave/query/tld/TLDIndexBuildingVisitor.java
@@ -228,9 +228,14 @@ public boolean peek(@Nullable Entry<Key,String> var1) {
  */
  @Override
  public boolean keep(Key k) {
- DatawaveKey key = new DatawaveKey(k);
- return (!TLDEventDataFilter.isRootPointer(k) || indexOnlyFields.contains(key.getFieldName()))
- && attrFilter.peek(new AbstractMap.SimpleEntry(k, null));
+ if (TLDEventDataFilter.isRootPointer(k)) {
+ DatawaveKey key = new DatawaveKey(k);
+ if (!indexOnlyFields.contains(key.getFieldName())) {
+ return false;
+ }
+ }
+
+ return attrFilter.peek(new AbstractMap.SimpleEntry(k, null));
  }
 
  @Override

diff --git a/warehouse/query-core/src/main/java/datawave/query/tld/TLDQueryIterator.java b/warehouse/query-core/src/main/java/datawave/query/tld/TLDQueryIterator.java
@@ -128,8 +128,12 @@ public boolean peek(@Nullable Map.Entry<Key,String> var1) {
  @Override
  public boolean keep(Key k) {
  boolean root = TLDEventDataFilter.isRootPointer(k);
- DatawaveKey datawaveKey = new DatawaveKey(k);
- return (root && getIndexOnlyFields().contains(datawaveKey.getFieldName())) || !root;
+ if (!root) {
+ return true;
+ } else {
+ DatawaveKey datawaveKey = new DatawaveKey(k);
+ return getIndexOnlyFields().contains(datawaveKey.getFieldName());
+ }
  }
 
  @Override