diff options
| author | Henrik <henrik.hoiness@online.no> | 2018-08-03 10:52:17 +0200 |
|---|---|---|
| committer | Henrik <henrik.hoiness@online.no> | 2018-08-03 10:52:17 +0200 |
| commit | 3b727c5943c9d6774e57c396930fb811bceb5c31 (patch) | |
| tree | 16a474fd44c79484f97016b773070fce36bfd3bc | |
| parent | b91884508dce92a35415de9c5bb85f1b691c69a7 (diff) | |
Added SELECT parameter to provider.def - missed that ProviderConfig.java was created from config and did not get my code-changes
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/query/SelectParser.java | 3 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/provider.def | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/SelectParser.java b/container-search/src/main/java/com/yahoo/search/query/SelectParser.java index 66beda53804..e756a2612d4 100644 --- a/container-search/src/main/java/com/yahoo/search/query/SelectParser.java +++ b/container-search/src/main/java/com/yahoo/search/query/SelectParser.java @@ -260,7 +260,6 @@ public class SelectParser implements Parser { private Inspector getChildren(Inspector inspector){ - HashMap<Integer, Inspector> children = new HashMap<>(); if (inspector.type() == ARRAY){ return inspector; @@ -426,8 +425,10 @@ public class SelectParser implements Parser { switch (key){ case CONNECTION_ID: id[0] = (int) value.asLong(); + break; case CONNECTION_WEIGHT: weight[0] = value.asDouble(); + break; } }); connectedItems.add(new ConnectedItem(out, id[0], weight[0])); diff --git a/container-search/src/main/resources/configdefinitions/provider.def b/container-search/src/main/resources/configdefinitions/provider.def index 79b09913b49..f9ab305b114 100644 --- a/container-search/src/main/resources/configdefinitions/provider.def +++ b/container-search/src/main/resources/configdefinitions/provider.def @@ -35,7 +35,7 @@ yca.ttl int default=0 yca.retry int default=0 # The form of the serialized query. -queryType enum { LEGACY, PROGRAMMATIC, YQL } default=LEGACY +queryType enum { LEGACY, PROGRAMMATIC, YQL, SELECT } default=LEGACY # How to do pinging against a backend. pingOption enum { DISABLE, NORMAL, YCA } default=NORMAL |