accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [02/35] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Thu, 05 Jun 2014 04:42:44 GMT
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8990e590
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8990e590
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8990e590

Branch: refs/heads/ACCUMULO-378
Commit: 8990e590ab0ccc91120b2c641d23d19d31ecf111
Parents: 0712ec9 a61e242
Author: Bill Havanki <bhavanki@cloudera.com>
Authored: Mon Jun 2 10:28:52 2014 -0400
Committer: Bill Havanki <bhavanki@cloudera.com>
Committed: Mon Jun 2 10:28:52 2014 -0400

----------------------------------------------------------------------
 .../accumulo/core/client/ZooKeeperInstance.java |   7 +-
 .../core/client/impl/ConditionalWriterImpl.java |   4 +-
 .../client/impl/InstanceOperationsImpl.java     |   3 +-
 .../accumulo/core/client/impl/Namespaces.java   |   3 +-
 .../core/client/impl/RootTabletLocator.java     |  14 +-
 .../accumulo/core/client/impl/ServerClient.java |  15 +-
 .../accumulo/core/client/impl/Tables.java       |   3 +-
 .../core/client/impl/ZookeeperLockChecker.java  |  10 +-
 .../core/client/ZooKeeperInstanceTest.java      | 143 +++++++++++++++++++
 .../core/client/impl/RootTabletLocatorTest.java |  61 ++++++++
 .../client/impl/ZookeeperLockCheckerTest.java   |  58 ++++++++
 .../accumulo/fate/zookeeper/ZooCache.java       |  15 +-
 .../fate/zookeeper/ZooCacheFactory.java         |  78 ++++++++++
 .../apache/accumulo/fate/zookeeper/ZooLock.java |   2 +-
 .../fate/zookeeper/ZooCacheFactoryTest.java     |  87 +++++++++++
 .../accumulo/server/client/HdfsZooInstance.java |   3 +-
 .../server/conf/NamespaceConfiguration.java     |   3 +-
 .../server/conf/TableConfiguration.java         |   3 +-
 .../accumulo/server/conf/ZooConfiguration.java  |   5 +-
 19 files changed, 476 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8990e590/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index e4bc876,6d35757..0d19e01
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@@ -134,9 -133,11 +135,11 @@@ public class ZooKeeperInstance implemen
     *          See {@link ClientConfiguration} which extends Configuration with convenience
methods specific to Accumulo.
     * @since 1.6.0
     */
- 
    public ZooKeeperInstance(Configuration config) {
+     this(config, new ZooCacheFactory());
+   }
+   ZooKeeperInstance(Configuration config, ZooCacheFactory zcf) {
 -    ArgumentChecker.notNull(config);
 +    checkArgument(config != null, "config is null");
      if (config instanceof ClientConfiguration) {
        this.clientConf = (ClientConfiguration)config;
      } else {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8990e590/core/src/main/java/org/apache/accumulo/core/client/impl/InstanceOperationsImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8990e590/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
index 65eeefc,30f0266..6be1a12
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
@@@ -27,9 -26,10 +27,10 @@@ import java.util.TreeMap
  import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.client.Instance;
  import org.apache.accumulo.core.client.NamespaceNotFoundException;
 -import org.apache.accumulo.core.util.ArgumentChecker.Validator;
 +import org.apache.accumulo.core.util.Validator;
  import org.apache.accumulo.core.zookeeper.ZooUtil;
  import org.apache.accumulo.fate.zookeeper.ZooCache;
+ import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;
  
  public class Namespaces {
    public static final String VALID_NAME_REGEX = "^\\w*$";

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8990e590/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
index 93ba4d9,8da530b..d3822f4
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
@@@ -16,12 -16,7 +16,10 @@@
   */
  package org.apache.accumulo.core.client.impl;
  
 +import static com.google.common.base.Preconditions.checkArgument;
 +
 +import java.nio.charset.StandardCharsets;
  import java.util.ArrayList;
- import java.util.HashMap;
- import java.util.Map;
  
  import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.client.AccumuloException;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8990e590/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8990e590/server/base/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8990e590/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8990e590/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8990e590/server/base/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
----------------------------------------------------------------------


Mime
View raw message