ACCUMULO-1596 moved Mutator interface up to IZooReaderWriter
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/85451233 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/85451233 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/85451233 Branch: refs/heads/ACCUMULO-1000 Commit: 85451233c6a00352daaf460fb668d02d76bdd953 Parents: 734cd50 Author: Eric Newton <e...@apache.org> Authored: Mon Jul 22 13:52:57 2013 -0400 Committer: Eric Newton <e...@apache.org> Committed: Mon Jul 22 13:52:57 2013 -0400 ---------------------------------------------------------------------- server/src/main/java/org/apache/accumulo/server/master/Master.java | 2 +- .../apache/accumulo/server/master/state/tables/TableManager.java | 2 +- .../apache/accumulo/server/master/tableOps/CancelCompactions.java | 2 +- .../org/apache/accumulo/server/master/tableOps/CompactRange.java | 2 +- .../org/apache/accumulo/server/master/tableOps/RenameTable.java | 2 +- .../java/org/apache/accumulo/server/master/tableOps/Utils.java | 2 +- .../java/org/apache/accumulo/server/tabletserver/TabletServer.java | 2 -- 7 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/85451233/server/src/main/java/org/apache/accumulo/server/master/Master.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/Master.java b/server/src/main/java/org/apache/accumulo/server/master/Master.java index 0cb0378..3d14d12 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/Master.java +++ b/server/src/main/java/org/apache/accumulo/server/master/Master.java @@ -84,8 +84,8 @@ import org.apache.accumulo.fate.AgeOffStore; import org.apache.accumulo.fate.Fate; import org.apache.accumulo.fate.TStore.TStatus; import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter.Mutator; import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason; -import org.apache.accumulo.fate.zookeeper.ZooReaderWriter.Mutator; import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy; import org.apache.accumulo.server.Accumulo; http://git-wip-us.apache.org/repos/asf/accumulo/blob/85451233/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java b/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java index fedbc96..bc81786 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java +++ b/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java @@ -29,7 +29,7 @@ import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; -import org.apache.accumulo.fate.zookeeper.ZooReaderWriter.Mutator; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter.Mutator; import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy; import org.apache.accumulo.server.client.HdfsZooInstance; http://git-wip-us.apache.org/repos/asf/accumulo/blob/85451233/server/src/main/java/org/apache/accumulo/server/master/tableOps/CancelCompactions.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/tableOps/CancelCompactions.java b/server/src/main/java/org/apache/accumulo/server/master/tableOps/CancelCompactions.java index efddc79..7d06639 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/tableOps/CancelCompactions.java +++ b/server/src/main/java/org/apache/accumulo/server/master/tableOps/CancelCompactions.java @@ -20,7 +20,7 @@ import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.impl.thrift.TableOperation; import org.apache.accumulo.fate.Repo; import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; -import org.apache.accumulo.fate.zookeeper.ZooReaderWriter.Mutator; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter.Mutator; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.master.Master; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; http://git-wip-us.apache.org/repos/asf/accumulo/blob/85451233/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java b/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java index 09046f7..41b052b 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java +++ b/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java @@ -47,7 +47,7 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.fate.Repo; import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; -import org.apache.accumulo.fate.zookeeper.ZooReaderWriter.Mutator; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter.Mutator; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.master.LiveTServerSet.TServerConnection; import org.apache.accumulo.server.master.Master; http://git-wip-us.apache.org/repos/asf/accumulo/blob/85451233/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.java b/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.java index 0ca29cd..16201b1 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.java +++ b/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.java @@ -25,7 +25,7 @@ import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.Repo; import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; -import org.apache.accumulo.fate.zookeeper.ZooReaderWriter.Mutator; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter.Mutator; import org.apache.accumulo.server.master.Master; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; import org.apache.log4j.Logger; http://git-wip-us.apache.org/repos/asf/accumulo/blob/85451233/server/src/main/java/org/apache/accumulo/server/master/tableOps/Utils.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/master/tableOps/Utils.java b/server/src/main/java/org/apache/accumulo/server/master/tableOps/Utils.java index d467119..e57801c 100644 --- a/server/src/main/java/org/apache/accumulo/server/master/tableOps/Utils.java +++ b/server/src/main/java/org/apache/accumulo/server/master/tableOps/Utils.java @@ -29,7 +29,7 @@ import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.DistributedReadWriteLock; import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; -import org.apache.accumulo.fate.zookeeper.ZooReaderWriter.Mutator; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter.Mutator; import org.apache.accumulo.fate.zookeeper.ZooReservation; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.zookeeper.ZooQueueLock; http://git-wip-us.apache.org/repos/asf/accumulo/blob/85451233/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java index d83102d..9824c64 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java @@ -18,7 +18,6 @@ package org.apache.accumulo.server.tabletserver; import static org.apache.accumulo.server.problems.ProblemType.TABLET_LOAD; -import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.lang.management.GarbageCollectorMXBean; @@ -196,7 +195,6 @@ import org.apache.accumulo.server.zookeeper.TransactionWatcher; import org.apache.accumulo.server.zookeeper.ZooCache; import org.apache.accumulo.server.zookeeper.ZooLock; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; -import org.apache.accumulo.start.Platform; import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader; import org.apache.accumulo.start.classloader.vfs.ContextManager; import org.apache.accumulo.trace.instrument.Span;