Skip to content

Commit

Permalink
Merge pull request #31092 from vespa-engine/bratseth/cleanup-908
Browse files Browse the repository at this point in the history 
Cleanup: No functional changes
  • Loading branch information
@bjorncs
bjorncs authored May 2, 2024
2 parents 4e72477 + 38a6925 commit dc12a1e
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 107 deletions.
145 changes: 56 additions & 89 deletions container-search/src/main/java/com/yahoo/search/query/SelectParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,26 +256,18 @@ private void toGroupingRequest(Inspector groupingJson, StringBuilder b) {
}

private Item buildFunctionCall(String key, Inspector value) {
switch (key) {
case WAND:
return buildWand(key, value);
case WEIGHTED_SET:
return buildWeightedSet(key, value);
case DOT_PRODUCT:
return buildDotProduct(key, value);
case GEO_LOCATION:
return buildGeoLocation(key, value);
case NEAREST_NEIGHBOR:
return buildNearestNeighbor(key, value);
case PREDICATE:
return buildPredicate(key, value);
case RANK:
return buildRank(key, value);
case WEAK_AND:
return buildWeakAnd(key, value);
default:
throw newUnexpectedArgumentException(key, DOT_PRODUCT, NEAREST_NEIGHBOR, RANK, WAND, WEAK_AND, WEIGHTED_SET, PREDICATE);
}
return switch (key) {
case WAND -> buildWand(key, value);
case WEIGHTED_SET -> buildWeightedSet(key, value);
case DOT_PRODUCT -> buildDotProduct(key, value);
case GEO_LOCATION -> buildGeoLocation(key, value);
case NEAREST_NEIGHBOR -> buildNearestNeighbor(key, value);
case PREDICATE -> buildPredicate(key, value);
case RANK -> buildRank(key, value);
case WEAK_AND -> buildWeakAnd(key, value);
default ->
throw newUnexpectedArgumentException(key, DOT_PRODUCT, NEAREST_NEIGHBOR, RANK, WAND, WEAK_AND, WEIGHTED_SET, PREDICATE);
};
}

private void addItemsFromInspector(CompositeItem item, Inspector inspector){
Expand Down Expand Up @@ -312,15 +304,11 @@ private Inspector getChildren(Inspector inspector) {
private HashMap<Integer, Inspector> childMap(Inspector inspector) {
HashMap<Integer, Inspector> children = new HashMap<>();
if (inspector.type() == ARRAY){
inspector.traverse((ArrayTraverser) (index, new_value) -> {
children.put(index, new_value);
});
inspector.traverse((ArrayTraverser) children::put);

} else if (inspector.type() == OBJECT){
if (inspector.field("children").valid()){
inspector.field("children").traverse((ArrayTraverser) (index, new_value) -> {
children.put(index, new_value);
});
inspector.field("children").traverse((ArrayTraverser) children::put);
}
}
return children;
Expand All @@ -336,19 +324,15 @@ private Inspector getAnnotations(Inspector inspector) {
private HashMap<String, Inspector> getAnnotationMapFromAnnotationInspector(Inspector annotation) {
HashMap<String, Inspector> attributes = new HashMap<>();
if (annotation.type() == OBJECT){
annotation.traverse((ObjectTraverser) (index, new_value) -> {
attributes.put(index, new_value);
});
annotation.traverse((ObjectTraverser) attributes::put);
}
return attributes;
}

private HashMap<String, Inspector> getAnnotationMap(Inspector inspector) {
HashMap<String, Inspector> attributes = new HashMap<>();
if (inspector.type() == OBJECT && inspector.field("attributes").valid()){
inspector.field("attributes").traverse((ObjectTraverser) (index, new_value) -> {
attributes.put(index, new_value);
});
inspector.field("attributes").traverse((ObjectTraverser) attributes::put);
}
return attributes;
}
Expand Down Expand Up @@ -487,7 +471,6 @@ private Item buildNearestNeighbor(String key, Inspector value) {
return item;
}

@SuppressWarnings("deprecation")
private CompositeItem buildWeakAnd(String key, Inspector value) {
WeakAndItem weakAnd = new WeakAndItem();
addItemsFromInspector(weakAnd, value);
Expand Down Expand Up @@ -576,8 +559,7 @@ private <T extends TaggableItem> T leafStyleSettings(Inspector annotations, T ou
}
});
}
if (out instanceof IntItem && annotations != null) {
IntItem number = (IntItem) out;
if (out instanceof IntItem number && annotations != null) {
Integer hitLimit = getCappedRangeSearchParameter(annotations);
if (hitLimit != null) {
number.setHitLimit(hitLimit);
Expand Down Expand Up @@ -631,12 +613,13 @@ private Item buildEquals(String key, Inspector value) {
throw new IllegalArgumentException("The first array element under 'equals' should be a field name string " +
"but was " + children.get(0));
String field = children.get(0).asString();
switch (children.get(1).type()) {
case BOOL: return new BoolItem(children.get(1).asBool(), field);
case LONG: return new IntItem(children.get(1).asLong(), field);
default: throw new IllegalArgumentException("The second array element under 'equals' should be a boolean " +
"or int value but was " + children.get(1));
}
return switch (children.get(1).type()) {
case BOOL -> new BoolItem(children.get(1).asBool(), field);
case LONG -> new IntItem(children.get(1).asLong(), field);
default ->
throw new IllegalArgumentException("The second array element under 'equals' should be a boolean " +
"or int value but was " + children.get(1));
};
}

private Item buildRange(String key, Inspector value) {
Expand All @@ -661,15 +644,15 @@ private Item buildRange(String key, Inspector value) {
throw new IllegalArgumentException("Expected a numeric argument to range, but got the string '" + bound.asString() + "'");
}
if (operator.equals("=")) {
bounds[0] = (bound.type() == DOUBLE) ? Number.class.cast(bound.asDouble()) : Number.class.cast(bound.asLong());
bounds[0] = (bound.type() == DOUBLE) ? (Number) bound.asDouble() : (Number) bound.asLong();
operators[0] = operator;
equals[0] = true;
}
if (operator.equals(">=") || operator.equals(">")){
bounds[0] = (bound.type() == DOUBLE) ? Number.class.cast(bound.asDouble()) : Number.class.cast(bound.asLong());
bounds[0] = (bound.type() == DOUBLE) ? (Number) bound.asDouble() : (Number) bound.asLong();
operators[0] = operator;
} else if (operator.equals("<=") || operator.equals("<")){
bounds[1] = (bound.type() == DOUBLE) ? Number.class.cast(bound.asDouble()) : Number.class.cast(bound.asLong());
bounds[1] = (bound.type() == DOUBLE) ? (Number) bound.asDouble() : (Number) bound.asLong();
operators[1] = operator;
}

Expand All @@ -680,20 +663,13 @@ private Item buildRange(String key, Inspector value) {
}
else if (operators[0] == null || operators[1] == null) {
int index = (operators[0] == null) ? 1 : 0;
switch (operators[index]){
case ">=":
range = buildGreaterThanOrEquals(field, bounds[index].toString());
break;
case ">":
range = buildGreaterThan(field, bounds[index].toString());
break;
case "<":
range = buildLessThan(field, bounds[index].toString());
break;
case "<=":
range = buildLessThanOrEquals(field, bounds[index].toString());
break;
}
range = switch (operators[index]) {
case ">=" -> buildGreaterThanOrEquals(field, bounds[index].toString());
case ">" -> buildGreaterThan(field, bounds[index].toString());
case "<" -> buildLessThan(field, bounds[index].toString());
case "<=" -> buildLessThanOrEquals(field, bounds[index].toString());
default -> range;
};
}
else {
range = instantiateRangeItem(bounds[0], bounds[1], field, operators[0].equals(">"), operators[1].equals("<"));
Expand Down Expand Up @@ -890,32 +866,24 @@ private Item instantiateLeafItem(String field, String key, Inspector value) {
String possibleLeafFunctionName = (possibleLeafFunction.size() > 1) ? getInspectorKey(possibleLeafFunction.get(1)) : "";
if (FUNCTION_CALLS.contains(key)) {
return instantiateCompositeLeaf(field, key, value);
} else if ( ! possibleLeafFunctionName.equals("")){
} else if (!possibleLeafFunctionName.isEmpty()){
return instantiateCompositeLeaf(field, possibleLeafFunctionName, valueListFromInspector(value).get(1).field(possibleLeafFunctionName));
} else {
return instantiateWordItem(field, key, value);
}
}

private Item instantiateCompositeLeaf(String field, String key, Inspector value) {
switch (key) {
case SAME_ELEMENT:
return instantiateSameElementItem(field, key, value);
case PHRASE:
return instantiatePhraseItem(field, key, value);
case NEAR:
return instantiateNearItem(field, key, value);
case ONEAR:
return instantiateONearItem(field, key, value);
case EQUIV:
return instantiateEquivItem(field, key, value);
case FUZZY:
return instantiateFuzzyItem(field, key, value);
case ALTERNATIVES:
return instantiateWordAlternativesItem(field, key, value);
default:
throw newUnexpectedArgumentException(key, EQUIV, NEAR, ONEAR, PHRASE, SAME_ELEMENT);
}
return switch (key) {
case SAME_ELEMENT -> instantiateSameElementItem(field, key, value);
case PHRASE -> instantiatePhraseItem(field, key, value);
case NEAR -> instantiateNearItem(field, key, value);
case ONEAR -> instantiateONearItem(field, key, value);
case EQUIV -> instantiateEquivItem(field, key, value);
case FUZZY -> instantiateFuzzyItem(field, key, value);
case ALTERNATIVES -> instantiateWordAlternativesItem(field, key, value);
default -> throw newUnexpectedArgumentException(key, EQUIV, NEAR, ONEAR, PHRASE, SAME_ELEMENT);
};
}

private Item instantiateWordItem(String field, String key, Inspector value) {
Expand Down Expand Up @@ -944,8 +912,8 @@ private Item instantiateWordItem(String field, String rawWord, String key, Inspe
Preconditions.checkArgument((prefixMatch ? 1 : 0)
+ (substrMatch ? 1 : 0) + (suffixMatch ? 1 : 0) < 2,
"Only one of prefix, substring and suffix can be set.");
final TaggableItem wordItem;

WordItem wordItem;
if (exactMatch) {
wordItem = new ExactStringItem(wordData, fromQuery);
} else if (prefixMatch) {
Expand All @@ -958,13 +926,11 @@ private Item instantiateWordItem(String field, String rawWord, String key, Inspe
wordItem = new WordItem(wordData, fromQuery);
}

if (wordItem instanceof WordItem) {
prepareWord(field, value, (WordItem) wordItem);
}
prepareWord(field, value, wordItem);
if (language != Language.ENGLISH)
((Item)wordItem).setLanguage(language);
wordItem.setLanguage(language);

return (Item) leafStyleSettings(getAnnotations(value), wordItem);
return leafStyleSettings(getAnnotations(value), wordItem);
}

private Language decideParsingLanguage(Inspector value, String wordData) {
Expand All @@ -974,9 +940,8 @@ private Language decideParsingLanguage(Inspector value, String wordData) {
if (language != Language.UNKNOWN) return language;

Optional<Language> explicitLanguage = query.getExplicitLanguage();
if (explicitLanguage.isPresent()) return explicitLanguage.get();
return explicitLanguage.orElse(Language.ENGLISH);

return Language.ENGLISH;
}

private void prepareWord(String field, Inspector value, WordItem wordItem) {
Expand Down Expand Up @@ -1094,7 +1059,7 @@ private Item instantiateNearItem(String field, String key, Inspector value) {
Integer distance = getIntegerAnnotation(DISTANCE, getAnnotationMap(value), null);

if (distance != null) {
near.setDistance((int)distance);
near.setDistance(distance);
}
return near;
}
Expand All @@ -1120,7 +1085,8 @@ private Item instantiateONearItem(String field, String key, Inspector value) {
private Item instantiateEquivItem(String field, String key, Inspector value) {

HashMap<Integer, Inspector> children = childMap(value);
Preconditions.checkArgument(children.size() >= 2, "Expected 2 or more arguments, got %s.", children.size());
Preconditions.checkArgument(children.size() >= 2,
"Expected 2 or more arguments, got %s.", children.size());

EquivItem equiv = new EquivItem();
equiv.setIndexName(field);
Expand Down Expand Up @@ -1159,8 +1125,9 @@ private Item instantiateFuzzyItem(String field, String key, Inspector value) {

private Item instantiateWordAlternativesItem(String field, String key, Inspector value) {
HashMap<Integer, Inspector> children = childMap(value);
Preconditions.checkArgument(children.size() >= 1, "Expected 1 or more arguments, got %s.", children.size());
Preconditions.checkArgument(children.get(0).type() == OBJECT, "Expected OBJECT, got %s.", children.get(0).type());
Preconditions.checkArgument(!children.isEmpty(), "Expected 1 or more arguments, got none");
Preconditions.checkArgument(children.get(0).type() == OBJECT,
"Expected OBJECT, got %s.", children.get(0).type());

List<WordAlternativesItem.Alternative> terms = new ArrayList<>();

Expand Down
18 changes: 8 additions & 10 deletions container-search/src/test/java/com/yahoo/select/SelectTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public class SelectTestCase {

//------------------------------------------------------------------- "where" tests

@Test
void testSimple() {
assertParse("{'contains' : ['title', 'madonna']}", "title:madonna");
}

@Test
void test_contains() {
ObjectNode json = jsonMapper.createObjectNode();
Expand All @@ -64,17 +69,10 @@ void test_contains() {
assertParse(json.toString(), "default:foo");
}

@Test
void test() {
assertParse("{'contains' : ['title', 'madonna']}",
"title:madonna");
}


@Test
void testDottedFieldNames() {
assertParse("{ 'contains' : ['my.nested.title', 'madonna']}",
"my.nested.title:madonna");
"my.nested.title:madonna");
}

@Test
Expand Down Expand Up @@ -360,12 +358,12 @@ void testStemming() {
@Test
void testRaw() {
Item root = parseWhere("{ \"contains\":[ \"baz\", \"yoni jo dima\" ] }").getRoot();
assertTrue(root instanceof WordItem);
assertInstanceOf(WordItem.class, root);
assertFalse(root instanceof ExactStringItem);
assertEquals("yoni jo dima", ((WordItem) root).getWord());

root = parseWhere("{ \"contains\": { \"children\" : [\"baz\", \"yoni jo dima\"], \"attributes\" : {\"grammar\" : \"raw\"} } }").getRoot();
assertTrue(root instanceof WordItem);
assertInstanceOf(WordItem.class, root);
assertFalse(root instanceof ExactStringItem);
assertEquals("yoni jo dima", ((WordItem) root).getWord());
}
Expand Down
9 changes: 2 additions & 7 deletions document/src/main/java/com/yahoo/document/DocumentUpdate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,8 @@ public Collection<FieldPathUpdate> fieldPathUpdates() {
return Collections.unmodifiableCollection(fieldPathUpdates);
}

/** Returns the type of the document this updates
*
* @return The document type of the document
*/
public DocumentType getDocumentType() {
return documentType;
}
/** Returns the type of the document this updates. */
public DocumentType getDocumentType() { return documentType; }

/**
* Sets the document type. Use only while deserializing - changing the document type after creation
Expand Down
1 change: 0 additions & 1 deletion document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ public void testUpdatesToTheSameFieldAreCombining() {
DocumentUpdate update = new DocumentUpdate(docType, new DocumentId("id:ns:my_type::foo:"));
update.addFieldUpdate(FieldUpdate.createAssign(field, new IntegerFieldValue(1)));
update.addFieldUpdate(FieldUpdate.createAssign(field, new IntegerFieldValue(2)));

assertEquals(1, update.fieldUpdates().size());
FieldUpdate fieldUpdate = update.getFieldUpdate(field);
assertNotNull(fieldUpdate);
Expand Down

0 comments on commit dc12a1e

Please sign in to comment.