Projects information

Chunk

Conflicting content
import com.browseengine.bobo.api.BoboIndexReader; <<<<<<< HEAD public class SenseiHourglassFactory ======= public class SenseiHourglassFactory extends SenseiZoieFactory >>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7 { private static Logger log = Logger.getLogger(SenseiHourglassFactory.class); protected File _idxDir;

Conflicting content

import com.browseengine.bobo.api.BoboIndexReader;

<<<<<<< HEAD
public class SenseiHourglassFactory
=======
public class SenseiHourglassFactory extends SenseiZoieFactory
>>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7
{
  private static Logger log = Logger.getLogger(SenseiHourglassFactory.class);
  protected File _idxDir;

Solution content
import com.browseengine.bobo.api.BoboIndexReader; public class SenseiHourglassFactory extends SenseiZoieFactory { private static Logger log = Logger.getLogger(SenseiHourglassFactory.class); protected File _idxDir;

Solution content

import com.browseengine.bobo.api.BoboIndexReader;

public class SenseiHourglassFactory extends SenseiZoieFactory
{
  private static Logger log = Logger.getLogger(SenseiHourglassFactory.class);
  protected File _idxDir;

File
SenseiHourglassFactory.java

Developer's decision
Manual

Kind of conflict
Class signature

Chunk

Conflicting content
+ " frequency: " + frequency + " trimThreshold: " + trimThreshold); } <<<<<<< HEAD public static File getPath(File idxDir,int nodeId,int partitionId){ File nodeLevelFile = new File(idxDir, "node"+nodeId); return new File(nodeLevelFile, "shard"+partitionId); } public Hourglass getHourglass(int nodeId,int partitionId) ======= @Override public Hourglass getZoieInstance(int nodeId,int partitionId) >>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7 { File partDir = getPath(nodeId,partitionId); if(!partDir.exists())

Conflicting content

        + " frequency: " + frequency
        + " trimThreshold: " + trimThreshold);
  }
<<<<<<< HEAD
  
  public static File getPath(File idxDir,int nodeId,int partitionId){
    File nodeLevelFile = new File(idxDir, "node"+nodeId);  
    return new File(nodeLevelFile, "shard"+partitionId); 
  }
  
  public Hourglass getHourglass(int nodeId,int partitionId)
=======
  @Override
  public Hourglass getZoieInstance(int nodeId,int partitionId)
>>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7
  {
    File partDir = getPath(nodeId,partitionId);
    if(!partDir.exists())

Solution content
+ " frequency: " + frequency + " trimThreshold: " + trimThreshold); } @Override public Hourglass getZoieInstance(int nodeId,int partitionId) { File partDir = getPath(nodeId,partitionId); if(!partDir.exists())

Solution content

        + " frequency: " + frequency
        + " trimThreshold: " + trimThreshold);
  }
  @Override
  public Hourglass getZoieInstance(int nodeId,int partitionId)
  {
    File partDir = getPath(nodeId,partitionId);
    if(!partDir.exists())

File
SenseiHourglassFactory.java

Developer's decision
Manual

Kind of conflict
Annotation
Method declaration
Method signature

Chunk

Conflicting content
private String _partitionString; private NetworkServer _networkServer; private ClusterClient _clusterClient; <<<<<<< HEAD private SenseiZoieSystemFactory _zoieSystemFactory; ======= private SenseiZoieFactory _zoieFactory; >>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7 private SenseiIndexLoaderFactory _indexLoaderFactory; private SenseiQueryBuilderFactory _queryBuilderFactory; private SenseiNode _node;

Conflicting content

    private String _partitionString;
    private NetworkServer _networkServer;
    private ClusterClient _clusterClient;
<<<<<<< HEAD
    private SenseiZoieSystemFactory _zoieSystemFactory;
=======
    private SenseiZoieFactory _zoieFactory;
>>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7
    private SenseiIndexLoaderFactory _indexLoaderFactory;
    private SenseiQueryBuilderFactory _queryBuilderFactory;
    private SenseiNode _node;

Solution content
private String _partitionString; private NetworkServer _networkServer; private ClusterClient _clusterClient; private SenseiZoieFactory _zoieFactory; private SenseiIndexLoaderFactory _indexLoaderFactory; private SenseiQueryBuilderFactory _queryBuilderFactory; private SenseiNode _node;

Solution content

    private String _partitionString;
    private NetworkServer _networkServer;
    private ClusterClient _clusterClient;
    private SenseiZoieFactory _zoieFactory;
    private SenseiIndexLoaderFactory _indexLoaderFactory;
    private SenseiQueryBuilderFactory _queryBuilderFactory;
    private SenseiNode _node;

File
SenseiServer.java

Developer's decision
Manual

Kind of conflict
Attribute

Chunk

Conflicting content
public SenseiServer(int id, int port, int[] partitions, NetworkServer networkServer, ClusterClient clusterClient, <<<<<<< HEAD SenseiZoieSystemFactory zoieSystemFactory, ======= SenseiZoieFactory zoieSystemFactory, >>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7 SenseiIndexLoaderFactory indexLoaderFactory, SenseiQueryBuilderFactory queryBuilderFactory){ this(id,port,partitions,null,networkServer,clusterClient,zoieSystemFactory,indexLoaderFactory,queryBuilderFactory);

Conflicting content

    public SenseiServer(int id, int port, int[] partitions,
            NetworkServer networkServer,
            ClusterClient clusterClient,
<<<<<<< HEAD
            SenseiZoieSystemFactory zoieSystemFactory,
=======
            SenseiZoieFactory zoieSystemFactory,
>>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7
            SenseiIndexLoaderFactory indexLoaderFactory,
            SenseiQueryBuilderFactory queryBuilderFactory){
    	this(id,port,partitions,null,networkServer,clusterClient,zoieSystemFactory,indexLoaderFactory,queryBuilderFactory);

Solution content
public SenseiServer(int id, int port, int[] partitions, NetworkServer networkServer, ClusterClient clusterClient, SenseiZoieFactory zoieSystemFactory, SenseiIndexLoaderFactory indexLoaderFactory, SenseiQueryBuilderFactory queryBuilderFactory){ this(id,port,partitions,null,networkServer,clusterClient,zoieSystemFactory,indexLoaderFactory,queryBuilderFactory);

Solution content

    public SenseiServer(int id, int port, int[] partitions,
            NetworkServer networkServer,
            ClusterClient clusterClient,
            SenseiZoieFactory zoieSystemFactory,
            SenseiIndexLoaderFactory indexLoaderFactory,
            SenseiQueryBuilderFactory queryBuilderFactory){
    	this(id,port,partitions,null,networkServer,clusterClient,zoieSystemFactory,indexLoaderFactory,queryBuilderFactory);

File
SenseiServer.java

Developer's decision
Manual

Kind of conflict
Variable

Chunk

Conflicting content
File extDir, NetworkServer networkServer, ClusterClient clusterClient, <<<<<<< HEAD SenseiZoieSystemFactory zoieSystemFactory, ======= SenseiZoieFactory zoieSystemFactory, >>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7 SenseiIndexLoaderFactory indexLoaderFactory, SenseiQueryBuilderFactory queryBuilderFactory) {

Conflicting content

                        File extDir,
                        NetworkServer networkServer,
                        ClusterClient clusterClient,
<<<<<<< HEAD
                        SenseiZoieSystemFactory zoieSystemFactory,
=======
                        SenseiZoieFactory zoieSystemFactory,
>>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7
                        SenseiIndexLoaderFactory indexLoaderFactory,
                        SenseiQueryBuilderFactory queryBuilderFactory)
    {

Solution content
File extDir, NetworkServer networkServer, ClusterClient clusterClient, SenseiZoieFactory zoieSystemFactory, SenseiIndexLoaderFactory indexLoaderFactory, SenseiQueryBuilderFactory queryBuilderFactory) {

Solution content

                        File extDir,
                        NetworkServer networkServer,
                        ClusterClient clusterClient,
                        SenseiZoieFactory zoieSystemFactory,
                        SenseiIndexLoaderFactory indexLoaderFactory,
                        SenseiQueryBuilderFactory queryBuilderFactory)
    {

File
SenseiServer.java

Developer's decision
Manual

Kind of conflict
Variable

Chunk

Conflicting content
//in simple case query builder is the same for each partition builderFactoryMap.put(part, _queryBuilderFactory); <<<<<<< HEAD Zoie zoieSystem = _zoieSystemFactory.getZoieSystem(_id,part); ======= Zoie zoieSystem = _zoieFactory.getZoieInstance(_id,part); >>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7 // register ZoieSystemAdminMBean

Conflicting content

		  //in simple case query builder is the same for each partition
		  builderFactoryMap.put(part, _queryBuilderFactory);
			
<<<<<<< HEAD
		  Zoie zoieSystem = _zoieSystemFactory.getZoieSystem(_id,part);
=======
		  Zoie zoieSystem = _zoieFactory.getZoieInstance(_id,part);
>>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7
		  
		  // register ZoieSystemAdminMBean

Solution content
//in simple case query builder is the same for each partition builderFactoryMap.put(part, _queryBuilderFactory); Zoie zoieSystem = _zoieFactory.getZoieInstance(_id,part); // register ZoieSystemAdminMBean

Solution content

		  //in simple case query builder is the same for each partition
		  builderFactoryMap.put(part, _queryBuilderFactory);
			
		  Zoie zoieSystem = _zoieFactory.getZoieInstance(_id,part);
		  
		  // register ZoieSystemAdminMBean

File
SenseiServer.java

Developer's decision
Manual

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
======= import org.apache.log4j.Logger; <<<<<<< HEAD import proj.zoie.api.ZoieVersion; import proj.zoie.api.Zoie; >>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7 import proj.zoie.api.indexing.IndexReaderDecorator; import proj.zoie.api.indexing.ZoieIndexableInterpreter; import proj.zoie.impl.indexing.ZoieConfig;

Conflicting content

=======

import org.apache.log4j.Logger;

<<<<<<< HEAD
import proj.zoie.api.ZoieVersion;
import proj.zoie.api.Zoie;
>>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7
import proj.zoie.api.indexing.IndexReaderDecorator;
import proj.zoie.api.indexing.ZoieIndexableInterpreter;
import proj.zoie.impl.indexing.ZoieConfig;

Solution content
import org.apache.log4j.Logger; import proj.zoie.api.ZoieVersion; import proj.zoie.api.indexing.IndexReaderDecorator; import proj.zoie.api.indexing.ZoieIndexableInterpreter; import proj.zoie.impl.indexing.ZoieConfig;

Solution content

import org.apache.log4j.Logger;

import proj.zoie.api.ZoieVersion;
import proj.zoie.api.indexing.IndexReaderDecorator;
import proj.zoie.api.indexing.ZoieIndexableInterpreter;
import proj.zoie.impl.indexing.ZoieConfig;

File
SenseiZoieSystemFactory.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content
import com.browseengine.bobo.api.BoboIndexReader; <<<<<<< HEAD public class SenseiZoieSystemFactory ======= public class SenseiZoieSystemFactory extends SenseiZoieFactory >>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7 { private static Logger log = Logger.getLogger(SenseiZoieSystemFactory.class); protected File _idxDir;

Conflicting content

import com.browseengine.bobo.api.BoboIndexReader;

<<<<<<< HEAD
public class SenseiZoieSystemFactory
=======
public class SenseiZoieSystemFactory extends SenseiZoieFactory
>>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7
{
  private static Logger log = Logger.getLogger(SenseiZoieSystemFactory.class);
  protected File _idxDir;

Solution content
import com.browseengine.bobo.api.BoboIndexReader; public class SenseiZoieSystemFactory extends SenseiZoieFactory { private static Logger log = Logger.getLogger(SenseiZoieSystemFactory.class); protected File _idxDir;

Solution content

import com.browseengine.bobo.api.BoboIndexReader;

public class SenseiZoieSystemFactory extends SenseiZoieFactory
{
  private static Logger log = Logger.getLogger(SenseiZoieSystemFactory.class);
  protected File _idxDir;

File
SenseiZoieSystemFactory.java

Developer's decision
Manual

Kind of conflict
Class signature

Chunk

Conflicting content
_zoieConfig = zoieConfig; } <<<<<<< HEAD public static File getPath(File idxDir,int nodeId,int partitionId){ File nodeLevelFile = new File(idxDir, "node"+nodeId); return new File(nodeLevelFile, "shard"+partitionId); } public ZoieSystem getZoieSystem(int nodeId,int partitionId) ======= @Override public ZoieSystem getZoieInstance(int nodeId,int partitionId) >>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7 { File partDir = getPath(nodeId,partitionId); if(!partDir.exists())

Conflicting content

    _zoieConfig = zoieConfig;
  }
  
<<<<<<< HEAD
  public static File getPath(File idxDir,int nodeId,int partitionId){
	  File nodeLevelFile = new File(idxDir, "node"+nodeId);  
	  return new File(nodeLevelFile, "shard"+partitionId); 
  }
  
  public ZoieSystem getZoieSystem(int nodeId,int partitionId)
=======
  @Override
  public ZoieSystem getZoieInstance(int nodeId,int partitionId)
>>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7
  {
    File partDir = getPath(nodeId,partitionId);
    if(!partDir.exists())

Solution content
_zoieConfig = zoieConfig; } @Override public ZoieSystem getZoieInstance(int nodeId,int partitionId) { File partDir = getPath(nodeId,partitionId); if(!partDir.exists())

File
SenseiZoieSystemFactory.java

Developer's decision
Manual

Kind of conflict
Annotation
Method declaration
Method signature

Chunk

Conflicting content

  }
  
  @Override
<<<<<<< HEAD
  public ZoieSystem getZoieSystem(int nodeId,int partitionId)
=======
  public ZoieSystem getZoieInstance(int nodeId,int partitionId)
>>>>>>> 16f26dc236a0b93343b6a76966cbc9f4af9dfca7
  {
    if(_zoieSystem == null)
    {

Solution content
} @Override public ZoieSystem getZoieInstance(int nodeId,int partitionId) { if(_zoieSystem == null) {

File
DemoZoieSystemFactory.java

Developer's decision
Manual

Kind of conflict
Method signature

Projects >> sensei >>86a53204d193ec6ac9cb8c57aac7ca02caa1cbed