ATEST-304

This commit is contained in:
Fabian Märki
2016-01-25 09:38:58 +01:00
parent 79a350b9e5
commit 3730bf84d9

View File

@ -27,7 +27,7 @@ import ch.psi.daq.domain.cassandra.MetaPulseId;
import ch.psi.daq.domain.cassandra.query.PulseIdRangeQuery;
import ch.psi.daq.domain.cassandra.query.TimeRangeQuery;
import ch.psi.daq.domain.cassandra.querying.ChannelEventQuery;
import ch.psi.daq.domain.cassandra.querying.ChannelEventQueryInfo;
import ch.psi.daq.domain.cassandra.querying.MetaChannelEvent;
import ch.psi.daq.domain.cassandra.querying.EventQuery;
public class DummyCassandraReader implements CassandraReader {
@ -108,8 +108,8 @@ public class DummyCassandraReader implements CassandraReader {
@Override
public Stream<ChannelEvent> getEventStream(EventQuery eventQuery, Stream<? extends ChannelEventQuery> queryProviders) {
Stream<ChannelEvent> result = queryProviders.map(ceq -> {
if (ceq instanceof ChannelEventQueryInfo) {
return getEvent((ChannelEventQueryInfo) ceq);
if (ceq instanceof MetaChannelEvent) {
return getEvent((MetaChannelEvent) ceq);
} else {
throw new UnsupportedOperationException("This is not yet implemented!");
}
@ -224,7 +224,7 @@ public class DummyCassandraReader implements CassandraReader {
* @{inheritDoc
*/
@Override
public ChannelEvent getEvent(ChannelEventQueryInfo queryInfo, String... columns) {
public ChannelEvent getEvent(MetaChannelEvent queryInfo, String... columns) {
if (queryInfo.getPulseId() > 0) {
return (ChannelEvent) getDummyEvents(queryInfo.getChannel(), queryInfo.getPulseId(), queryInfo.getPulseId())
.get(0);
@ -237,8 +237,8 @@ public class DummyCassandraReader implements CassandraReader {
* @{inheritDoc
*/
@Override
public CompletableFuture<ChannelEvent> getEventAsync(ChannelEventQueryInfo queryInfo, String... columns) {
// implement when needed
public CompletableFuture<ChannelEvent> getEventAsync(MetaChannelEvent queryInfo, String... columns) {
// implement when needed
throw new UnsupportedOperationException();
}
@ -249,7 +249,6 @@ public class DummyCassandraReader implements CassandraReader {
public Stream<? extends ChannelEventQuery> getChannelEventQueryStream(PulseIdRangeQuery query) {
return dataGen.generateMetaPulseId(
KEYSPACE,
query.getStartPulseId(),
(query.getEndPulseId() - query.getStartPulseId() + 1),
i -> i * 10,
@ -278,7 +277,7 @@ public class DummyCassandraReader implements CassandraReader {
* @{inheritDoc
*/
@Override
public Stream<MetaPulseId> getMetaPulseIdStream(PulseIdRangeQuery query) {
public Stream<MetaPulseId> getMetaStream(PulseIdRangeQuery query) {
return getChannelEventQueryStream(query).map(r -> {
return (MetaPulseId) r;
@ -291,22 +290,28 @@ public class DummyCassandraReader implements CassandraReader {
* @{inheritDoc
*/
@Override
public Stream<? extends ChannelEventQueryInfo> getMetaTimeStream(TimeRangeQuery query) {
public Stream<? extends MetaChannelEvent> getMetaStream(TimeRangeQuery query) {
return getChannelEventQueryStream(query).map(r -> {
return (ChannelEventQueryInfo) r;
return (MetaChannelEvent) r;
});
}
@Override
public Stream<ChannelEvent> getEventStream(Stream<? extends ChannelEventQueryInfo> queryInfos) {
public Stream<ChannelEvent> getEventStream(Stream<? extends MetaChannelEvent> queryInfos) {
return getEventStream(null, queryInfos);
}
@Override
public ChannelConfiguration getChannelConfiguration(String channel) {
public Stream<ChannelConfiguration> getChannelConfiguration(TimeRangeQuery query) {
// implement when needed
throw new UnsupportedOperationException();
}
@Override
public ChannelConfiguration getChannelConfigurationBefore(TimeRangeQuery query) {
try {
return getChannelConfigurationAsync(channel)
return getChannelConfigurationBeforeAsync(query)
.get(30, TimeUnit.SECONDS);
} catch (Throwable t) {
LOGGER.error("Could not read ChannelConfiguration from DB.", t);
@ -315,7 +320,24 @@ public class DummyCassandraReader implements CassandraReader {
}
@Override
public CompletableFuture<ChannelConfiguration> getChannelConfigurationAsync(String channel) {
public CompletableFuture<ChannelConfiguration> getChannelConfigurationBeforeAsync(TimeRangeQuery query) {
// implement when needed
throw new UnsupportedOperationException();
}
@Override
public ChannelConfiguration getChannelConfigurationAfter(TimeRangeQuery query) {
try {
return getChannelConfigurationAfterAsync(query)
.get(30, TimeUnit.SECONDS);
} catch (Throwable t) {
LOGGER.error("Could not read ChannelConfiguration from DB.", t);
return null;
}
}
@Override
public CompletableFuture<ChannelConfiguration> getChannelConfigurationAfterAsync(TimeRangeQuery query) {
// implement when needed
throw new UnsupportedOperationException();
}