ATEST-81:

- first draft for distributed querying
This commit is contained in:
Zellweger Christof Ralf
2015-06-24 17:26:26 +02:00
parent f7aeb4729f
commit 5eb649fb34
3 changed files with 10 additions and 8 deletions

View File

@ -31,6 +31,7 @@ import org.springframework.context.annotation.ComponentScan;
// comment below
@ComponentScan(basePackages = {
"ch.psi.daq.rest",
"ch.psi.daq.hazelcast",
"ch.psi.daq.cassandra.config", // define the package name with the CassandraConfig
// configuration, or @Import it (see above)
"ch.psi.daq.cassandra.reader",

View File

@ -3,23 +3,22 @@ package ch.psi.daq.rest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import ch.psi.daq.common.statistic.StorelessStatistics;
import ch.psi.daq.domain.cassandra.ChannelEvent;
import ch.psi.daq.hazelcast.query.processor.QueryProcessor;
import ch.psi.daq.hazelcast.query.processor.cassandra.CassandraQueryProcessorLocal;
import ch.psi.daq.rest.model.PropertyFilterMixin;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.databind.ObjectMapper;
import ch.psi.daq.common.statistic.StorelessStatistics;
import ch.psi.daq.domain.cassandra.ChannelEvent;
import ch.psi.daq.hazelcast.query.processor.QueryProcessor;
import ch.psi.daq.hazelcast.query.processor.cassandra.CassandraQueryProcessorDistributed;
import ch.psi.daq.rest.model.PropertyFilterMixin;
@Configuration
public class DaqRestConfiguration {
@Bean
public QueryProcessor queryProcessor() {
// return new DummyQueryProcessor();
return new CassandraQueryProcessorLocal();
return new CassandraQueryProcessorDistributed();
}
@Bean

View File

@ -1 +1,3 @@
server.port=8080
cassandra.basekeyspace=daq_zellweger_rest