diff options
Diffstat (limited to 'indexinglanguage/src/main/java/com/yahoo')
19 files changed, 32 insertions, 12 deletions
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/AdapterFactory.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/AdapterFactory.java index c172e50daeb..55374ea1ca2 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/AdapterFactory.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/AdapterFactory.java @@ -11,7 +11,8 @@ import java.util.List; */ public interface AdapterFactory { - public DocumentAdapter newDocumentAdapter(Document doc); + DocumentAdapter newDocumentAdapter(Document doc); + + List<UpdateAdapter> newUpdateAdapterList(DocumentUpdate upd); - public List<UpdateAdapter> newUpdateAdapterList(DocumentUpdate upd); } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/DocumentAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/DocumentAdapter.java index 6becfffaa8c..ec7ce6eb06c 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/DocumentAdapter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/DocumentAdapter.java @@ -9,7 +9,8 @@ import com.yahoo.vespa.indexinglanguage.expressions.FieldValueAdapter; */ public interface DocumentAdapter extends FieldValueAdapter { - public Document getFullOutput(); + Document getFullOutput(); + + Document getUpdatableOutput(); - public Document getUpdatableOutput(); } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ExpressionConverter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ExpressionConverter.java index 264c54ce5cb..60ca16533fd 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ExpressionConverter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ExpressionConverter.java @@ -121,7 +121,6 @@ public abstract class ExpressionConverter implements Cloneable { } @Override - @SuppressWarnings("CloneDoesntDeclareCloneNotSupportedException") public ExpressionConverter clone() { try { return (ExpressionConverter)super.clone(); diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ExpressionOptimizer.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ExpressionOptimizer.java index 2a87bbc2ec0..748035ed1fc 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ExpressionOptimizer.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ExpressionOptimizer.java @@ -12,6 +12,7 @@ import java.util.List; * generates a new execution value without regard for the existing one. */ public class ExpressionOptimizer extends ExpressionConverter { + @Override protected boolean shouldConvert(Expression exp) { return exp instanceof StatementExpression; @@ -111,4 +112,5 @@ public class ExpressionOptimizer extends ExpressionConverter { } } + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ExpressionSearcher.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ExpressionSearcher.java index f1d338371f3..7f8698b53d3 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ExpressionSearcher.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ExpressionSearcher.java @@ -42,4 +42,5 @@ public class ExpressionSearcher<T extends Expression> { return exp; } } + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateAdapter.java index 84245d789fd..9ab2f8d49de 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateAdapter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateAdapter.java @@ -123,4 +123,5 @@ public class FieldPathUpdateAdapter implements UpdateAdapter { update.getOriginalWhereClause())); } } + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateHelper.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateHelper.java index 916b442fb74..c239b240985 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateHelper.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateHelper.java @@ -63,4 +63,5 @@ public abstract class FieldPathUpdateHelper { return true; } } + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java index bb89ce736f7..c819587bedd 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java @@ -255,4 +255,5 @@ public class FieldUpdateAdapter implements UpdateAdapter { return super.createValueUpdates(val, nullAssign); } } + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateHelper.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateHelper.java index e51f7984d65..586f2b020ec 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateHelper.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateHelper.java @@ -126,4 +126,5 @@ public abstract class FieldUpdateHelper { } throw new UnsupportedOperationException("Value update type " + upd.getClass().getName() + " not supported."); } + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldValueConverter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldValueConverter.java index 96c740df7bf..799327c01b3 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldValueConverter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldValueConverter.java @@ -127,6 +127,7 @@ public abstract class FieldValueConverter { } WeightedSet ret = DataType.getWeightedSet(nextType, val.getDataType().createIfNonExistent(), val.getDataType().removeIfZero()).createFieldValue(); + for (Map.Entry<FieldValue, Integer> entry : next.entrySet()) { ret.put(entry.getKey(), entry.getValue()); } @@ -151,8 +152,8 @@ public abstract class FieldValueConverter { * Returns whether or not the given {@link FieldValue} should be converted. If this method returns <em>false</em>, * the converter will proceed to traverse the value itself to see if its internal can be converted. * - * @param value The value to check. - * @return True to convert, false to traverse. + * @param value the value to check + * @return true to convert, false to traverse */ protected abstract boolean shouldConvert(FieldValue value); @@ -160,8 +161,9 @@ public abstract class FieldValueConverter { * Converts the given value. It is IMPERATIVE that the implementation of this method DOES NOT mutate the given * {@link FieldValue} in place, as that can cause SERIOUS inconsistencies in the parent structures. * - * @param value The value to convert. - * @return The value to replace the old. + * @param value the value to convert + * @return the value to replace the old */ protected abstract FieldValue doConvert(FieldValue value); + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/IdentityFieldPathUpdateAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/IdentityFieldPathUpdateAdapter.java index 42c9bd8c10c..a7c5e87b09b 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/IdentityFieldPathUpdateAdapter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/IdentityFieldPathUpdateAdapter.java @@ -65,4 +65,5 @@ public class IdentityFieldPathUpdateAdapter implements UpdateAdapter { public void tryOutputType(Expression exp, String fieldName, DataType valueType) { fwdAdapter.tryOutputType(exp, fieldName, valueType); } + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java index 0bc82535ad8..e1ef6950e2a 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java @@ -75,4 +75,5 @@ public final class ScriptParser { } } } + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParserContext.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParserContext.java index 77bd3e0306f..e1071e25042 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParserContext.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParserContext.java @@ -55,4 +55,5 @@ public class ScriptParserContext { inputStream = stream; return this; } + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java index 35bb70c2a88..801afa546c6 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java @@ -15,11 +15,13 @@ import java.util.List; */ @SuppressWarnings("rawtypes") public class SimpleAdapterFactory implements AdapterFactory { + public static class SelectExpression { public Expression selectExpression(DocumentType documentType, String fieldName) { return null; } } + private final SelectExpression expressionSelector; public SimpleAdapterFactory() { @@ -79,4 +81,5 @@ public class SimpleAdapterFactory implements AdapterFactory { ret.add(FieldUpdateAdapter.fromCompleteUpdate(newDocumentAdapter(complete, true))); return ret; } + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleDocumentAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleDocumentAdapter.java index 16afa08cf45..d2444ff25c5 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleDocumentAdapter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleDocumentAdapter.java @@ -76,7 +76,6 @@ public class SimpleDocumentAdapter implements DocumentAdapter { } } - @SuppressWarnings({ "unchecked" }) @Override public SimpleDocumentAdapter setOutputValue(Expression exp, String fieldName, FieldValue fieldValue) { Field field = output.getField(fieldName); @@ -87,4 +86,5 @@ public class SimpleDocumentAdapter implements DocumentAdapter { output.setFieldValue(field, fieldValue); return this; } + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/StringFieldConverter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/StringFieldConverter.java index f66f1d00f93..1e0fd235e1f 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/StringFieldConverter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/StringFieldConverter.java @@ -21,4 +21,5 @@ public abstract class StringFieldConverter extends FieldValueConverter { } protected abstract FieldValue doConvert(StringFieldValue value); + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/TypedExpressionConverter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/TypedExpressionConverter.java index b4085e65505..be9e212ae26 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/TypedExpressionConverter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/TypedExpressionConverter.java @@ -25,4 +25,5 @@ public abstract class TypedExpressionConverter<T extends Expression> extends Exp } protected abstract Expression typedConvert(T exp); + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/UpdateAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/UpdateAdapter.java index f1cf9a4ae4b..7b29a297a81 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/UpdateAdapter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/UpdateAdapter.java @@ -10,6 +10,7 @@ import com.yahoo.vespa.indexinglanguage.expressions.FieldValueAdapter; */ public interface UpdateAdapter extends FieldValueAdapter { - public DocumentUpdate getOutput(); - public Expression getExpression(Expression expression); + DocumentUpdate getOutput(); + Expression getExpression(Expression expression); + } diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ValueTransformProvider.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ValueTransformProvider.java index e9bb3dd418d..599e07493bb 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ValueTransformProvider.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ValueTransformProvider.java @@ -60,4 +60,5 @@ public abstract class ValueTransformProvider extends ExpressionConverter { protected abstract boolean requiresTransform(Expression exp); protected abstract Expression newTransform(); + } |