Projects >> accumulo >>2e65817691e462394cfaf97a58fc0ad9471aaccf

Chunk
Conflicting content 
import org.apache.accumulo.core.client.mapreduce.lib.util.InputConfigurator;
import org.apache.accumulo.core.client.mock.MockInstance;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
<<<<<<< HEAD
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
=======
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.SiteConfiguration;
>>>>>>> 7bef40489b3049d3baf66b210bd63123687e18a0
import org.apache.accumulo.core.data.ByteSequence;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.PartialKey;
Solution content 
import org.apache.accumulo.core.client.mapreduce.lib.util.InputConfigurator;
import org.apache.accumulo.core.client.mock.MockInstance;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.SiteConfiguration;
import org.apache.accumulo.core.data.ByteSequence;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.PartialKey;
File
RangeInputSplit.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
    
    ZooKeeperInstance zki = new ZooKeeperInstance(getInstanceName(), getZooKeepers());

<<<<<<< HEAD
    return new ZooKeeperInstance(ClientConfiguration.loadDefault().withInstance(getInstanceName()).withZkHosts(getZooKeepers()));
=======
    // Wrap the DefaultConfiguration with a SiteConfiguration so we use accumulo-site.xml
    // when it's present
    AccumuloConfiguration xmlConfig = SiteConfiguration.getInstance(zki.getConfiguration());
    zki.setConfiguration(xmlConfig);

    return zki;
>>>>>>> 7bef40489b3049d3baf66b210bd63123687e18a0
  }

  public String getInstanceName() {
Solution content 
    
    ZooKeeperInstance zki = new ZooKeeperInstance(ClientConfiguration.loadDefault().withInstance(getInstanceName()).withZkHosts(getZooKeepers()));

    // Wrap the DefaultConfiguration with a SiteConfiguration so we use accumulo-site.xml
    // when it's present
    AccumuloConfiguration xmlConfig = SiteConfiguration.getInstance(zki.getConfiguration());
    zki.setConfiguration(xmlConfig);

    return zki;
  }

  public String getInstanceName() {
File
RangeInputSplit.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Return statement
Variable
Chunk
Conflicting content 
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.mock.MockInstance;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
<<<<<<< HEAD
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
import org.apache.accumulo.core.security.Credentials;
=======
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.SiteConfiguration;
import org.apache.accumulo.core.security.CredentialHelper;
>>>>>>> 7bef40489b3049d3baf66b210bd63123687e18a0
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.conf.Configuration;
Solution content 
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.mock.MockInstance;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
import org.apache.accumulo.core.security.Credentials;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.SiteConfiguration;
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.conf.Configuration;
File
ConfiguratorBase.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    if ("MockInstance".equals(instanceType))
      return new MockInstance(conf.get(enumToConfKey(implementingClass, InstanceOpts.NAME)));
    else if ("ZooKeeperInstance".equals(instanceType)) {
<<<<<<< HEAD
      String clientConfigString = conf.get(enumToConfKey(implementingClass, InstanceOpts.CLIENT_CONFIG));
      if (clientConfigString == null) {
        String instanceName = conf.get(enumToConfKey(implementingClass, InstanceOpts.NAME));
        String zookeepers = conf.get(enumToConfKey(implementingClass, InstanceOpts.ZOO_KEEPERS));
        return new ZooKeeperInstance(ClientConfiguration.loadDefault().withInstance(instanceName).withZkHosts(zookeepers));
      } else {
        return new ZooKeeperInstance(ClientConfiguration.deserialize(clientConfigString));
      }
=======
      ZooKeeperInstance zki = new ZooKeeperInstance(conf.get(enumToConfKey(implementingClass, InstanceOpts.NAME)), conf.get(enumToConfKey(implementingClass,
          InstanceOpts.ZOO_KEEPERS)));

      // Wrap the DefaultConfiguration with a SiteConfiguration
      AccumuloConfiguration xmlConfig = SiteConfiguration.getInstance(zki.getConfiguration());
      zki.setConfiguration(xmlConfig);

      return zki;
>>>>>>> 7bef40489b3049d3baf66b210bd63123687e18a0
    } else if (instanceType.isEmpty())
      throw new IllegalStateException("Instance has not been configured for " + implementingClass.getSimpleName());
    else
Solution content 
    if ("MockInstance".equals(instanceType))
      return new MockInstance(conf.get(enumToConfKey(implementingClass, InstanceOpts.NAME)));
    else if ("ZooKeeperInstance".equals(instanceType)) {
      ZooKeeperInstance zki;
      String clientConfigString = conf.get(enumToConfKey(implementingClass, InstanceOpts.CLIENT_CONFIG));
      if (clientConfigString == null) {
        String instanceName = conf.get(enumToConfKey(implementingClass, InstanceOpts.NAME));
        String zookeepers = conf.get(enumToConfKey(implementingClass, InstanceOpts.ZOO_KEEPERS));
        zki = new ZooKeeperInstance(ClientConfiguration.loadDefault().withInstance(instanceName).withZkHosts(zookeepers));
      } else {
        zki = new ZooKeeperInstance(ClientConfiguration.deserialize(clientConfigString));
      }

      // Wrap the DefaultConfiguration with a SiteConfiguration
      AccumuloConfiguration xmlConfig = SiteConfiguration.getInstance(zki.getConfiguration());
      zki.setConfiguration(xmlConfig);

      return zki;
    } else if (instanceType.isEmpty())
      throw new IllegalStateException("Instance has not been configured for " + implementingClass.getSimpleName());
    else
File
ConfiguratorBase.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Method invocation
Return statement
Variable