Projects >> accumulo >>0e097ac59ebd2e6c74a97acff6b9598209426867

Chunk
Conflicting content 
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.NoNodeException;

<<<<<<< HEAD:server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
=======
import com.google.common.annotations.VisibleForTesting;

/*
 * We need to be able to have the master tell a tabletServer to
 * close this file, and the tablet server to handle all pending client reads
 * before closing
 * 
 */

>>>>>>> 7a8ec735be8fd6bb91036f6cc9cc91ec5c50efba:server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
/**
 * 
 * Provide access to a single row range in a living TabletServer.
Solution content 
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.NoNodeException;

import com.google.common.annotations.VisibleForTesting;

/**
 * 
 * Provide access to a single row range in a living TabletServer.
File
Tablet.java
Developer's decision
Combination
Kind of conflict
Comment
Import
Chunk
Conflicting content 
    return new FileRef(location.toString() + "/" + prefix + UniqueNameAllocator.getInstance().getNextName() + "." + extension);
  }

<<<<<<< HEAD:server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
  private void checkTabletDir() throws IOException {
    if (!tableDirChecked) {
      FileStatus[] files = null;
      try {
        files = getTabletServer().getFileSystem().listStatus(location);
      } catch (FileNotFoundException ex) {
        // ignored
      }
      
      if (files == null) {
        if (location.getName().startsWith("c-"))
          log.debug("Tablet " + extent + " had no dir, creating " + location); // its a clone dir...
        else
          log.warn("Tablet " + extent + " had no dir, creating " + location);
      
        getTabletServer().getFileSystem().mkdirs(location);
      }
      tableDirChecked = true;
    }
=======
  /**
   * Only visibile for testing
   */
  @VisibleForTesting
  protected Tablet(TabletTime tabletTime, String tabletDirectory, int logId, Path location, DatafileManager datafileManager) {
    this.tabletTime = tabletTime;
    this.tabletDirectory = tabletDirectory;
    this.logId = logId;
    this.location = location;
    this.datafileManager = datafileManager; 
  }

  private Tablet(TabletServer tabletServer, Text location, KeyExtent extent, TabletResourceManager trm, Configuration conf,
      SortedMap tabletsKeyValues) throws IOException {
    this(tabletServer, location, extent, trm, conf, VolumeManagerImpl.get(), tabletsKeyValues);
>>>>>>> 7a8ec735be8fd6bb91036f6cc9cc91ec5c50efba:server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
  }

  public Tablet(TabletServer tabletServer, KeyExtent extent, TabletResourceManager trm, SplitInfo info) throws IOException {
Solution content 
    return new FileRef(location.toString() + "/" + prefix + UniqueNameAllocator.getInstance().getNextName() + "." + extension);
  }

  private void checkTabletDir() throws IOException {
    if (!tableDirChecked) {
      FileStatus[] files = null;
      try {
        files = getTabletServer().getFileSystem().listStatus(location);
      } catch (FileNotFoundException ex) {
        // ignored
      }
      
      if (files == null) {
        if (location.getName().startsWith("c-"))
          log.debug("Tablet " + extent + " had no dir, creating " + location); // its a clone dir...
        else
          log.warn("Tablet " + extent + " had no dir, creating " + location);
      
        getTabletServer().getFileSystem().mkdirs(location);
      }
      tableDirChecked = true;
    }
  }

  /**
   * Only visibile for testing
   */
  @VisibleForTesting
  protected Tablet(TabletTime tabletTime, String tabletDirectory, int logId, Path location, DatafileManager datafileManager, TabletServer tabletServer,
      TabletResourceManager tabletResources, TabletMemory tabletMemory, TableConfiguration tableConfiguration, KeyExtent extent, ConfigurationObserver configObserver) {
    this.tabletTime = tabletTime;
    this.tabletDirectory = tabletDirectory;
    this.logId = logId;
    this.location = location;
    this.datafileManager = datafileManager;
    this.tabletServer = tabletServer;
    this.tabletResources = tabletResources;
    this.tabletMemory = tabletMemory;
    this.tableConfiguration = tableConfiguration;
    this.extent = extent;
    this.configObserver = configObserver;
  }

  public Tablet(TabletServer tabletServer, KeyExtent extent, TabletResourceManager trm, SplitInfo info) throws IOException {
File
Tablet.java
Developer's decision
Manual
Kind of conflict
Annotation
Comment
If statement
Method declaration
Method invocation
Method signature