Projects >> zoie >>55f2fc12ebbcf3beafc1de4f82e9901ce541be9f

Chunk
Conflicting content 
import proj.zoie.impl.indexing.internal.ZoieIndexDeletionPolicy;
import proj.zoie.api.ZoieVersion;

<<<<<<< HEAD
public class Hourglass implements IndexReaderFactory>, DataConsumer
=======
public class Hourglass implements Zoie
>>>>>>> 90bd142922d9f2b357b1953e8df608ea4193d1d5
{
  public static final Logger log = Logger.getLogger(Hourglass.class);
  private final HourglassDirectoryManagerFactory _dirMgrFactory;
Solution content 
import proj.zoie.impl.indexing.internal.ZoieIndexDeletionPolicy;
import proj.zoie.api.ZoieVersion;

public class Hourglass implements Zoie
{
  public static final Logger log = Logger.getLogger(Hourglass.class);
  private final HourglassDirectoryManagerFactory _dirMgrFactory;
File
Hourglass.java
Developer's decision
Manual
Kind of conflict
Class signature
Chunk
Conflicting content 
/**
 * Zoie system, main class.
 */
<<<<<<< HEAD
public class ZoieSystem
    extends AsyncDataConsumer implements DataConsumer,
    IndexReaderFactory>, ZoieVersionFactory
{

  private static final Logger log = Logger.getLogger(ZoieSystem.class);

  private final DirectoryManager _dirMgr;
  private final boolean _realtimeIndexing;
  private final SearchIndexManager _searchIdxMgr;
  private final ZoieIndexableInterpreter _interpreter;
  private final Analyzer _analyzer;
  private final Similarity _similarity;

  private final Queue> _lsnrList;
  private final BatchedIndexDataLoader _rtdc;
  private final DiskLuceneIndexDataLoader _diskLoader;
  private volatile boolean alreadyShutdown = false;
=======
public class ZoieSystem extends AsyncDataConsumer implements Zoie
{

	private static final Logger log = Logger.getLogger(ZoieSystem.class);
	
	private final DirectoryManager _dirMgr;
	private final boolean _realtimeIndexing;
	private final SearchIndexManager _searchIdxMgr;
	private final ZoieIndexableInterpreter _interpreter;
	private final Analyzer _analyzer;
	private final Similarity _similarity;
	private final Queue _lsnrList;
	private final BatchedIndexDataLoader _rtdc;
	private final DiskLuceneIndexDataLoader _diskLoader;
	private volatile boolean alreadyShutdown = false;
>>>>>>> 90bd142922d9f2b357b1953e8df608ea4193d1d5
  private final ReentrantReadWriteLock _shutdownLock = new ReentrantReadWriteLock();

  /**
Solution content 
/**
 * Zoie system, main class.
 */

public class ZoieSystem
extends AsyncDataConsumer implements Zoie
{

  private static final Logger log = Logger.getLogger(ZoieSystem.class);

  private final DirectoryManager _dirMgr;
  private final boolean _realtimeIndexing;
  private final SearchIndexManager _searchIdxMgr;
  private final ZoieIndexableInterpreter _interpreter;
  private final Analyzer _analyzer;
  private final Similarity _similarity;

  private final Queue> _lsnrList;
  private final BatchedIndexDataLoader _rtdc;
  private final DiskLuceneIndexDataLoader _diskLoader;
  private volatile boolean alreadyShutdown = false;
  private final ReentrantReadWriteLock _shutdownLock = new ReentrantReadWriteLock();

  /**
File
ZoieSystem.java
Developer's decision
Manual
Kind of conflict
Attribute
Class signature
Method invocation
Chunk
Conflicting content 
  }
      log.info("all events flushed to disk");
    }

<<<<<<< HEAD
    public void flushToMemoryIndex() throws ZoieException
    {
      log.info("flushing to memory");
      ZoieSystem.this.flushEventsToMemoryIndex(Long.MAX_VALUE);
      log.info("all events flushed to memory");
    }

    public void setBatchDelay(long batchDelay)
    {
      _rtdc.setDelay(batchDelay);
    }

    public void setBatchSize(int batchSize)
    {
      _rtdc.setBatchSize(batchSize);
    }

    public void setMaxBatchSize(int maxBatchSize)
    {
      ZoieSystem.this.setMaxBatchSize(maxBatchSize);
    }

    public void purgeIndex() throws IOException
    {
      ZoieSystem.this.purgeIndex();
    }

    public void expungeDeletes() throws IOException
    {
      _diskLoader.expungeDeletes();
    }

    public void setNumLargeSegments(int numLargeSegments)
    {
      ZoieSystem.this._searchIdxMgr.setNumLargeSegments(numLargeSegments);
    }

    public int getNumLargeSegments()
    {
      return ZoieSystem.this._searchIdxMgr.getNumLargeSegments();
    }

    public void setMaxSmallSegments(int maxSmallSegments)
    {
      ZoieSystem.this._searchIdxMgr.setMaxSmallSegments(maxSmallSegments);
    }

    public int getMaxSmallSegments()
    {
      return ZoieSystem.this._searchIdxMgr.getMaxSmallSegments();
    }

    public int getMaxMergeDocs()
    {
      return ZoieSystem.this._searchIdxMgr.getMaxMergeDocs();
    }

    public int getMergeFactor()
    {
      return ZoieSystem.this._searchIdxMgr.getMergeFactor();
    }

    public void setMaxMergeDocs(int maxMergeDocs)
    {
      ZoieSystem.this._searchIdxMgr.setMaxMergeDocs(maxMergeDocs);
    }

    public void setMergeFactor(int mergeFactor)
    {
      ZoieSystem.this._searchIdxMgr.setMergeFactor(mergeFactor);
    }

    public boolean isUseCompoundFile()
    {
      return ZoieSystem.this._searchIdxMgr.isUseCompoundFile();
    }

    public void setUseCompoundFile(boolean useCompoundFile)
    {
      ZoieSystem.this._searchIdxMgr.setUseCompoundFile(useCompoundFile);
    }

    public int getCurrentMemBatchSize()
    {
      return ZoieSystem.this.getCurrentMemBatchSize();
    }

    public int getCurrentDiskBatchSize()
    {
      return ZoieSystem.this.getCurrentDiskBatchSize();
    }

    public long getMinUID() throws IOException
    {
      return ZoieSystem.this.getMinUID();
    }

    public long getMaxUID() throws IOException
    {
      return ZoieSystem.this.getMaxUID();
    }
=======
	  public void setBatchDelay(long batchDelay) {
	    _rtdc.setDelay(batchDelay);
	  }

	  public void setBatchSize(int batchSize) {
	    _rtdc.setBatchSize(batchSize);
	  }

	  public void setMaxBatchSize(int maxBatchSize) {
	    ZoieSystem.this.setMaxBatchSize(maxBatchSize);
	  }

	  public void purgeIndex() throws IOException{
	    ZoieSystem.this.purgeIndex();
	  }

	  public void expungeDeletes() throws IOException{
	    _diskLoader.expungeDeletes();
	  }

	  public void setNumLargeSegments(int numLargeSegments)
	  {
	    ZoieSystem.this._searchIdxMgr.setNumLargeSegments(numLargeSegments);
	  }

	  public int getNumLargeSegments()
	  {
	    return ZoieSystem.this._searchIdxMgr.getNumLargeSegments();
	  }

	  public void setMaxSmallSegments(int maxSmallSegments)
	  {
	    ZoieSystem.this._searchIdxMgr.setMaxSmallSegments(maxSmallSegments);
	  }

	  public int getMaxSmallSegments()
	  {
	    return ZoieSystem.this._searchIdxMgr.getMaxSmallSegments();
	  }

	  public int getMaxMergeDocs() {
	    return ZoieSystem.this._searchIdxMgr.getMaxMergeDocs();
	  }

	  public int getMergeFactor() {
	    return ZoieSystem.this._searchIdxMgr.getMergeFactor();
	  }

	  public void setMaxMergeDocs(int maxMergeDocs) {
	    ZoieSystem.this._searchIdxMgr.setMaxMergeDocs(maxMergeDocs);
	  }

	  public void setMergeFactor(int mergeFactor) {
	    ZoieSystem.this._searchIdxMgr.setMergeFactor(mergeFactor);
	  }

	  public boolean isUseCompoundFile() {
	    return ZoieSystem.this._searchIdxMgr.isUseCompoundFile();
	  }

	  public void setUseCompoundFile(boolean useCompoundFile) {
	    ZoieSystem.this._searchIdxMgr.setUseCompoundFile(useCompoundFile);
	  }

	  public int getCurrentMemBatchSize()
	  {
	    return ZoieSystem.this.getCurrentMemBatchSize(); 
	  }

	  public int getCurrentDiskBatchSize()
	  {
	    return ZoieSystem.this.getCurrentDiskBatchSize(); 
	  }
	  
      public long getMinUID() throws IOException
      {
        return ZoieSystem.this.getMinUID();
      }
      
      public long getMaxUID() throws IOException
      {
        return ZoieSystem.this.getMaxUID();
      }
	}

  @Override
  public StandardMBean getStandardMBean(String name)
  {
    if (name.equals(ZOIEADMIN))
    {
      try
      {
        return new StandardMBean(this.getAdminMBean(), ZoieSystemAdminMBean.class);
      } catch (NotCompliantMBeanException e)
      {
        log.info(e);
        return null;
      }
    }
    if (name.equals(ZOIESTATUS))
    {
      try
      {
        return new StandardMBean(new ZoieIndexingStatusAdmin(this), ZoieIndexingStatusAdminMBean.class);
      } catch (NotCompliantMBeanException e)
      {
        log.info(e);
        return null;
      }
    }
    return null;

  public static String ZOIEADMIN = "zoie-admin";
  public static String ZOIESTATUS = "zoie-status";
  @Override
  public String[] getStandardMBeanNames()
  {
    return new String[]{ZOIEADMIN, ZOIESTATUS};
>>>>>>> 90bd142922d9f2b357b1953e8df608ea4193d1d5
  }
}
Solution content 
    }

      log.info("all events flushed to disk");
    }

    public void flushToMemoryIndex() throws ZoieException
    {
      log.info("flushing to memory");
      ZoieSystem.this.flushEventsToMemoryIndex(Long.MAX_VALUE);
      log.info("all events flushed to memory");
    public void setBatchDelay(long batchDelay)
    {
      _rtdc.setDelay(batchDelay);
    }

    public void setBatchSize(int batchSize)
    {
      _rtdc.setBatchSize(batchSize);
    }

    public void setMaxBatchSize(int maxBatchSize)
    {
      ZoieSystem.this.setMaxBatchSize(maxBatchSize);
    }

    public void purgeIndex() throws IOException
    {
      ZoieSystem.this.purgeIndex();
    }

    public void expungeDeletes() throws IOException
    {
      _diskLoader.expungeDeletes();
    }

    public void setNumLargeSegments(int numLargeSegments)
    {
      ZoieSystem.this._searchIdxMgr.setNumLargeSegments(numLargeSegments);
    }

    public int getNumLargeSegments()
    {
      return ZoieSystem.this._searchIdxMgr.getNumLargeSegments();
    }

    public void setMaxSmallSegments(int maxSmallSegments)
    {
      ZoieSystem.this._searchIdxMgr.setMaxSmallSegments(maxSmallSegments);
    }

    public int getMaxSmallSegments()
    {
      return ZoieSystem.this._searchIdxMgr.getMaxSmallSegments();
    }

    public int getMaxMergeDocs()
    {
      return ZoieSystem.this._searchIdxMgr.getMaxMergeDocs();
    }

    public int getMergeFactor()
    {
      return ZoieSystem.this._searchIdxMgr.getMergeFactor();
    }

    public void setMaxMergeDocs(int maxMergeDocs)
    {
      ZoieSystem.this._searchIdxMgr.setMaxMergeDocs(maxMergeDocs);
    }

    public void setMergeFactor(int mergeFactor)
    {
      ZoieSystem.this._searchIdxMgr.setMergeFactor(mergeFactor);
    }

    public boolean isUseCompoundFile()
    {
      return ZoieSystem.this._searchIdxMgr.isUseCompoundFile();
    }

    public void setUseCompoundFile(boolean useCompoundFile)
    {
      ZoieSystem.this._searchIdxMgr.setUseCompoundFile(useCompoundFile);
    }

    public int getCurrentMemBatchSize()
    {
      return ZoieSystem.this.getCurrentMemBatchSize();
    }

    public int getCurrentDiskBatchSize()
    {
      return ZoieSystem.this.getCurrentDiskBatchSize();
    }

    public long getMinUID() throws IOException
    {
      return ZoieSystem.this.getMinUID();
    }

    public long getMaxUID() throws IOException
    {
      return ZoieSystem.this.getMaxUID();
    }
  }

  @Override
  public StandardMBean getStandardMBean(String name)
  {
    if (name.equals(ZOIEADMIN))
    {
      try
      {
        return new StandardMBean(this.getAdminMBean(), ZoieSystemAdminMBean.class);
      } catch (NotCompliantMBeanException e)
      {
        log.info(e);
        return null;
      }
    }
    if (name.equals(ZOIESTATUS))
    {
      try
      {
        return new StandardMBean(new ZoieIndexingStatusAdmin(this), ZoieIndexingStatusAdminMBean.class);
      } catch (NotCompliantMBeanException e)
      {
        log.info(e);
        return null;
      }
    }
    return null;
  }

  public static String ZOIEADMIN = "zoie-admin";
  public static String ZOIESTATUS = "zoie-status";
  @Override
  public String[] getStandardMBeanNames()
  {
    return new String[]{ZOIEADMIN, ZOIESTATUS};
  }
}
File
ZoieSystem.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute
Method declaration
Method invocation
Method signature
Return statement