Projects >> sensei >>52d8d53d7e37ca07ea04144f3a28687dbd4b7909

Chunk
Conflicting content 

  @Override
<<<<<<< HEAD
  public StreamDataProvider buildDataProvider(
      DataSourceFilter dataFilter, String oldSinceKey) throws Exception {
    return new TwitterSampleStreamer(config, SenseiGateway.DEFAULT_VERSION_COMPARATOR);
=======
  public StreamDataProvider buildDataProvider(DataSourceFilter dataFilter,
                                                          String oldSinceKey,
                                                          ShardingStrategy shardingStrategy,
                                                          Set partitions) throws Exception{
    return new TwitterSampleStreamer(_conf, SenseiGateway.DEFAULT_VERSION_COMPARATOR);
>>>>>>> 8f07528e1bcfcb8aab10113409e61bafb6f524e2
  }

  @Override
Solution content 

  @Override

  public StreamDataProvider buildDataProvider(DataSourceFilter dataFilter,
                                                          String oldSinceKey,
                                                          ShardingStrategy shardingStrategy,
                                                          Set partitions) throws Exception{
    return new TwitterSampleStreamer(config, SenseiGateway.DEFAULT_VERSION_COMPARATOR);

  }

  @Override
File
TwitterSampleGateway.java
Developer's decision
Combination
Kind of conflict
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
import com.sensei.conf.SenseiSchema;
import com.sensei.indexing.api.DataSourceFilter;
<<<<<<< HEAD
import com.sensei.plugin.AbstractSenseiPlugin;
=======
import com.sensei.indexing.api.ShardingStrategy;
>>>>>>> 8f07528e1bcfcb8aab10113409e61bafb6f524e2
import com.sensei.plugin.SenseiPluginRegistry;

public abstract class SenseiGateway extends AbstractSenseiPlugin {
Solution content 
import com.sensei.conf.SenseiSchema;
import com.sensei.indexing.api.DataSourceFilter;
import com.sensei.indexing.api.ShardingStrategy;
import com.sensei.plugin.AbstractSenseiPlugin;
import com.sensei.plugin.SenseiPluginRegistry;

public abstract class SenseiGateway extends AbstractSenseiPlugin {
File
SenseiGateway.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 

	@Override
<<<<<<< HEAD
	public StreamDataProvider buildDataProvider(DataSourceFilter dataFilter,
			String oldSinceKey) throws Exception{

		String host = config.get("host");
		String portStr = config.get("port");
		int port = Integer.parseInt(portStr);
		String topic = config.get("topic");
		String timeoutStr = config.get("timeout");
		int timeout = timeoutStr != null ? Integer.parseInt(timeoutStr) : 10000;
		int batchsize = Integer.parseInt(config.get("batchsize"));
=======
	public StreamDataProvider buildDataProvider(final DataSourceFilter dataFilter,
      String oldSinceKey,
      ShardingStrategy shardingStrategy,
      Set partitions) throws Exception
  {
	  String zookeeperUrl = _conf.getString("zookeeperUrl");
	  String consumerGroupId = _conf.getString("consumerGroupId");
		String topic = _conf.getString("topic");
		int timeout = _conf.getInt("timeout",10000);
		int batchsize = _conf.getInt("batchsize");
>>>>>>> 8f07528e1bcfcb8aab10113409e61bafb6f524e2
		long offset = oldSinceKey == null ? 0L : Long.parseLong(oldSinceKey);
		 KafkaJsonStreamDataProvider provider = new KafkaJsonStreamDataProvider(_versionComparator,zookeeperUrl,timeout,batchsize,consumerGroupId,topic,offset);
		if (dataFilter!=null){
Solution content 


	@Override
  public StreamDataProvider buildDataProvider(final DataSourceFilter dataFilter,
      String oldSinceKey,
      ShardingStrategy shardingStrategy,
      Set partitions) throws Exception
  {
	  String zookeeperUrl = config.get("zookeeperUrl");
	  String consumerGroupId = config.get("consumerGroupId");
    String topic = config.get("topic");
    String timeoutStr = config.get("timeout");
    int timeout = timeoutStr != null ? Integer.parseInt(timeoutStr) : 10000;
    int batchsize = Integer.parseInt(config.get("batchsize"));

		long offset = oldSinceKey == null ? 0L : Long.parseLong(oldSinceKey);
		 KafkaJsonStreamDataProvider provider = new KafkaJsonStreamDataProvider(_versionComparator,zookeeperUrl,timeout,batchsize,consumerGroupId,topic,offset);
		if (dataFilter!=null){
File
KafkaDataProviderBuilder.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
import java.io.IOException;
import java.text.DecimalFormat;
<<<<<<< HEAD
import java.text.DecimalFormatSymbols;
=======
import java.util.ArrayList;
import java.util.List;
>>>>>>> 8f07528e1bcfcb8aab10113409e61bafb6f524e2
import java.util.concurrent.TimeUnit;
import java.util.Locale;
Solution content 
import java.io.IOException;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
File
TimeRetentionFilter.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
      ZoieIndexReader zoieReader = (ZoieIndexReader)reader;
      List decorated = zoieReader.getDecoratedReaders();
      
<<<<<<< HEAD
      if (facetHandler!=null){
        DecimalFormat formatter = new DecimalFormat(DefaultSenseiInterpreter.DEFAULT_FORMAT_STRING_MAP.get(MetaType.Long), new DecimalFormatSymbols(Locale.US));
        BrowseSelection sel = new BrowseSelection(_column);
        long duration = _dataUnit.convert(_nDays, TimeUnit.DAYS);
        long now = _dataUnit.convert(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
        long from = now - duration;
        sel.addValue("["+formatter.format(from)+" TO *]");
        return facetHandler.buildFilter(sel).getDocIdSet(boboReader);
=======
      List docIdSetList = new ArrayList(decorated.size());
      for (BoboIndexReader bobo : decorated){
        docIdSetList.add(buildFilterSet(bobo));
>>>>>>> 8f07528e1bcfcb8aab10113409e61bafb6f524e2
      }
      return new OrDocIdSet(docIdSetList);
    }
Solution content 
      ZoieIndexReader zoieReader = (ZoieIndexReader)reader;
      List decorated = zoieReader.getDecoratedReaders();


      List docIdSetList = new ArrayList(decorated.size());
      for (BoboIndexReader bobo : decorated){
        docIdSetList.add(buildFilterSet(bobo));

      }
      return new OrDocIdSet(docIdSetList);
    }
File
TimeRetentionFilter.java
Developer's decision
Version 2
Kind of conflict
For statement
If statement
Method invocation
Return statement
Variable