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

Merge pull request #17 in ST/ch.psi.daq.queryrest from ATEST-267-2 to master

Browse Source 
# By Fabian Märki
# Via Fabian Märki
* commit '095087a478ceb3fe9634d9922c4db89f1c8a6807':
  ATEST-267
This commit is contained in:
Märki Fabian
2015-11-09 16:07:01 +01:00
parent 47a1237bb8 095087a478
commit 67598da153
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,10 +20,10 @@ 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;
import ch.psi.data.converters.ConverterProvider;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@ -205,7 +205,8 @@ public class DummyCassandraReader implements CassandraReader {
return dataGen.generateMetaPulseId( return dataGen.generateMetaPulseId(
KEYSPACE, KEYSPACE,
ValueForm.scalar, ConverterProvider.TYPE_INT32,
null,
query.getStartPulseId(), query.getStartPulseId(),
(query.getEndPulseId() - query.getStartPulseId() + 1), (query.getEndPulseId() - query.getStartPulseId() + 1),
i -> i, i -> i,
@ -223,7 +224,8 @@ public class DummyCassandraReader implements CassandraReader {
return dataGen.generateMetaTime( return dataGen.generateMetaTime(
KEYSPACE, KEYSPACE,
ValueForm.scalar, ConverterProvider.TYPE_INT32,
null,
query.getStartMillis(), query.getStartMillis(),
(query.getEndMillis() - query.getStartMillis() + 1), (query.getEndMillis() - query.getStartMillis() + 1),
i -> i, i -> i,