From 79a350b9e50d681f3d162e3f04169f1f1083861d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Tue, 19 Jan 2016 16:23:07 +0100 Subject: [PATCH] ATEST-304 ChannelEvent with Statistics --- .../ch/psi/daq/test/queryrest/query/DummyCassandraReader.java | 4 ++-- .../java/ch/psi/daq/test/queryrest/query/DummyDataReader.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java b/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java index 67bf735..2af8c81 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java +++ b/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java @@ -89,7 +89,7 @@ public class DummyCassandraReader implements CassandraReader { */ @Override public Stream getEventStream(String channel, long startPulseId, long endPulseId, - Ordering ordering, String... columns) { + Ordering ordering, boolean aggregateValues, String... columns) { return getDummyEventStream(channel, startPulseId, endPulseId); } @@ -98,7 +98,7 @@ public class DummyCassandraReader implements CassandraReader { */ @Override public Stream getEventStream(String channel, long startMillis, long startNanos, long endMillis, - long endNanos, Ordering ordering, String... columns) { + long endNanos, Ordering ordering, boolean aggregateValues, String... columns) { return getDummyEventStream(channel, startMillis / 10, endMillis / 10); } diff --git a/src/test/java/ch/psi/daq/test/queryrest/query/DummyDataReader.java b/src/test/java/ch/psi/daq/test/queryrest/query/DummyDataReader.java index c86c6d8..4aee732 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/query/DummyDataReader.java +++ b/src/test/java/ch/psi/daq/test/queryrest/query/DummyDataReader.java @@ -35,13 +35,13 @@ public class DummyDataReader implements DataReader { @Override public Stream getEventStream(String channel, long startPulseId, long endPulseId, - Ordering ordering, String... columns) { + Ordering ordering, boolean aggregateValues, String... columns) { return getElements(channel, startPulseId, endPulseId); } @Override public Stream getEventStream(String channel, long startMillis, long startNanos, long endMillis, - long endNanos, Ordering ordering, String... columns) { + long endNanos, Ordering ordering, boolean aggregateValues, String... columns) { return getElements(channel, startMillis / 10, endMillis / 10); }