Projects >> lucene-solr >>2db0a6b83c7f1364c71446ff8f1960e804b7edfd

Chunk
Conflicting content 
  protected String adminHandler;
  protected boolean shareSchema;
  protected String solrHome;
<<<<<<< HEAD
  protected static final String collection = System.getProperty("collection", "collection1"); //nocommit: default;

  private ZooKeeperController zooKeeperController;
=======
  protected String solrConfigFilenameOverride;
>>>>>>> 8b450730d3e1ff646e28ee1020b5e7b0df81c6ab

  public CoreContainer() {
    solrHome = SolrResourceLoader.locateSolrHome();
Solution content 
  protected String adminHandler;
  protected boolean shareSchema;
  protected String solrHome;
  protected String solrConfigFilenameOverride;
  protected String solrDataDirOverride;
  protected static final String collection = System.getProperty("collection", "collection1"); //nocommit: default;

  private ZooKeeperController zooKeeperController;

  public CoreContainer() {
    solrHome = SolrResourceLoader.locateSolrHome();
File
CoreContainer.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
    }

    // core container instantiation
<<<<<<< HEAD
    public CoreContainer initialize() throws IOException, ParserConfigurationException, SAXException {
      //nocommit: pull zookeeper integration into a new CoreContainer? leaning towards no.
      zookeeperHost = System.getProperty("zkHost");
      
      if (zookeeperHost != null) {
        zooKeeperController = new ZooKeeperController(zookeeperHost, collection);
      }
      
      CoreContainer cores = null;
      String solrHome = SolrResourceLoader.locateSolrHome();
      
      File fconf = null;

      fconf = new File(solrHome, solrConfigFilename == null ? "solr.xml"
          : solrConfigFilename);
      log.info("looking for solr.xml: " + fconf.getAbsolutePath());
      
      if (fconf.exists()) {
        //nocommit: finish ZooKeeper support in multicore case
        if (zookeeperHost == null) {
          cores = new CoreContainer();
        } else {
          cores = new CoreContainer(zooKeeperController);
        }
=======
    public CoreContainer initialize() throws IOException,
        ParserConfigurationException, SAXException {
      CoreContainer cores = null;
      String solrHome = SolrResourceLoader.locateSolrHome();
      File fconf = new File(solrHome, solrConfigFilename == null ? "solr.xml"
          : solrConfigFilename);
      log.info("looking for solr.xml: " + fconf.getAbsolutePath());
      cores = new CoreContainer();
      cores.solrConfigFilenameOverride = solrConfigFilename;
      if (fconf.exists())
>>>>>>> 8b450730d3e1ff646e28ee1020b5e7b0df81c6ab
        cores.load(solrHome, fconf);
      else {
        cores.load(solrHome, new ByteArrayInputStream(DEF_SOLR_XML.getBytes()));
Solution content 
    }

    // core container instantiation
    public CoreContainer initialize() throws IOException, ParserConfigurationException, SAXException {
      CoreContainer cores = null;
      String solrHome = SolrResourceLoader.locateSolrHome();
      File fconf = new File(solrHome, solrConfigFilename == null ? "solr.xml"
          : solrConfigFilename);
      log.info("looking for solr.xml: " + fconf.getAbsolutePath());
      cores = new CoreContainer();
      cores.solrConfigFilenameOverride = solrConfigFilename;
      cores.solrDataDirOverride = dataDir;
      if (fconf.exists())
        cores.load(solrHome, fconf);
      else {
        cores.load(solrHome, new ByteArrayInputStream(DEF_SOLR_XML.getBytes()));
File
CoreContainer.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
If statement
Method invocation
Method signature
Variable
Chunk
Conflicting content 
          abortOnConfigurationError = true;
          break;
        }
<<<<<<< HEAD
        solrConfigFilename = cores.getConfigFile().getName();
      } else {
        // perform compatibility init
        SolrResourceLoader resourceLoader;
        CoreDescriptor dcore;
        if (zookeeperHost == null) {
          cores = new CoreContainer(solrHome);
           new CoreDescriptor(cores, "", ".");
          dcore = new CoreDescriptor(cores, "", ".");
          dcore.setCoreProperties(null);
          resourceLoader = new SolrResourceLoader(solrHome, null, getCoreProps(solrHome, null, dcore.getCoreProperties()));
        } else {
          cores = new CoreContainer(solrHome, zooKeeperController);
          dcore = new CoreDescriptor(cores, "", ".");
          dcore.setCoreProperties(null);
          resourceLoader = new ZKSolrResourceLoader(solrHome, collection, null, getCoreProps(solrHome, null, dcore.getCoreProperties()), zooKeeperController);
        }
       
        cores.loader = resourceLoader;
        SolrConfig cfg;
        IndexSchema schema = null;
        String solrConfigName = solrConfigFilename == null ? SolrConfig.DEFAULT_CONF_FILE : solrConfigFilename;
        if (zookeeperHost == null) {
          cfg = new SolrConfig(resourceLoader, solrConfigName, null);
        } else {
          // found ZooKeeper path, so load config from zookeeper
          log.info("Loading config from ZooKeeper");
          // load solrconfig
          cfg = zooKeeperController.getConfig(solrConfigName, resourceLoader);
          // load schema
          schema = zooKeeperController.getSchema(IndexSchema.DEFAULT_SCHEMA_FILE, cfg, resourceLoader);
        }
        
        SolrCore singlecore = new SolrCore(null, dataDir, cfg, schema, dcore);
        abortOnConfigurationError = cfg.getBool(
                "abortOnConfigurationError", abortOnConfigurationError);
        cores.register("", singlecore, false);
        cores.setPersistent(false);
        solrConfigFilename = cfg.getName();
=======
>>>>>>> 8b450730d3e1ff646e28ee1020b5e7b0df81c6ab
      }
      solrConfigFilename = cores.getConfigFile().getName();
Solution content 
          abortOnConfigurationError = true;
          break;
        }
      }
      solrConfigFilename = cores.getConfigFile().getName();
File
CoreContainer.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
If statement
Method invocation
Variable
Chunk
Conflicting content 
      for (int i=0; i aliases = StrUtils.splitSmart(names,',');
          String name = "";
          if(aliases.size() > 0) {
            name = aliases.get(0);
=======
          String name = DOMUtil.getAttr(node, "name", null);
          if(name.equals(DEFAULT_CORE_NAME)){
            if(defaultCoreFound) throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,"Only one 'DEFAULT_CORE' is allowed ");            
            defaultCoreFound = true;
            name="";
>>>>>>> 8b450730d3e1ff646e28ee1020b5e7b0df81c6ab
          }
          CoreDescriptor p = new CoreDescriptor(this, name, DOMUtil.getAttr(node, "instanceDir", null));
Solution content 
      for (int i=0; i
File
CoreContainer.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
  public String getSolrHome() {
    return solrHome;
  }
<<<<<<< HEAD
  
  //nocommit: consider - used for testing now
  public boolean isZooKeeperAware() {
    return zooKeeperController != null;
  }
  
  // may return null
  public ZooKeeperController getZooKeeperController() {
    return zooKeeperController;
  }
=======
  private static final String DEF_SOLR_XML ="\n" +
          "\n" +
          "  \n" +
          "    \n" +
          "  \n" +
          "";
>>>>>>> 8b450730d3e1ff646e28ee1020b5e7b0df81c6ab
}
Solution content 
  public String getSolrHome() {
    return solrHome;
  }
  private static final String DEF_SOLR_XML ="\n" +
          "\n" +
          "  \n" +
          "    \n" +
          "  \n" +
          "";

  // nocommit: consider - for tests now
  public boolean isZooKeeperAware() {
    return zooKeeperController != null;
  }
  
  public ZooKeeperController getZooKeeperController() {
    return zooKeeperController;
  }
}
File
CoreContainer.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
Method declaration