Author: ecn
Date: Wed Jun 19 18:57:37 2013
New Revision: 1494736
URL: http://svn.apache.org/r1494736
Log:
ACCUMULO-118 use the correct data range for making file delete markers for
!METADATA merges
Modified:
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java
Modified:
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java?rev=1494736&r1=1494735&r2=1494736&view=diff
==============================================================================
---
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java
(original)
+++
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java
Wed Jun 19 18:57:37 2013
@@ -29,6 +29,7 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.util.RootTable;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.accumulo.fate.Repo;
import org.apache.accumulo.server.fs.FileRef;
@@ -62,7 +63,7 @@ class MakeDeleteEntries extends MasterRe
log.info("creating delete entries for merged metadata tablets");
Connector conn = master.getConnector();
Scanner scanner = conn.createScanner(MetadataTable.NAME,
Authorizations.EMPTY);
- scanner.setRange(MetadataTable.KEYSPACE);
+ scanner.setRange(RootTable.KEYSPACE);
scanner.fetchColumnFamily(MetadataTable.DATAFILE_COLUMN_FAMILY);
BatchWriter bw = conn.createBatchWriter(MetadataTable.NAME, new
BatchWriterConfig());
for (Entry<Key,Value> entry : scanner) {