ITQC/gls_docs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ATEST-304 ChannelEvent with Statistics

Browse Source
This commit is contained in:
Fabian Märki
2016-01-19 16:23:07 +01:00
parent 61c4efed11
commit 79a350b9e5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java
View File

@ -89,7 +89,7 @@ public class DummyCassandraReader implements CassandraReader {
*/ */
@Override @Override
public Stream<? extends DataEvent> getEventStream(String channel, long startPulseId, long endPulseId, public Stream<? extends DataEvent> getEventStream(String channel, long startPulseId, long endPulseId,
Ordering ordering, String... columns) { Ordering ordering, boolean aggregateValues, String... columns) {
return getDummyEventStream(channel, startPulseId, endPulseId); return getDummyEventStream(channel, startPulseId, endPulseId);
} }
@ -98,7 +98,7 @@ public class DummyCassandraReader implements CassandraReader {
*/ */
@Override @Override
public Stream<? extends DataEvent> getEventStream(String channel, long startMillis, long startNanos, long endMillis, public Stream<? extends DataEvent> 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); return getDummyEventStream(channel, startMillis / 10, endMillis / 10);
} }

4
src/test/java/ch/psi/daq/test/queryrest/query/DummyDataReader.java
View File

@ -35,13 +35,13 @@ public class DummyDataReader implements DataReader {
@Override @Override
public Stream<? extends DataEvent> getEventStream(String channel, long startPulseId, long endPulseId, public Stream<? extends DataEvent> getEventStream(String channel, long startPulseId, long endPulseId,
Ordering ordering, String... columns) { Ordering ordering, boolean aggregateValues, String... columns) {
return getElements(channel, startPulseId, endPulseId); return getElements(channel, startPulseId, endPulseId);
} }
@Override @Override
public Stream<? extends DataEvent> getEventStream(String channel, long startMillis, long startNanos, long endMillis, public Stream<? extends DataEvent> 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); return getElements(channel, startMillis / 10, endMillis / 10);
} }