Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CompositeMetadata filtering now retains metadata for composite fields #48

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CompositeMetadata filtering now retains metadata for composite fields #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/main/java/datawave/query/composite/CompositeMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,23 @@ public CompositeMetadata filter(Set<String> componentFields) {
return filter(ingestTypes, componentFields);
}

/**
* Returns a new instance of {@link CompositeMetadata} filtered by the provided ingest types and fields. The fields can be component fields or composite
* fields.
*
* @param ingestTypes
* the ingest types
* @param componentFields
* the component or composite fields
* @return an instance of filtered composite metadata
*/
public CompositeMetadata filter(Set<String> ingestTypes, Set<String> componentFields) {
if (!isEmpty()) {
CompositeMetadata compositeMetadata = new CompositeMetadata();
for (String ingestType : ingestTypes) {
for (String componentField : componentFields) {
if (this.compositeFieldMapByType.containsKey(ingestType)) {
// add composites via the requisite component fields
for (String compositeField : this.compositeFieldMapByType.get(ingestType).keySet()) {
if (this.compositeFieldMapByType.get(ingestType).get(compositeField).contains(componentField)) {
compositeMetadata.setCompositeFieldMappingByType(ingestType, compositeField,
Expand All @@ -146,6 +157,22 @@ public CompositeMetadata filter(Set<String> ingestTypes, Set<String> componentFi
this.compositeFieldSeparatorsByType.get(ingestType).get(compositeField));
}
}

// also check for the case when the filter field is also a composite field
if (this.compositeFieldMapByType.get(ingestType).containsKey(componentField)) {
Collection<String> parts = this.compositeFieldMapByType.get(ingestType).get(componentField);
compositeMetadata.setCompositeFieldMappingByType(ingestType, componentField, parts);

if (this.compositeTransitionDatesByType.containsKey(ingestType)
&& this.compositeTransitionDatesByType.get(ingestType).containsKey(componentField))
compositeMetadata.addCompositeTransitionDateByType(ingestType, componentField,
this.compositeTransitionDatesByType.get(ingestType).get(componentField));

if (this.compositeFieldSeparatorsByType.containsKey(ingestType)
&& this.compositeFieldSeparatorsByType.get(ingestType).containsKey(componentField))
compositeMetadata.addCompositeFieldSeparatorByType(ingestType, componentField,
this.compositeFieldSeparatorsByType.get(ingestType).get(componentField));
}
}
}
}
Expand Down
26 changes: 23 additions & 3 deletions src/test/java/datawave/query/composite/CompositeMetadataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
Expand All @@ -22,10 +23,14 @@ public class CompositeMetadataTest {

private CompositeMetadata compositeMetadata;

private String[] ingestTypes = new String[] {"EARTH", "FIRE", "WIND", "WATER", "HEART"};
private String[][] compositeFields = new String[][] {new String[] {"CAPTAIN_PLANET", "HES", "A", "HERO"},
private final String[] ingestTypes = new String[] {"EARTH", "FIRE", "WIND", "WATER", "HEART"};
// @formatter:off
private final String[][] compositeFields = new String[][] {
new String[] {"CAPTAIN_PLANET", "HES", "A", "HERO"},
new String[] {"GONNA_TAKE", "POLLUTION", "DOWN", "TO", "ZERO"},
new String[] {"CAPTAIN_POLLUTION", "RADIATION", "DEFORESTATION", "SMOG", "TOXICS", "HATE"}};
new String[] {"CAPTAIN_POLLUTION", "RADIATION", "DEFORESTATION", "SMOG", "TOXICS", "HATE"}
};
// @formatter:on

@BeforeEach
public void setup() {
Expand Down Expand Up @@ -75,6 +80,21 @@ public void filterCompositeMetadataTest() {
assertTrue(filteredCompMetadata.compositeTransitionDatesByType.isEmpty());
}

@Test
public void filterCompositeMetadataViaCompositeField() {
CompositeMetadata metadata = new CompositeMetadata();
metadata.setCompositeFieldMappingByType("country", "CITY_STATE", List.of("CITY", "STATE"));
metadata.addCompositeTransitionDateByType("country", "CITY_STATE", new Date(0));

CompositeMetadata filtered = metadata.filter(Set.of("CITY", "STATE"));
assertEquals(metadata.getCompositeFieldMapByType(), filtered.getCompositeFieldMapByType());
assertEquals(metadata.getCompositeTransitionDatesByType(), filtered.getCompositeTransitionDatesByType());

filtered = metadata.filter(Set.of("CITY_STATE"));
assertEquals(metadata.getCompositeFieldMapByType(), filtered.getCompositeFieldMapByType());
assertEquals(metadata.getCompositeTransitionDatesByType(), filtered.getCompositeTransitionDatesByType());
}

@Test
public void readWriteCompositeMetadataTest() {
byte[] compMetadataBytes = CompositeMetadata.toBytes(compositeMetadata);
Expand Down
Loading