Skip to content

allow types to specify a sub category #42

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

Closed
wants to merge 1 commit into from
Closed

allow types to specify a sub category #42

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
15 changes: 10 additions & 5 deletions src/main/java/datawave/data/normalizer/GeometryNormalizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.List;

import org.apache.accumulo.core.util.Pair;
import org.locationtech.geowave.core.geotime.index.dimension.LatitudeDefinition;
import org.locationtech.geowave.core.geotime.index.dimension.LongitudeDefinition;
import org.locationtech.geowave.core.index.NumericIndexStrategy;
Expand All @@ -13,6 +14,7 @@

import com.google.common.collect.Lists;

import datawave.data.type.Type;
import datawave.data.type.util.Geometry;

/**
Expand Down Expand Up @@ -65,18 +67,21 @@ public static Index getGeometryIndex() {
}

@Override
public List<String> normalizeToMany(String geoString) throws IllegalArgumentException {
public List<Pair<String,Type.Category>> normalizeToMany(String geoString) throws IllegalArgumentException {
List<Pair<String,Type.Category>> list = Lists.newArrayList();
if (validHash(geoString)) {
return Lists.newArrayList(geoString);
for (String s : Lists.newArrayList(geoString)) {
list.add(new Pair<>(s, Type.Category.GEOHASH));
}
}
return normalizeDelegateTypeToMany(createDatawaveGeometry(parseGeometry(geoString)));
}

@Override
public List<String> normalizeDelegateTypeToMany(Geometry geometry) {
List<String> list = Lists.newArrayList();
public List<Pair<String,Type.Category>> normalizeDelegateTypeToMany(Geometry geometry) {
List<Pair<String,Type.Category>> list = Lists.newArrayList();
for (byte[] one : getIndicesFromGeometry(geometry)) {
list.add(getEncodedStringFromIndexBytes(one));
list.add(new Pair<>(getEncodedStringFromIndexBytes(one), Type.Category.GEOHASH));
}
return list;
}
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/datawave/data/normalizer/OneToManyNormalizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

import java.util.List;

import org.apache.accumulo.core.util.Pair;

import datawave.data.type.Type;

public interface OneToManyNormalizer<T> extends Normalizer<T> {

List<String> normalizeToMany(String in);
List<Pair<String,Type.Category>> normalizeToMany(String in);

List<String> normalizeDelegateTypeToMany(T foo);
List<Pair<String,Type.Category>> normalizeDelegateTypeToMany(T foo);
}
8 changes: 6 additions & 2 deletions src/main/java/datawave/data/type/GeometryType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package datawave.data.type;

import java.util.List;
import java.util.stream.Collectors;

import org.apache.accumulo.core.util.Pair;

import datawave.data.normalizer.Normalizer;
import datawave.data.normalizer.OneToManyNormalizer;
Expand All @@ -18,7 +21,7 @@ public GeometryType() {
super(Normalizer.GEOMETRY_NORMALIZER);
}

public List<String> normalizeToMany(String in) {
public List<Pair<String,Category>> normalizeToMany(String in) {
return ((OneToManyNormalizer<Geometry>) normalizer).normalizeToMany(in);
}

Expand All @@ -29,7 +32,8 @@ public void setNormalizedValues(List<String> normalizedValues) {

@Override
public void normalizeAndSetNormalizedValue(Geometry valueToNormalize) {
setNormalizedValues(((OneToManyNormalizer<Geometry>) normalizer).normalizeDelegateTypeToMany(valueToNormalize));
setNormalizedValues(((OneToManyNormalizer<Geometry>) normalizer).normalizeDelegateTypeToMany(valueToNormalize).stream().map(Pair::getFirst)
.collect(Collectors.toList()));
}

public List<String> getNormalizedValues() {
Expand Down
12 changes: 8 additions & 4 deletions src/main/java/datawave/data/type/ListType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package datawave.data.type;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;

import org.apache.accumulo.core.util.Pair;

import datawave.data.normalizer.Normalizer;
import datawave.util.StringUtils;
Expand All @@ -19,13 +23,13 @@ public ListType(String delegateString, Normalizer normalizer) {
}

@Override
public List<String> normalizeToMany(String in) {
public List<Pair<String,Category>> normalizeToMany(String in) {
String[] splits = StringUtils.split(in, delimiter);
List<String> strings = new ArrayList(splits.length);
List<Pair<String,Category>> strings = new ArrayList(splits.length);
for (String s : splits) {

String str = normalizer.normalize(s);
strings.add(str);
strings.add(new Pair(str, Category.LIST_ELEMENT));

}

Expand All @@ -34,7 +38,7 @@ public List<String> normalizeToMany(String in) {

@Override
public void setDelegateFromString(String in) {
this.normalizedValues = normalizeToMany(in);
this.normalizedValues = normalizeToMany(in).stream().map(Pair::getFirst).collect(Collectors.toList());
this.delegate = in;
setNormalizedValue(in);
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/datawave/data/type/OneToManyNormalizerType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

import java.util.List;

import org.apache.accumulo.core.util.Pair;

public interface OneToManyNormalizerType<T extends Comparable<T>> extends Type<T> {

List<String> normalizeToMany(String in);
List<Pair<String,Category>> normalizeToMany(String in);

List<String> getNormalizedValues();

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/datawave/data/type/Type.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,8 @@ public static Type<?> createType(String datawaveTypeClassName) {
}
}
}

enum Category {
FULL, PART, GEOHASH, LIST_ELEMENT
}
}
25 changes: 22 additions & 3 deletions src/test/java/datawave/data/type/ListTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
import java.util.Arrays;
import java.util.List;

import org.apache.accumulo.core.util.Pair;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.locationtech.jts.util.Assert;

import com.google.common.collect.Lists;

public class ListTypeTest {

@Test
Expand All @@ -15,7 +18,13 @@ public void test() {

LcNoDiacriticsListType t = new LcNoDiacriticsListType(str);
Assert.equals(6, t.normalizeToMany(str).size());
List<String> expected = Arrays.asList(new String[] {"1", "2", "3", "a", "b", "c"});
List<Pair<String,Type.Category>> expected = Lists.newArrayList();
expected.add(new Pair("1", Type.Category.LIST_ELEMENT));
expected.add(new Pair("2", Type.Category.LIST_ELEMENT));
expected.add(new Pair("3", Type.Category.LIST_ELEMENT));
expected.add(new Pair("a", Type.Category.LIST_ELEMENT));
expected.add(new Pair("b", Type.Category.LIST_ELEMENT));
expected.add(new Pair("c", Type.Category.LIST_ELEMENT));
Assert.equals(expected, t.normalizeToMany(str));
}

Expand All @@ -25,14 +34,24 @@ public void testLcNDList() {

LcNoDiacriticsListType t = new LcNoDiacriticsListType();
Assert.equals(6, t.normalizeToMany(str).size());
List<String> expected = Arrays.asList(new String[] {"01", "02", "03", "a", "b", "c"});
List<Pair<String,Type.Category>> expected = Lists.newArrayList();
expected.add(new Pair("01", Type.Category.LIST_ELEMENT));
expected.add(new Pair("02", Type.Category.LIST_ELEMENT));
expected.add(new Pair("03", Type.Category.LIST_ELEMENT));
expected.add(new Pair("a", Type.Category.LIST_ELEMENT));
expected.add(new Pair("b", Type.Category.LIST_ELEMENT));
expected.add(new Pair("c", Type.Category.LIST_ELEMENT));
Assert.equals(expected, t.normalizeToMany(str));
}

@Test
public void testNumberList() {
String str = "1,2,3,5.5";
List<String> expected = Arrays.asList(new String[] {"+aE1", "+aE2", "+aE3", "+aE5.5"});
List<Pair<String,Type.Category>> expected = Lists.newArrayList();
expected.add(new Pair("+aE1", Type.Category.LIST_ELEMENT));
expected.add(new Pair("+aE2", Type.Category.LIST_ELEMENT));
expected.add(new Pair("+aE3", Type.Category.LIST_ELEMENT));
expected.add(new Pair("+aE5.5", Type.Category.LIST_ELEMENT));

NumberListType nt = new NumberListType();
Assert.equals(4, nt.normalizeToMany(str).size());
Expand Down