diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-10-27 19:07:15 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-10-27 19:07:15 +0100 |
commit | e9bd7b1f84bfce80592c222198b7bb7a912a710e (patch) | |
tree | 027e9dc7ce914ab2e9c4fe31169d78f33f5eda30 /docproc | |
parent | 25aebb11668d399345aa38d67b4adb97423827f9 (diff) |
... and now, for something complete different (simplify)
Diffstat (limited to 'docproc')
-rw-r--r-- | docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java | 12 | ||||
-rw-r--r-- | docproc/src/main/java/com/yahoo/docproc/Processing.java | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java b/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java index c80d9a166a8..f2d971ac5d0 100644 --- a/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java +++ b/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java @@ -38,14 +38,8 @@ public class DocprocExecutor { */ public DocprocExecutor(String name, CallStack callStack) { this.name = name; - String chainDimension = name; - if (name != null) { - chainDimension = name.replaceAll("[^\\p{Alnum}]", "_"); - docCounterName = "chain_" + name.replaceAll("[^\\p{Alnum}]", "_") + "_documents"; - } else { - //name is null - docCounterName = "chain_" + name + "_documents"; - } + String chainDimension = name != null ? name.replaceAll("[^\\p{Alnum}]", "_") : name; + docCounterName = "chain_" + chainDimension + "_documents"; docCounter = new Counter(docCounterName, callStack.getStatistics(), false); this.metric = callStack.getMetric(); this.callStack = callStack; @@ -80,7 +74,7 @@ public class DocprocExecutor { private void incrementNumDocsProcessed(int num) { docCounter.increment(num); metric.add(docCounterName, num, null); - metric.add(METRIC_NAME_DOCUMENTS_PROCESSED,num,this.context); + metric.add(METRIC_NAME_DOCUMENTS_PROCESSED, num, this.context); } private void incrementNumDocsProcessed(Processing processing) { diff --git a/docproc/src/main/java/com/yahoo/docproc/Processing.java b/docproc/src/main/java/com/yahoo/docproc/Processing.java index eb918e3ea0c..a029d4f4da3 100644 --- a/docproc/src/main/java/com/yahoo/docproc/Processing.java +++ b/docproc/src/main/java/com/yahoo/docproc/Processing.java @@ -43,6 +43,7 @@ public class Processing { /** The registry of docproc services. */ private ComponentRegistry<DocprocService> docprocServiceRegistry = null; + private boolean getNumDocsCalled = false; /** |