diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-04-06 10:06:15 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2022-04-06 10:06:15 +0200 |
| commit | a2d552abed7412a4aa7fb89146946d03107389ec (patch) | |
| tree | 9e3f044cac30df5b203aaf0ef65df8fc791d09fa /integration/intellij/src | |
| parent | 14d6146acdfa6d8aa7a91c247f26aae9b606904a (diff) | |
Support rank-profile inputs
Diffstat (limited to 'integration/intellij/src')
| -rw-r--r-- | integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf | 6 | ||||
| -rw-r--r-- | integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf b/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf index 8bec7d1bbd8..e945ed4fe0d 100644 --- a/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf +++ b/integration/intellij/src/main/bnf/ai/vespa/intellij/schema/parser/sd.bnf @@ -165,7 +165,8 @@ private RankProfileBodyOptions ::= MatchPhaseDefinition | NumThreadsDefinition | ignore-default-rank-features | RankPropertiesDefinition | FirstPhaseDefinition | SummaryFeaturesDefinition | MatchFeaturesDefinition | RankFeaturesDefinition | SecondPhaseDefinition | ConstantsDefinition | RankDefinition | RankTypeDefinition | - MinHitsDefinition | NumSearchPartitionDefinition | FieldWeightDefinition | StrictDefinition + MinHitsDefinition | NumSearchPartitionDefinition | FieldWeightDefinition | StrictDefinition | + InputsDefinition MatchPhaseDefinition ::= match-phase '{' MatchPhaseBody '}' MatchPhaseBody ::= MatchPhaseBodyOptions+ @@ -183,6 +184,9 @@ private MinHitsDefinition ::= min-hits-per-thread ':' ('-')? INTEGER_REG private NumSearchPartitionDefinition ::= num-search-partition ':' INTEGER_REG FieldWeightDefinition ::= weight DottedIdentifiers ':' INTEGER_REG StrictDefinition ::= strict ':' (true | false) +InputsDefinition ::= inputs '{' InputsBody '}' +InputsBody ::= (QueryDefinition ':' TensorType)* + FirstPhaseDefinition ::= first-phase '{' FirstPhaseBody '}' { mixin="ai.vespa.intellij.schema.psi.impl.SdFirstPhaseDefinitionMixin" } FirstPhaseBody ::= FirstPhaseBodyOptions* // Does not support zero-or-one occurrences private FirstPhaseBodyOptions ::= (keep-rank-count ':' INTEGER_REG) | (rank-score-drop-limit ':' ('-')? (FLOAT_REG | INTEGER_REG)) | ExpressionDefinition diff --git a/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex b/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex index eaaab813202..3947a9fb2eb 100644 --- a/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex +++ b/integration/intellij/src/main/jflex/ai/vespa/intellij/schema/lexer/sd.flex @@ -146,6 +146,7 @@ WORD = \w+ "loose" { return LOOSE; } "strict" { return STRICT; } "rank-properties" { return RANK_PROPERTIES; } + "inputs" { return INPUTS; } "first-phase" { return FIRST_PHASE; } "keep-rank-count" { return KEEP_RANK_COUNT; } |