You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2013/12/16 19:00:50 UTC
[1/3] git commit: ACCUMULO-1990 - "" no longer has versioning set up
by default
Updated Branches:
refs/heads/master 1ee57286f -> 61e48e6b8
ACCUMULO-1990 - "" no longer has versioning set up by default
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/82e2f57a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/82e2f57a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/82e2f57a
Branch: refs/heads/master
Commit: 82e2f57abd69e9b78eb10dc6f79d7f1a0e46576f
Parents: 7fc8d83
Author: John Vines <jv...@gmail.com>
Authored: Mon Dec 16 12:03:40 2013 -0500
Committer: John Vines <jv...@gmail.com>
Committed: Mon Dec 16 12:03:40 2013 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/server/init/Initialize.java | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/82e2f57a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index b7f9bdb..a120dbd 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Locale;
-import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
@@ -39,7 +38,6 @@ import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.file.FileOperations;
import org.apache.accumulo.core.file.FileSKVWriter;
-import org.apache.accumulo.core.iterators.IteratorUtil;
import org.apache.accumulo.core.iterators.user.VersioningIterator;
import org.apache.accumulo.core.master.state.tables.TableState;
import org.apache.accumulo.core.master.thrift.MasterGoalState;
@@ -416,8 +414,8 @@ public class Initialize {
zoo.putPersistentData(zkInstanceRoot + Constants.ZRECOVERY, new byte[] {'0'}, NodeExistsPolicy.FAIL);
zoo.putPersistentData(zkInstanceRoot + Constants.ZNAMESPACES, new byte[0], NodeExistsPolicy.FAIL);
- createInitialNamespace(zoo, zkInstanceRoot, Constants.DEFAULT_NAMESPACE_ID, Constants.DEFAULT_NAMESPACE, true);
- createInitialNamespace(zoo, zkInstanceRoot, Constants.ACCUMULO_NAMESPACE_ID, Constants.ACCUMULO_NAMESPACE, false);
+ createInitialNamespace(zoo, zkInstanceRoot, Constants.DEFAULT_NAMESPACE_ID, Constants.DEFAULT_NAMESPACE);
+ createInitialNamespace(zoo, zkInstanceRoot, Constants.ACCUMULO_NAMESPACE_ID, Constants.ACCUMULO_NAMESPACE);
zoo.putPersistentData(zkInstanceRoot + Constants.ZTABLES + "/" + MetadataTable.ID + Constants.ZTABLE_NAMESPACE,
Constants.ACCUMULO_NAMESPACE_ID.getBytes(Constants.UTF8), NodeExistsPolicy.OVERWRITE);
@@ -425,19 +423,12 @@ public class Initialize {
Constants.ACCUMULO_NAMESPACE_ID.getBytes(Constants.UTF8), NodeExistsPolicy.OVERWRITE);
}
- private static void createInitialNamespace(IZooReaderWriter zoo, String root, String id, String namespace, boolean defaultOpts) throws KeeperException,
+ private static void createInitialNamespace(IZooReaderWriter zoo, String root, String id, String namespace) throws KeeperException,
InterruptedException {
String zPath = root + Constants.ZNAMESPACES + "/" + id;
zoo.putPersistentData(zPath, new byte[0], NodeExistsPolicy.FAIL);
zoo.putPersistentData(zPath + Constants.ZNAMESPACE_NAME, namespace.getBytes(Constants.UTF8), NodeExistsPolicy.FAIL);
zoo.putPersistentData(zPath + Constants.ZNAMESPACE_CONF, new byte[0], NodeExistsPolicy.FAIL);
-
- if (defaultOpts) {
- Map<String,String> opts = IteratorUtil.generateInitialTableProperties(true);
- for (Entry<String,String> e : opts.entrySet()) {
- zoo.putPersistentData(zPath + Constants.ZNAMESPACE_CONF + "/" + e.getKey(), e.getValue().getBytes(Constants.UTF8), NodeExistsPolicy.SKIP);
- }
- }
}
private static String getInstanceNamePath(Opts opts) throws IOException, KeeperException, InterruptedException {
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by vi...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61e48e6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61e48e6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/61e48e6b
Branch: refs/heads/master
Commit: 61e48e6b858b56b9232e3461848c599141716db2
Parents: 1ee5728 7a6fd95
Author: John Vines <jv...@gmail.com>
Authored: Mon Dec 16 13:00:24 2013 -0500
Committer: John Vines <jv...@gmail.com>
Committed: Mon Dec 16 13:00:24 2013 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/Constants.java | 2 +-
.../org/apache/accumulo/server/init/Initialize.java | 15 +++------------
2 files changed, 4 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-2024: fix config path property env
variable substitution
Posted by vi...@apache.org.
ACCUMULO-2024: fix config path property env variable substitution
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7a6fd95c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7a6fd95c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7a6fd95c
Branch: refs/heads/master
Commit: 7a6fd95c8c1ad95f5001e84f00953fb9d2b620bd
Parents: 82e2f57
Author: Michael Berman <mb...@sqrrl.com>
Authored: Mon Dec 16 12:07:39 2013 -0500
Committer: John Vines <jv...@gmail.com>
Committed: Mon Dec 16 12:15:59 2013 -0500
----------------------------------------------------------------------
core/src/main/java/org/apache/accumulo/core/Constants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a6fd95c/core/src/main/java/org/apache/accumulo/core/Constants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java b/core/src/main/java/org/apache/accumulo/core/Constants.java
index 4ef9906..75452e3 100644
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@ -112,7 +112,7 @@ public class Constants {
public static final String EXPORT_INFO_FILE = "accumulo_export_info.txt";
// Variables that will be substituted with environment vars in PropertyType.PATH values
- public static final String[] PATH_PROPERTY_ENV_VARS = new String[] {"$ACCUMULO_HOME", "$ACCUMULO_CONF_DIR"};
+ public static final String[] PATH_PROPERTY_ENV_VARS = new String[] {"ACCUMULO_HOME", "ACCUMULO_CONF_DIR"};
public static final String DEFAULT_NAMESPACE = "";
public static final String ACCUMULO_NAMESPACE = "accumulo";
public static final String DEFAULT_NAMESPACE_ID = "+default";