diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-01-04 22:09:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-04 22:09:00 +0100 |
commit | 289bd85fd01b8757f7fc066357597b2cd3c08cb5 (patch) | |
tree | cffb9214de794c15949bd0810c12e2b3de809137 /config-model/src | |
parent | 8011defcea5a8e09dcc437e56db1c59c3d14f72d (diff) | |
parent | e0f2f7b1326fc7fa97dc862b23dd1b2d3725cff8 (diff) |
Merge pull request #7997 from vespa-engine/hmusum/simplify-3
Simplify
Diffstat (limited to 'config-model/src')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java index 25c8a204c26..81f901fc849 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java @@ -24,7 +24,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui if (equals("dispatch", e)) { handleDispatch(e, tuning); } else if (equals("searchnode", e)) { - handleSearchNode(deployState.getDeployLogger(), parent, e, tuning); + handleSearchNode(deployState.getDeployLogger(), e, tuning); } } return tuning; @@ -59,13 +59,13 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui } } - private void handleSearchNode(DeployLogger deployLogger, AbstractConfigProducer parent, Element spec, Tuning t) { + private void handleSearchNode(DeployLogger deployLogger, Element spec, Tuning t) { t.searchNode = new Tuning.SearchNode(); for (Element e : XML.getChildren(spec)) { if (equals("requestthreads", e)) { handleRequestThreads(e, t.searchNode); } else if (equals("flushstrategy", e)) { - handleFlushStrategy(deployLogger, parent,e, t.searchNode); + handleFlushStrategy(deployLogger,e, t.searchNode); } else if (equals("resizing", e)) { handleResizing(e, t.searchNode); } else if (equals("index", e)) { @@ -73,7 +73,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui } else if (equals("attribute", e)) { handleAttribute(e, t.searchNode); } else if (equals("summary", e)) { - handleSummary(deployLogger, parent, e, t.searchNode); + handleSummary(deployLogger, e, t.searchNode); } else if (equals("initialize", e)) { handleInitialize(e, t.searchNode); } else if (equals("feeding", e)) { @@ -96,15 +96,15 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui } } - private void handleFlushStrategy(DeployLogger deployLogger, AbstractConfigProducer parent, Element spec, Tuning.SearchNode sn) { + private void handleFlushStrategy(DeployLogger deployLogger, Element spec, Tuning.SearchNode sn) { for (Element e : XML.getChildren(spec)) { if (equals("native", e)) { - handleNativeStrategy(deployLogger, parent, e, sn); + handleNativeStrategy(deployLogger, e, sn); } } } - private void handleNativeStrategy(DeployLogger deployLogger, AbstractConfigProducer parent, Element spec, Tuning.SearchNode sn) { + private void handleNativeStrategy(DeployLogger deployLogger, Element spec, Tuning.SearchNode sn) { sn.strategy = new Tuning.SearchNode.FlushStrategy(); Tuning.SearchNode.FlushStrategy fs = sn.strategy; for (Element e : XML.getChildren(spec)) { @@ -188,7 +188,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui } } - private void handleSummary(DeployLogger deployLogger, AbstractConfigProducer parent, Element spec, Tuning.SearchNode sn) { + private void handleSummary(DeployLogger deployLogger, Element spec, Tuning.SearchNode sn) { sn.summary = new Tuning.SearchNode.Summary(); for (Element e : XML.getChildren(spec)) { if (equals("io", e)) { @@ -201,24 +201,24 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui } } } else if (equals("store", e)) { - handleSummaryStore(deployLogger, parent, e, sn.summary); + handleSummaryStore(deployLogger, e, sn.summary); } } } - private void handleSummaryStore(DeployLogger deployLogger, AbstractConfigProducer parent, Element spec, Tuning.SearchNode.Summary s) { + private void handleSummaryStore(DeployLogger deployLogger, Element spec, Tuning.SearchNode.Summary s) { s.store = new Tuning.SearchNode.Summary.Store(); for (Element e : XML.getChildren(spec)) { if (equals("cache", e)) { s.store.cache = new Tuning.SearchNode.Summary.Store.Component(); - handleSummaryStoreComponent(deployLogger, parent, e, s.store.cache); + handleSummaryStoreComponent(deployLogger, e, s.store.cache); } else if (equals("logstore", e)) { - handleSummaryLogStore(deployLogger, parent, e, s.store); + handleSummaryLogStore(deployLogger, e, s.store); } } } - private void handleSummaryStoreComponent(DeployLogger deployLogger, AbstractConfigProducer parent, Element spec, Tuning.SearchNode.Summary.Store.Component c) { + private void handleSummaryStoreComponent(DeployLogger deployLogger, Element spec, Tuning.SearchNode.Summary.Store.Component c) { for (Element e : XML.getChildren(spec)) { if (equals("maxsize", e)) { c.maxSize = asLong(e); @@ -245,7 +245,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui } } - private void handleSummaryLogStore(DeployLogger deployLogger, AbstractConfigProducer parent, Element spec, Tuning.SearchNode.Summary.Store s) { + private void handleSummaryLogStore(DeployLogger deployLogger, Element spec, Tuning.SearchNode.Summary.Store s) { s.logStore = new Tuning.SearchNode.Summary.Store.LogStore(); for (Element e : XML.getChildren(spec)) { if (equals("maxfilesize", e)) { @@ -261,7 +261,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui s.logStore.numThreads = asInt(e); } else if (equals("chunk", e)) { s.logStore.chunk = new Tuning.SearchNode.Summary.Store.Component(true); - handleSummaryStoreComponent(deployLogger, parent, e, s.logStore.chunk); + handleSummaryStoreComponent(deployLogger, e, s.logStore.chunk); } } } |