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 2012/01/06 23:22:52 UTC
svn commit: r1228465 - in /incubator/accumulo/trunk:
src/core/src/main/java/org/apache/accumulo/core/file/map/
src/core/src/main/java/org/apache/accumulo/core/iterators/system/
src/core/src/test/java/org/apache/accumulo/core/data/
src/core/src/test/jav...
Author: vines
Date: Fri Jan 6 22:22:51 2012
New Revision: 1228465
URL: http://svn.apache.org/viewvc?rev=1228465&view=rev
Log:
Accumulo-288 - it's gone
Added:
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/MapFileIterator.java (with props)
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/CreateRFiles.java (contents, props changed)
- copied, changed from r1226913, incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java
Removed:
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MySequenceFile.java
incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/data/MapFileTest.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/DumpMapFile.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/MMFITest.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/MidPointPerfTest2.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/CountDiskRows.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/DumpMapFile.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/DumpTable.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/MapFilePerformanceTest.java
Modified:
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java
incubator/accumulo/trunk/test/system/auto/simple/compaction.py
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java?rev=1228465&r1=1228464&r2=1228465&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java Fri Jan 6 22:22:51 2012
@@ -36,10 +36,12 @@ import org.apache.accumulo.core.file.Fil
import org.apache.accumulo.core.file.blockfile.cache.BlockCache;
import org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.core.iterators.system.MapFileIterator;
import org.apache.accumulo.core.iterators.system.SequenceFileIterator;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.MapFile;
public class MapFileOperations extends FileOperations {
@@ -135,7 +137,7 @@ public class MapFileOperations extends F
@Override
public FileSKVIterator openReader(String file, boolean seekToBeginning, FileSystem fs, Configuration conf, AccumuloConfiguration acuconf) throws IOException {
- FileSKVIterator iter = new FileCFSkippingIterator(new RangeIterator(MapFileUtil.openMapFile(acuconf, fs, file, conf)));
+ FileSKVIterator iter = new FileCFSkippingIterator(new RangeIterator(new MapFileIterator(acuconf, fs, file, conf)));
if (seekToBeginning)
iter.seek(new Range(new Key(), null), new ArrayList<ByteSequence>(), false);
@@ -157,13 +159,13 @@ public class MapFileOperations extends F
@Override
public long getFileSize(String file, FileSystem fs, Configuration conf, AccumuloConfiguration acuconf) throws IOException {
- return fs.getFileStatus(new Path(file + "/" + MyMapFile.DATA_FILE_NAME)).getLen();
+ return fs.getFileStatus(new Path(file + "/" + MapFile.DATA_FILE_NAME)).getLen();
}
@Override
public FileSKVIterator openReader(String file, Range range, Set<ByteSequence> columnFamilies, boolean inclusive, FileSystem fs, Configuration conf,
AccumuloConfiguration tableConf) throws IOException {
- MyMapFile.Reader mfIter = MapFileUtil.openMapFile(tableConf, fs, file, conf);
+ MapFileIterator mfIter = new MapFileIterator(tableConf, fs, file, conf);
FileSKVIterator iter = new RangeIterator(mfIter);
@@ -172,7 +174,6 @@ public class MapFileOperations extends F
}
iter.seek(range, columnFamilies, inclusive);
- mfIter.dropIndex();
return iter;
}
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java?rev=1228465&r1=1228464&r2=1228465&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java Fri Jan 6 22:22:51 2012
@@ -22,23 +22,25 @@ import org.apache.accumulo.core.conf.Acc
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.MapFile;
+import org.apache.hadoop.io.SequenceFile;
public class MapFileUtil {
- public static MyMapFile.Reader openMapFile(AccumuloConfiguration acuconf, FileSystem fs, String dirName, Configuration conf) throws IOException {
- MyMapFile.Reader mfr = null;
+ public static MapFile.Reader openMapFile(AccumuloConfiguration acuconf, FileSystem fs, String dirName, Configuration conf) throws IOException {
+ MapFile.Reader mfr = null;
try {
- mfr = new MyMapFile.Reader(fs, dirName, conf);
+ mfr = new MapFile.Reader(fs, dirName, conf);
return mfr;
} catch (IOException e) {
throw e;
}
}
- public static MySequenceFile.Reader openIndex(Configuration conf, FileSystem fs, Path mapFile) throws IOException {
- Path indexPath = new Path(mapFile, MyMapFile.INDEX_FILE_NAME);
- MySequenceFile.Reader index = null;
+ public static SequenceFile.Reader openIndex(Configuration conf, FileSystem fs, Path mapFile) throws IOException {
+ Path indexPath = new Path(mapFile, MapFile.INDEX_FILE_NAME);
+ SequenceFile.Reader index = null;
try {
- index = new MySequenceFile.Reader(fs, indexPath, conf);
+ index = new SequenceFile.Reader(fs, indexPath, conf);
return index;
} catch (IOException e) {
throw e;
Added: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/MapFileIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/MapFileIterator.java?rev=1228465&view=auto
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/MapFileIterator.java (added)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/MapFileIterator.java Fri Jan 6 22:22:51 2012
@@ -0,0 +1,162 @@
+/*
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.iterators.system;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.data.ByteSequence;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.file.FileSKVIterator;
+import org.apache.accumulo.core.file.NoSuchMetaStoreException;
+import org.apache.accumulo.core.file.map.MapFileUtil;
+import org.apache.accumulo.core.iterators.IterationInterruptedException;
+import org.apache.accumulo.core.iterators.IteratorEnvironment;
+import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.MapFile.Reader;
+import org.apache.log4j.Logger;
+
+public class MapFileIterator implements FileSKVIterator {
+ private static final Logger log = Logger.getLogger(MapFileIterator.class);
+
+ private Reader reader;
+ private Value topValue;
+ private Key topKey;
+ private AtomicBoolean interruptFlag;
+ private int interruptCheckCount = 0;
+ private FileSystem fs;
+ private String dirName;
+
+ /**
+ * @param acuconf
+ * @param fs2
+ * @param file
+ * @param conf
+ * @throws IOException
+ */
+ public MapFileIterator(AccumuloConfiguration acuconf, FileSystem fs, String dir, Configuration conf) throws IOException {
+ this.reader = MapFileUtil.openMapFile(acuconf, fs, dir, conf);
+ this.fs = fs;
+ this.dirName = dir;
+ }
+
+ @Override
+ public void setInterruptFlag(AtomicBoolean flag) {
+ this.interruptFlag = flag;
+ }
+
+ @Override
+ public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean hasTop() {
+ return topKey != null;
+ }
+
+ @Override
+ public void next() throws IOException {
+ if (interruptFlag != null && interruptCheckCount++ % 100 == 0 && interruptFlag.get())
+ throw new IterationInterruptedException();
+
+ reader.next(topKey, topValue);
+ }
+
+ public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive) throws IOException {
+ if (columnFamilies.size() != 0 || inclusive) {
+ throw new IllegalArgumentException("I do not know how to filter column families");
+ }
+
+ if (range == null)
+ throw new IllegalArgumentException("Cannot seek to null range");
+
+ if (interruptFlag != null && interruptFlag.get())
+ throw new IterationInterruptedException();
+
+ Key key = range.getStartKey();
+ if (key == null) {
+ key = new Key();
+ }
+
+ reader.seek(key);
+
+ while (hasTop() && range.beforeStartKey(getTopKey())) {
+ next();
+ }
+ }
+
+ @Override
+ public Key getTopKey() {
+ return topKey;
+ }
+
+ @Override
+ public Value getTopValue() {
+ return topValue;
+ }
+
+ @Override
+ public SortedKeyValueIterator<Key,Value> deepCopy(IteratorEnvironment env) {
+ try {
+ SortedKeyValueIterator<Key,Value> other = env.reserveMapFileReader(dirName);
+ ((InterruptibleIterator) other).setInterruptFlag(interruptFlag);
+ log.debug("deep copying MapFile: " + this + " -> " + other);
+ return other;
+ } catch (IOException e) {
+ log.error("failed to clone map file reader", e);
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public Key getFirstKey() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Key getLastKey() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public DataInputStream getMetaStore(String name) throws IOException {
+ Path path = new Path(this.dirName, name);
+ if (!fs.exists(path))
+ throw new NoSuchMetaStoreException("name = " + name);
+ return fs.open(path);
+ }
+
+ @Override
+ public void closeDeepCopies() throws IOException {
+ // nothing to do, deep copies are externally managed/closed
+ }
+
+ @Override
+ public void close() throws IOException {
+ reader.close();
+ }
+}
Propchange: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/MapFileIterator.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java?rev=1228465&r1=1228464&r2=1228465&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java Fri Jan 6 22:22:51 2012
@@ -27,10 +27,10 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.file.FileSKVIterator;
-import org.apache.accumulo.core.file.map.MySequenceFile;
-import org.apache.accumulo.core.file.map.MySequenceFile.Reader;
import org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.hadoop.io.SequenceFile;
+import org.apache.hadoop.io.SequenceFile.Reader;
public class SequenceFileIterator implements FileSKVIterator {
@@ -48,7 +48,7 @@ public class SequenceFileIterator implem
throw new UnsupportedOperationException();
}
- public SequenceFileIterator(MySequenceFile.Reader reader, boolean readValue) throws IOException {
+ public SequenceFileIterator(SequenceFile.Reader reader, boolean readValue) throws IOException {
this.reader = reader;
this.readValue = readValue;
Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java?rev=1228465&r1=1228464&r2=1228465&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java Fri Jan 6 22:22:51 2012
@@ -21,11 +21,8 @@ import java.io.IOException;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.file.map.MyMapFile;
-import org.apache.accumulo.core.file.map.MyMapFile.Reader;
-import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
+import org.apache.accumulo.core.iterators.system.MapFileIterator;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -43,10 +40,10 @@ public class DefaultIteratorEnvironment
}
@Override
- public Reader reserveMapFileReader(String mapFileName) throws IOException {
+ public SortedKeyValueIterator<Key,Value> reserveMapFileReader(String mapFileName) throws IOException {
Configuration conf = CachedConfiguration.getInstance();
FileSystem fs = FileSystem.get(conf);
- return new MyMapFile.Reader(fs, mapFileName, conf);
+ return new MapFileIterator(this.conf, fs, mapFileName, conf);
}
@Override
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java?rev=1228465&r1=1228464&r2=1228465&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java Fri Jan 6 22:22:51 2012
@@ -42,7 +42,6 @@ import org.apache.accumulo.core.client.i
import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.file.FileOperations;
-import org.apache.accumulo.core.file.map.MyMapFile;
import org.apache.accumulo.core.master.state.tables.TableState;
import org.apache.accumulo.core.security.thrift.AuthInfo;
import org.apache.accumulo.core.util.CachedConfiguration;
@@ -64,6 +63,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.MapFile;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
@@ -222,7 +222,7 @@ public class BulkImport extends MasterRe
continue;
}
try {
- FileStatus dataStatus = fs.getFileStatus(new Path(fileStatus.getPath(), MyMapFile.DATA_FILE_NAME));
+ FileStatus dataStatus = fs.getFileStatus(new Path(fileStatus.getPath(), MapFile.DATA_FILE_NAME));
if (dataStatus.isDir()) {
log.warn(fileStatus.getPath() + " is not a map file, ignoring");
continue;
Copied: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/CreateRFiles.java (from r1226913, incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java)
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/CreateRFiles.java?p2=incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/CreateRFiles.java&p1=incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java&r1=1226913&r2=1228465&rev=1228465&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/CreateRFiles.java Fri Jan 6 22:22:51 2012
@@ -20,7 +20,7 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-public class CreateMapFiles {
+public class CreateRFiles {
public static void main(String[] args) {
String dir = args[0];
@@ -39,7 +39,7 @@ public class CreateMapFiles {
int count = 0;
while (currEnd <= end && currStart < currEnd) {
- final String tia = String.format("-mapFile /%s/mf%05d -timestamp 1 -size 50 -random 56 %d %d 1", dir, count, currEnd - currStart, currStart);
+ final String tia = String.format("-rFile /%s/mf%05d -timestamp 1 -size 50 -random 56 %d %d 1", dir, count, currEnd - currStart, currStart);
Runnable r = new Runnable() {
Propchange: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/CreateRFiles.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java?rev=1228465&r1=1228464&r2=1228465&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java Fri Jan 6 22:22:51 2012
@@ -283,6 +283,7 @@ public class TestIngest {
if (ingestArgs.outputToRFile) {
Configuration conf = CachedConfiguration.getInstance();
FileSystem fs = FileSystem.get(conf);
+ System.out.println(ingestArgs.outputFile);
writer = FileOperations.getInstance().openWriter(ingestArgs.outputFile + "." + RFile.EXTENSION, fs, conf,
AccumuloConfiguration.getDefaultConfiguration());
writer.startDefaultLocalityGroup();
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java?rev=1228465&r1=1228464&r2=1228465&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java Fri Jan 6 22:22:51 2012
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.accumulo.server.test.CreateMapFiles;
+import org.apache.accumulo.server.test.CreateRFiles;
import org.apache.accumulo.server.test.VerifyIngest;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -42,8 +42,8 @@ public class BulkSplitOptimizationTest e
@Override
public void cleanup() throws Exception {
FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
- fs.delete(new Path("/testmf"), true);
- fs.delete(new Path("/testmf_failures"), true);
+ fs.delete(new Path("/testrf"), true);
+ fs.delete(new Path("/testrf_failures"), true);
}
@Override
@@ -61,11 +61,11 @@ public class BulkSplitOptimizationTest e
public void run() throws Exception {
FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
- fs.delete(new Path("/testmf"), true);
+ fs.delete(new Path("/testrf"), true);
- CreateMapFiles.main(new String[] {"testmf", "8", "0", "100000", "99"});
+ CreateRFiles.main(new String[] {"testrf", "8", "0", "100000", "99"});
- bulkImport(fs, TABLE_NAME, "/testmf");
+ bulkImport(fs, TABLE_NAME, "/testrf");
checkSplits(TABLE_NAME, 0, 0);
checkRFiles(TABLE_NAME, 1, 1, 100, 100);
Modified: incubator/accumulo/trunk/test/system/auto/simple/compaction.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/compaction.py?rev=1228465&r1=1228464&r2=1228465&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/compaction.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/compaction.py Fri Jan 6 22:22:51 2012
@@ -40,10 +40,10 @@ class CompactionTest(SimpleBulkTest):
'tserver.compaction.major.concurrent.max':1,
})
- def createMapFiles(self, host):
+ def createRFiles(self, host):
handle = self.runClassOn(
self.masterHost(),
- 'org.apache.accumulo.server.test.CreateMapFiles',
+ 'org.apache.accumulo.server.test.CreateRFiles',
"testrf 4 0 500000 59".split())
out, err = handle.communicate()
self.assert_(handle.returncode == 0)
@@ -56,8 +56,8 @@ class CompactionTest(SimpleBulkTest):
self.execute(self.masterHost(), 'hadoop dfs -rmr /testrfFail'.split())
# insert some data
- self.createMapFiles(self.masterHost())
- self.bulkLoad(self.masterHost())
+ self.createRFiles(self.masterHost())
+ self.bulkLoad(self.masterHost(), '/testrf')
out, err, code = self.shell(self.masterHost(), "table !METADATA\nscan -b ! -c ~tab,file\n")
self.assert_(code == 0)