Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
core/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/14e2b64f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/14e2b64f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/14e2b64f
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 14e2b64f74c5ecb1e9f906045d461830daa278ae
Parents: 88f24d2 5363d78
Author: Christopher Tubbs ctubb...@apache.org
Authored: Mon Apr 7 20:31:35 2014 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Mon Apr 7 20:31:35 2014 -0400
--
.../core/client/mapred/InputFormatBase.java | 1 +
.../client/mapreduce/AccumuloInputFormat.java | 2 +-
.../core/client/mapreduce/InputFormatBase.java | 1 +
.../EmptySplitsAccumuloInputFormat.java | 10
.../org/apache/accumulo/fate/ReadOnlyStore.java | 22 -
.../java/org/apache/accumulo/fate/TStore.java | 16 ++---
.../apache/accumulo/master/util/FateAdmin.java | 25 ++--
7 files changed, 39 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/14e2b64f/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/14e2b64f/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/14e2b64f/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/14e2b64f/core/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
--
diff --cc
core/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
index 7d3dde6,68ac78f..dd531c0
---
a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
+++
b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
@@@ -27,19 -27,11 +27,19 @@@ import org.apache.hadoop.mapreduce.JobC
* AccumuloInputFormat which returns an empty RangeInputSplit
*/
public class EmptySplitsAccumuloInputFormat extends AccumuloInputFormat {
-
+
@Override
public ListInputSplit getSplits(JobContext context) throws IOException {
-super.getSplits(context);
+ListInputSplit oldSplits = super.getSplits(context);
+ListInputSplit newSplits = new ArrayListInputSplit(oldSplits.size());
-
+
-return Arrays.InputSplit asList(new
org.apache.accumulo.core.client.mapreduce.RangeInputSplit());
+// Copy only the necessary information
+for (InputSplit oldSplit : oldSplits) {
- org.apache.accumulo.core.client.mapreduce.RangeInputSplit newSplit =
new
org.apache.accumulo.core.client.mapreduce.RangeInputSplit((org.apache.accumulo.core.client.mapreduce.RangeInputSplit)
oldSplit);
++ org.apache.accumulo.core.client.mapreduce.RangeInputSplit newSplit =
new org.apache.accumulo.core.client.mapreduce.RangeInputSplit(
++ (org.apache.accumulo.core.client.mapreduce.RangeInputSplit)
oldSplit);
+ newSplits.add(newSplit);
+}
-
-
++
+return newSplits;
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/14e2b64f/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
--
diff --cc
server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
index 4e72832,000..759bb70
mode 100644,00..100644
--- a/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/util/FateAdmin.java
@@@ -1,93 -1,0 +1,94 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *
