ATEST-267

This commit is contained in:
Fabian Märki
2015-10-30 16:16:28 +01:00
parent 9179f78905
commit e463716858

View File

@ -20,6 +20,7 @@ import ch.psi.daq.domain.DataEvent;
import ch.psi.daq.domain.cassandra.ChannelEvent; import ch.psi.daq.domain.cassandra.ChannelEvent;
import ch.psi.daq.domain.cassandra.MetaPulseId; import ch.psi.daq.domain.cassandra.MetaPulseId;
import ch.psi.daq.domain.cassandra.MetaTime; import ch.psi.daq.domain.cassandra.MetaTime;
import ch.psi.daq.domain.cassandra.ValueForm;
import ch.psi.daq.domain.cassandra.querying.ChannelEventQuery; import ch.psi.daq.domain.cassandra.querying.ChannelEventQuery;
import ch.psi.daq.domain.cassandra.querying.ChannelEventQueryInfo; import ch.psi.daq.domain.cassandra.querying.ChannelEventQueryInfo;
import ch.psi.daq.domain.cassandra.querying.EventQuery; import ch.psi.daq.domain.cassandra.querying.EventQuery;
@ -204,6 +205,7 @@ public class DummyCassandraReader implements CassandraReader {
return dataGen.generateMetaPulseId( return dataGen.generateMetaPulseId(
KEYSPACE, KEYSPACE,
ValueForm.scalar,
query.getStartPulseId(), query.getStartPulseId(),
(query.getEndPulseId() - query.getStartPulseId() + 1), (query.getEndPulseId() - query.getStartPulseId() + 1),
i -> i, i -> i,
@ -221,6 +223,7 @@ public class DummyCassandraReader implements CassandraReader {
return dataGen.generateMetaTime( return dataGen.generateMetaTime(
KEYSPACE, KEYSPACE,
ValueForm.scalar,
query.getStartMillis(), query.getStartMillis(),
(query.getEndMillis() - query.getStartMillis() + 1), (query.getEndMillis() - query.getStartMillis() + 1),
i -> i, i -> i,