Repository: hbase Updated Branches: refs/heads/branch-2 3366ebdc5 -> a33a9de64
http://git-wip-us.apache.org/repos/asf/hbase/blob/a33a9de6/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java index e218841..0fc0df1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java @@ -379,7 +379,7 @@ public class TestWALSplit { fs.mkdirs(regiondir); long now = System.currentTimeMillis(); Entry entry = - new Entry(new WALKey(encoded, + new Entry(new WALKeyImpl(encoded, TableName.META_TABLE_NAME, 1, now, HConstants.DEFAULT_CLUSTER_ID), new WALEdit()); Path p = WALSplitter.getRegionSplitEditsPath(fs, entry, HBASEDIR, @@ -401,7 +401,7 @@ public class TestWALSplit { fs.mkdirs(regiondir); long now = System.currentTimeMillis(); Entry entry = - new Entry(new WALKey(encoded, + new Entry(new WALKeyImpl(encoded, TableName.META_TABLE_NAME, 1, now, HConstants.DEFAULT_CLUSTER_ID), new WALEdit()); Path parent = WALSplitter.getRegionDirRecoveredEditsDir(regiondir); @@ -1345,7 +1345,7 @@ public class TestWALSplit { .addCompactionOutput(output); WALEdit edit = WALEdit.createCompaction(hri, desc.build()); - WALKey key = new WALKey(hri.getEncodedNameAsBytes(), TABLE_NAME, 1, + WALKeyImpl key = new WALKeyImpl(hri.getEncodedNameAsBytes(), TABLE_NAME, 1, EnvironmentEdgeManager.currentTime(), HConstants.DEFAULT_CLUSTER_ID); w.append(new Entry(key, edit)); w.sync(); @@ -1362,7 +1362,7 @@ public class TestWALSplit { final long time = EnvironmentEdgeManager.currentTime(); KeyValue kv = new KeyValue(region.getBytes(), WALEdit.METAFAMILY, WALEdit.REGION_EVENT, time, regionOpenDesc.toByteArray()); - final WALKey walKey = new WALKey(region.getBytes(), TABLE_NAME, 1, time, + final WALKeyImpl walKey = new WALKeyImpl(region.getBytes(), TABLE_NAME, 1, time, HConstants.DEFAULT_CLUSTER_ID); w.append( new Entry(walKey, new WALEdit().add(kv))); @@ -1390,7 +1390,7 @@ public class TestWALSplit { final KeyValue cell = new KeyValue(row, family, qualifier, time, KeyValue.Type.Put, value); WALEdit edit = new WALEdit(); edit.add(cell); - return new Entry(new WALKey(region, table, seq, time, + return new Entry(new WALKeyImpl(region, table, seq, time, HConstants.DEFAULT_CLUSTER_ID), edit); } http://git-wip-us.apache.org/repos/asf/hbase/blob/a33a9de6/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java index 3241803..de23d61 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java @@ -1,4 +1,4 @@ -/** +/* * 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 @@ -185,8 +185,8 @@ public final class WALPerformanceEvaluation extends Configured implements Tool { WALEdit walEdit = new WALEdit(); addFamilyMapToWALEdit(put.getFamilyCellMap(), walEdit); RegionInfo hri = region.getRegionInfo(); - final WALKey logkey = - new WALKey(hri.getEncodedNameAsBytes(), hri.getTable(), now, mvcc, scopes); + final WALKeyImpl logkey = + new WALKeyImpl(hri.getEncodedNameAsBytes(), hri.getTable(), now, mvcc, scopes); wal.append(hri, logkey, walEdit, true); if (!this.noSync) { if (++lastSync >= this.syncInterval) { @@ -430,7 +430,7 @@ public final class WALPerformanceEvaluation extends Configured implements Tool { break; } count++; - long seqid = e.getKey().getLogSeqNum(); + long seqid = e.getKey().getSequenceId(); if (sequenceIds.containsKey(Bytes.toString(e.getKey().getEncodedRegionName()))) { // sequenceIds should be increasing for every regions if (sequenceIds.get(Bytes.toString(e.getKey().getEncodedRegionName())) >= seqid) {
