diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-13 00:19:57 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-13 00:19:57 +0100 |
| commit | 77d69db1e2c28da264997e8b7271a1b0c0a2afb7 (patch) | |
| tree | be40a25191a0f606f5ef2461baf144dd7b64982e /config-model/src/main/java/com/yahoo | |
| parent | 001002a94807f13d662874209ccd5f351d20f2a3 (diff) | |
Also test and handle array<string>
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java | 5 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/schema/processing/TypedTransformProvider.java | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java b/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java index 6f0420f5203..375a0fa3700 100644 --- a/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/IndexingScript.java @@ -10,6 +10,7 @@ import com.yahoo.vespa.indexinglanguage.ExpressionConverter; import com.yahoo.vespa.indexinglanguage.ExpressionVisitor; import com.yahoo.vespa.indexinglanguage.expressions.ClearStateExpression; import com.yahoo.vespa.indexinglanguage.expressions.Expression; +import com.yahoo.vespa.indexinglanguage.expressions.ForEachExpression; import com.yahoo.vespa.indexinglanguage.expressions.GuardExpression; import com.yahoo.vespa.indexinglanguage.expressions.InputExpression; import com.yahoo.vespa.indexinglanguage.expressions.OutputExpression; @@ -103,7 +104,9 @@ public final class IndexingScript extends Derived implements IlscriptsConfig.Pro private static class DropTokenize extends ExpressionConverter { @Override protected boolean shouldConvert(Expression exp) { - return exp instanceof TokenizeExpression; + // Handle both string and array<string> + return (exp instanceof TokenizeExpression) || + ((exp instanceof ForEachExpression foreach) && (foreach.getInnerExpression() instanceof TokenizeExpression)); } @Override diff --git a/config-model/src/main/java/com/yahoo/schema/processing/TypedTransformProvider.java b/config-model/src/main/java/com/yahoo/schema/processing/TypedTransformProvider.java index 34dcc9139b3..8ccc8870419 100644 --- a/config-model/src/main/java/com/yahoo/schema/processing/TypedTransformProvider.java +++ b/config-model/src/main/java/com/yahoo/schema/processing/TypedTransformProvider.java @@ -6,7 +6,11 @@ import com.yahoo.document.Field; import com.yahoo.schema.Schema; import com.yahoo.schema.document.Attribute; import com.yahoo.vespa.indexinglanguage.ValueTransformProvider; -import com.yahoo.vespa.indexinglanguage.expressions.*; +import com.yahoo.vespa.indexinglanguage.expressions.AttributeExpression; +import com.yahoo.vespa.indexinglanguage.expressions.Expression; +import com.yahoo.vespa.indexinglanguage.expressions.IndexExpression; +import com.yahoo.vespa.indexinglanguage.expressions.OutputExpression; +import com.yahoo.vespa.indexinglanguage.expressions.SummaryExpression; /** * @author Simon Thoresen Hult |