Author: larsh
Date: Sat Mar 15 04:25:51 2014
New Revision: 1577781
URL: http://svn.apache.org/r1577781
Log:
HBASE-10706 Disable writeToWal in tests where possible
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceBase.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
Sat Mar 15 04:25:51 2014
@@ -31,7 +31,6 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseTestCase.HRegionIncommon;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.hbase.client.Get;
@@ -218,12 +217,10 @@ public abstract class HBaseTestCase exte
* @param r
* @param columnFamily
* @param column
- * @param writeToWAL
* @throws IOException
* @return count of what we added.
*/
- public static long addContent(final HRegion r, final byte [] columnFamily,
final byte[] column,
- boolean writeToWAL)
+ public static long addContent(final HRegion r, final byte [] columnFamily,
final byte[] column)
throws IOException {
byte [] startKey = r.getRegionInfo().getStartKey();
byte [] endKey = r.getRegionInfo().getEndKey();
@@ -232,32 +229,12 @@ public abstract class HBaseTestCase exte
startKeyBytes = START_KEY_BYTES;
}
return addContent(new HRegionIncommon(r), Bytes.toString(columnFamily),
Bytes.toString(column),
- startKeyBytes, endKey, -1, writeToWAL);
- }
-
- public static long addContent(final HRegion r, final byte [] columnFamily,
final byte[] column)
- throws IOException {
- return addContent(r, columnFamily, column, true);
- }
-
- /**
- * Add content to region <code>r</code> on the passed column
- * <code>column</code>.
- * Adds data of the from 'aaa', 'aab', etc where key and value are the same.
- * @param r
- * @param columnFamily
- * @param writeToWAL
- * @throws IOException
- * @return count of what we added.
- */
- public static long addContent(final HRegion r, final byte [] columnFamily,
boolean writeToWAL)
- throws IOException {
- return addContent(r, columnFamily, null, writeToWAL);
+ startKeyBytes, endKey, -1);
}
public static long addContent(final HRegion r, final byte [] columnFamily)
throws IOException {
- return addContent(r, columnFamily, null, true);
+ return addContent(r, columnFamily, null);
}
/**
@@ -271,23 +248,13 @@ public abstract class HBaseTestCase exte
* @return count of what we added.
*/
public static long addContent(final Incommon updater,
- final String columnFamily, final boolean writeToWAL) throws IOException {
- return addContent(updater, columnFamily, START_KEY_BYTES, null,
writeToWAL);
- }
-
- public static long addContent(final Incommon updater,
final String columnFamily) throws IOException {
- return addContent(updater, columnFamily, START_KEY_BYTES, null, true);
- }
-
- public static long addContent(final Incommon updater, final String family,
- final String column, final boolean writeToWAL) throws IOException {
- return addContent(updater, family, column, START_KEY_BYTES, null,
writeToWAL);
+ return addContent(updater, columnFamily, START_KEY_BYTES, null);
}
public static long addContent(final Incommon updater, final String family,
final String column) throws IOException {
- return addContent(updater, family, column, START_KEY_BYTES, null, true);
+ return addContent(updater, family, column, START_KEY_BYTES, null);
}
/**
@@ -303,21 +270,14 @@ public abstract class HBaseTestCase exte
* @throws IOException
*/
public static long addContent(final Incommon updater, final String
columnFamily,
- final byte [] startKeyBytes, final byte [] endKey, final boolean
writeToWAL)
+ final byte [] startKeyBytes, final byte [] endKey)
throws IOException {
- return addContent(updater, columnFamily, null, startKeyBytes, endKey, -1,
writeToWAL);
- }
-
- public static long addContent(final Incommon updater, final String family,
- final String column, final byte []
startKeyBytes,
- final byte [] endKey,
- final boolean writeToWAL) throws
IOException {
- return addContent(updater, family, column, startKeyBytes, endKey, -1,
writeToWAL);
+ return addContent(updater, columnFamily, null, startKeyBytes, endKey, -1);
}
public static long addContent(final Incommon updater, final String family,
String column,
final byte [] startKeyBytes, final byte [] endKey) throws IOException {
- return addContent(updater, family, column, startKeyBytes, endKey, -1,
true);
+ return addContent(updater, family, column, startKeyBytes, endKey, -1);
}
/**
@@ -336,8 +296,7 @@ public abstract class HBaseTestCase exte
public static long addContent(final Incommon updater,
final String columnFamily,
final String column,
- final byte [] startKeyBytes, final byte [] endKey, final long ts,
- final boolean writeToWAL)
+ final byte [] startKeyBytes, final byte [] endKey, final long ts)
throws IOException {
long count = 0;
// Add rows of three characters. The first character starts with the
@@ -383,7 +342,7 @@ public abstract class HBaseTestCase exte
} else {
put.add(split[0], split[1], t);
}
- put.setDurability(writeToWAL ? Durability.USE_DEFAULT :
Durability.SKIP_WAL);
+ put.setDurability(Durability.SKIP_WAL);
updater.put(put);
count++;
} catch (RuntimeException ex) {
@@ -409,13 +368,6 @@ public abstract class HBaseTestCase exte
return count;
}
- public static long addContent(final Incommon updater,
- final String columnFamily,
- final String column,
- final byte [] startKeyBytes, final byte [] endKey, final long ts) throws
IOException {
- return addContent(updater, columnFamily, column, startKeyBytes, endKey,
ts, true);
- }
-
/**
* Implementors can flushcache.
*/
@@ -586,7 +538,6 @@ public abstract class HBaseTestCase exte
scanner.close();
}
- @SuppressWarnings("unchecked")
public Iterator<Result> iterator() {
return scanner.iterator();
}
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
Sat Mar 15 04:25:51 2014
@@ -1630,6 +1630,17 @@ public class HBaseTestingUtility extends
}
/**
+ * Load table with rows from 'aaa' to 'zzz'.
+ * @param t Table
+ * @param f Family
+ * @return Count of rows loaded.
+ * @throws IOException
+ */
+ public int loadTable(final HTable t, final byte[] f, boolean writeToWAL)
throws IOException {
+ return loadTable(t, new byte[][] {f}, null, writeToWAL);
+ }
+
+ /**
* Load table of multiple column families with rows from 'aaa' to 'zzz'.
* @param t Table
* @param f Array of Families to load
@@ -1649,10 +1660,23 @@ public class HBaseTestingUtility extends
* @throws IOException
*/
public int loadTable(final HTable t, final byte[][] f, byte[] value) throws
IOException {
+ return loadTable(t, f, value, true);
+ }
+
+ /**
+ * Load table of multiple column families with rows from 'aaa' to 'zzz'.
+ * @param t Table
+ * @param f Array of Families to load
+ * @param value the values of the cells. If null is passed, the row key is
used as value
+ * @return Count of rows loaded.
+ * @throws IOException
+ */
+ public int loadTable(final HTable t, final byte[][] f, byte[] value, boolean
writeToWAL) throws IOException {
t.setAutoFlush(false);
int rowCount = 0;
for (byte[] row : HBaseTestingUtility.ROWS) {
Put put = new Put(row);
+ put.setDurability(writeToWAL ? Durability.USE_DEFAULT :
Durability.SKIP_WAL);
for (int i = 0; i < f.length; i++) {
put.add(f[i], null, value != null ? value : row);
}
@@ -1737,6 +1761,7 @@ public class HBaseTestingUtility extends
k[1] = b2;
k[2] = b3;
Put put = new Put(k);
+ put.setDurability(Durability.SKIP_WAL);
put.add(f, null, k);
if (r.getLog() == null) put.setDurability(Durability.SKIP_WAL);
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
Sat Mar 15 04:25:51 2014
@@ -545,7 +545,7 @@ public class TestFromClientSide {
throws IOException, InterruptedException {
byte [] name = Bytes.toBytes("testFilterAcrossMutlipleRegions");
HTable t = TEST_UTIL.createTable(name, FAMILY);
- int rowCount = TEST_UTIL.loadTable(t, FAMILY);
+ int rowCount = TEST_UTIL.loadTable(t, FAMILY, false);
assertRowCount(t, rowCount);
// Split the table. Should split on a reasonable key; 'lqj'
Map<HRegionInfo, ServerName> regions = splitTable(t);
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java
Sat Mar 15 04:25:51 2014
@@ -178,7 +178,7 @@ public class TestSnapshotFromClient {
// put some stuff in the table
HTable table = new HTable(UTIL.getConfiguration(), TABLE_NAME);
- UTIL.loadTable(table, TEST_FAM);
+ UTIL.loadTable(table, TEST_FAM, false);
// get the name of all the regionservers hosting the snapshotted table
Set<String> snapshotServers = new HashSet<String>();
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java
Sat Mar 15 04:25:51 2014
@@ -66,7 +66,7 @@ public class TestMultithreadedTableMappe
UTIL.startMiniCluster();
HTable table = UTIL.createTable(MULTI_REGION_TABLE_NAME, new byte[][]
{INPUT_FAMILY, OUTPUT_FAMILY});
UTIL.createMultiRegions(table, INPUT_FAMILY);
- UTIL.loadTable(table, INPUT_FAMILY);
+ UTIL.loadTable(table, INPUT_FAMILY, false);
UTIL.startMiniMapReduceCluster();
}
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java
Sat Mar 15 04:25:51 2014
@@ -79,7 +79,7 @@ public abstract class TestTableInputForm
// create and fill table
table = TEST_UTIL.createTable(TABLE_NAME, INPUT_FAMILY);
TEST_UTIL.createMultiRegions(table, INPUT_FAMILY);
- TEST_UTIL.loadTable(table, INPUT_FAMILY);
+ TEST_UTIL.loadTable(table, INPUT_FAMILY, false);
// start MR cluster
TEST_UTIL.startMiniMapReduceCluster();
}
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceBase.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceBase.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceBase.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceBase.java
Sat Mar 15 04:25:51 2014
@@ -77,7 +77,7 @@ public abstract class TestTableMapReduce
HTable table =
UTIL.createTable(MULTI_REGION_TABLE_NAME, new byte[][] { INPUT_FAMILY,
OUTPUT_FAMILY });
UTIL.createMultiRegions(table, INPUT_FAMILY);
- UTIL.loadTable(table, INPUT_FAMILY);
+ UTIL.loadTable(table, INPUT_FAMILY, false);
UTIL.startMiniMapReduceCluster();
}
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
Sat Mar 15 04:25:51 2014
@@ -68,7 +68,7 @@ public class TestMaster {
HTable ht = TEST_UTIL.createTable(TABLENAME, FAMILYNAME);
assertTrue(m.assignmentManager.getZKTable().isEnabledTable(TABLENAME));
- TEST_UTIL.loadTable(ht, FAMILYNAME);
+ TEST_UTIL.loadTable(ht, FAMILYNAME, false);
ht.close();
List<Pair<HRegionInfo, ServerName>> tableRegions =
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
Sat Mar 15 04:25:51 2014
@@ -146,7 +146,7 @@ public class TestCompaction {
for (int j = 0; j < jmax; j++) {
p.add(COLUMN_FAMILY, Bytes.toBytes(j), pad);
}
- HBaseTestCase.addContent(loader, Bytes.toString(COLUMN_FAMILY), false);
+ HBaseTestCase.addContent(loader, Bytes.toString(COLUMN_FAMILY));
loader.put(p);
loader.flushcache();
}
@@ -223,7 +223,7 @@ public class TestCompaction {
private void createStoreFile(final HRegion region, String family) throws
IOException {
HRegionIncommon loader = new HRegionIncommon(region);
- HBaseTestCase.addContent(loader, family, false);
+ HBaseTestCase.addContent(loader, family);
loader.flushcache();
}
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
Sat Mar 15 04:25:51 2014
@@ -92,7 +92,7 @@ public class TestEndToEndSplitTransactio
TableName.valueOf("TestSplit");
byte[] familyName = Bytes.toBytes("fam");
HTable ht = TEST_UTIL.createTable(tableName, familyName);
- TEST_UTIL.loadTable(ht, familyName);
+ TEST_UTIL.loadTable(ht, familyName, false);
ht.close();
HRegionServer server = TEST_UTIL.getHBaseCluster().getRegionServer(0);
byte []firstRow = Bytes.toBytes("aaa");
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
Sat Mar 15 04:25:51 2014
@@ -202,7 +202,7 @@ public class TestFSErrorsExposed {
HTable table = new HTable(new Configuration(util.getConfiguration()),
tableName);
// Load some data
- util.loadTable(table, fam);
+ util.loadTable(table, fam, false);
table.flushCommits();
util.flush();
util.countRows(table);
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
Sat Mar 15 04:25:51 2014
@@ -199,7 +199,7 @@ public class TestMajorCompaction {
createStoreFile(r);
}
// Add more content.
- HBaseTestCase.addContent(new HRegionIncommon(r),
Bytes.toString(COLUMN_FAMILY), false);
+ HBaseTestCase.addContent(new HRegionIncommon(r),
Bytes.toString(COLUMN_FAMILY));
// Now there are about 5 versions of each column.
// Default is that there only 3 (MAXVERSIONS) versions allowed per column.
@@ -390,14 +390,14 @@ public class TestMajorCompaction {
private void createStoreFile(final HRegion region, String family) throws
IOException {
HRegionIncommon loader = new HRegionIncommon(region);
- HBaseTestCase.addContent(loader, family, false);
+ HBaseTestCase.addContent(loader, family);
loader.flushcache();
}
private void createSmallerStoreFile(final HRegion region) throws IOException
{
HRegionIncommon loader = new HRegionIncommon(region);
HBaseTestCase.addContent(loader, Bytes.toString(COLUMN_FAMILY), ("" +
- "bbb").getBytes(), null, false);
+ "bbb").getBytes(), null);
loader.flushcache();
}
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java
Sat Mar 15 04:25:51 2014
@@ -164,13 +164,13 @@ public class TestMinorCompaction {
HRegionIncommon loader = new HRegionIncommon(r);
for (int i = 0; i < compactionThreshold + 1; i++) {
HBaseTestCase.addContent(loader, Bytes.toString(fam1),
Bytes.toString(col1), firstRowBytes,
- thirdRowBytes, i, false);
+ thirdRowBytes, i);
HBaseTestCase.addContent(loader, Bytes.toString(fam1),
Bytes.toString(col2), firstRowBytes,
- thirdRowBytes, i, false);
+ thirdRowBytes, i);
HBaseTestCase.addContent(loader, Bytes.toString(fam2),
Bytes.toString(col1), firstRowBytes,
- thirdRowBytes, i, false);
+ thirdRowBytes, i);
HBaseTestCase.addContent(loader, Bytes.toString(fam2),
Bytes.toString(col2), firstRowBytes,
- thirdRowBytes, i, false);
+ thirdRowBytes, i);
r.flushcache();
}
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java
Sat Mar 15 04:25:51 2014
@@ -130,7 +130,7 @@ public class TestRegionFavoredNodes {
// Write some data to each region and flush. Repeat some number of times to
// get multiple files for each region.
for (int i = 0; i < FLUSHES; i++) {
- TEST_UTIL.loadTable(table, COLUMN_FAMILY);
+ TEST_UTIL.loadTable(table, COLUMN_FAMILY, false);
TEST_UTIL.flush();
}
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java?rev=1577781&r1=1577780&r2=1577781&view=diff
==============================================================================
---
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
(original)
+++
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
Sat Mar 15 04:25:51 2014
@@ -412,7 +412,7 @@ public class TestSplitTransactionOnClust
cluster.getMaster().setCatalogJanitorEnabled(false);
try {
// Add a bit of load up into the table so splittable.
- TESTING_UTIL.loadTable(t, HConstants.CATALOG_FAMILY);
+ TESTING_UTIL.loadTable(t, HConstants.CATALOG_FAMILY, false);
// Get region pre-split.
HRegionServer server = cluster.getRegionServer(tableRegionIndex);
printOutRegions(server, "Initial regions: ");
@@ -471,7 +471,7 @@ public class TestSplitTransactionOnClust
cluster.getMaster().setCatalogJanitorEnabled(false);
try {
// Add a bit of load up into the table so splittable.
- TESTING_UTIL.loadTable(t, HConstants.CATALOG_FAMILY);
+ TESTING_UTIL.loadTable(t, HConstants.CATALOG_FAMILY, false);
// Get region pre-split.
HRegionServer server = cluster.getRegionServer(tableRegionIndex);
printOutRegions(server, "Initial regions: ");
@@ -641,7 +641,7 @@ public class TestSplitTransactionOnClust
"testMasterRestartWhenSplittingIsPartial", new UselessTestAbortable());
try {
// Add a bit of load up into the table so splittable.
- TESTING_UTIL.loadTable(t, HConstants.CATALOG_FAMILY);
+ TESTING_UTIL.loadTable(t, HConstants.CATALOG_FAMILY, false);
// Get region pre-split.
HRegionServer server = cluster.getRegionServer(tableRegionIndex);
printOutRegions(server, "Initial regions: ");
@@ -731,7 +731,7 @@ public class TestSplitTransactionOnClust
"testMasterRestartAtRegionSplitPendingCatalogJanitor", new
UselessTestAbortable());
try {
// Add a bit of load up into the table so splittable.
- TESTING_UTIL.loadTable(t, HConstants.CATALOG_FAMILY);
+ TESTING_UTIL.loadTable(t, HConstants.CATALOG_FAMILY, false);
// Get region pre-split.
HRegionServer server = cluster.getRegionServer(tableRegionIndex);
printOutRegions(server, "Initial regions: ");
