You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by vd...@apache.org on 2016/06/18 00:16:40 UTC
incubator-quarks git commit: QUARKS-189 Do not inject counter metrics
after a CounterOp
Repository: incubator-quarks
Updated Branches:
refs/heads/master f56bf096f -> 3d4646b67
QUARKS-189 Do not inject counter metrics after a CounterOp
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/3d4646b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/3d4646b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/3d4646b6
Branch: refs/heads/master
Commit: 3d4646b67d723583fc8df58e5714ad81c93a199b
Parents: f56bf09
Author: Victor Dogaru <vd...@apache.org>
Authored: Fri Jun 17 16:40:25 2016 -0700
Committer: Victor Dogaru <vd...@apache.org>
Committed: Fri Jun 17 16:40:25 2016 -0700
----------------------------------------------------------------------
utils/metrics/src/main/java/quarks/metrics/Metrics.java | 8 ++++++--
.../java/quarks/test/metrics/MetricsEverywhereTest.java | 11 ++++++-----
2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/3d4646b6/utils/metrics/src/main/java/quarks/metrics/Metrics.java
----------------------------------------------------------------------
diff --git a/utils/metrics/src/main/java/quarks/metrics/Metrics.java b/utils/metrics/src/main/java/quarks/metrics/Metrics.java
index 920a465..612394a 100644
--- a/utils/metrics/src/main/java/quarks/metrics/Metrics.java
+++ b/utils/metrics/src/main/java/quarks/metrics/Metrics.java
@@ -18,7 +18,6 @@ under the License.
*/
package quarks.metrics;
-import quarks.function.Functions;
import quarks.metrics.oplets.CounterOp;
import quarks.metrics.oplets.RateMeter;
import quarks.topology.TStream;
@@ -64,6 +63,8 @@ public class Metrics {
* oplet is inserted after the last Peek, right upstream from oplet B.</li>
* <li>If a chain a Peek oplets is followed by a FanOut, a metric oplet is
* inserted between the last Peek and the FanOut oplet.</li>
+ * <li>Oplets are not inserted immediately downstream from another
+ * {@code CounterOp} oplet (but they are inserted upstream from one.)</li>
* </ul>
* The implementation is not idempotent: Calling the method twice
* will insert a new set of metric oplets into the graph.
@@ -73,6 +74,9 @@ public class Metrics {
*/
public static void counter(Topology t) {
// peekAll() embodies the above exclusion semantics
- t.graph().peekAll(() -> new CounterOp<>(), Functions.alwaysTrue());
+ t.graph().peekAll(
+ () -> new CounterOp<>(),
+ v -> v.getInstance().getClass() != CounterOp.class
+ );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/3d4646b6/utils/metrics/src/test/java/quarks/test/metrics/MetricsEverywhereTest.java
----------------------------------------------------------------------
diff --git a/utils/metrics/src/test/java/quarks/test/metrics/MetricsEverywhereTest.java b/utils/metrics/src/test/java/quarks/test/metrics/MetricsEverywhereTest.java
index df4c8ee..62cdf79 100644
--- a/utils/metrics/src/test/java/quarks/test/metrics/MetricsEverywhereTest.java
+++ b/utils/metrics/src/test/java/quarks/test/metrics/MetricsEverywhereTest.java
@@ -145,6 +145,7 @@ public abstract class MetricsEverywhereTest extends TopologyAbstractTest {
}
// Apply Metrics on all streams, graph with split oplet and Metric oplet
+ // Counter oplets are inserted everywhere except after OP_2 (Counter).
@Test
public void metricsEverywhereSplit() throws Exception {
@@ -184,10 +185,10 @@ public abstract class MetricsEverywhereTest extends TopologyAbstractTest {
printGraph(g);
Collection<Vertex<? extends Oplet<?, ?>, ?, ?>> vertices = g.getVertices();
- assertEquals(11, vertices.size());
+ assertEquals(10, vertices.size());
Collection<Edge> edges = g.getEdges();
- assertEquals(10, edges.size());
+ assertEquals(9, edges.size());
}
@Test
@@ -332,9 +333,9 @@ public abstract class MetricsEverywhereTest extends TopologyAbstractTest {
}
private void printGraph(Graph g) {
- // Gson gson = new GsonBuilder().setPrettyPrinting().create();
- // String json = gson.toJson(new GraphType(g));
- // System.out.println(json);
+// Gson gson = new GsonBuilder().setPrettyPrinting().create();
+// String json = gson.toJson(new GraphType(g));
+// System.out.println(json);
}
@SuppressWarnings("serial")