[16/20] hbase git commit: HBASE-20271 ReplicationSourceWALReader.switched should use the file name instead of the path object directly

2018-04-09 Thread zhangduo
HBASE-20271 ReplicationSourceWALReader.switched should use the file name 
instead of the path object directly


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6f13b28c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6f13b28c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6f13b28c

Branch: refs/heads/branch-2
Commit: 6f13b28c1988630e4ae7de70f613502cdbc3dfa1
Parents: 9369cf2
Author: zhangduo 
Authored: Sat Mar 24 16:25:20 2018 +0800
Committer: zhangduo 
Committed: Mon Apr 9 15:18:44 2018 +0800

--
 .../replication/regionserver/ReplicationSourceWALReader.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/6f13b28c/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
index 2154856..7ba347f 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
@@ -174,7 +174,8 @@ class ReplicationSourceWALReader extends Thread {
   }
 
   protected static final boolean switched(WALEntryStream entryStream, Path 
path) {
-return !path.equals(entryStream.getCurrentPath());
+Path newPath = entryStream.getCurrentPath();
+return newPath == null || !path.getName().equals(newPath.getName());
   }
 
   protected WALEntryBatch readWALEntries(WALEntryStream entryStream)



[18/22] hbase git commit: HBASE-20271 ReplicationSourceWALReader.switched should use the file name instead of the path object directly

2018-04-09 Thread zhangduo
HBASE-20271 ReplicationSourceWALReader.switched should use the file name 
instead of the path object directly


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6f13b28c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6f13b28c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6f13b28c

Branch: refs/heads/HBASE-20046-branch-2
Commit: 6f13b28c1988630e4ae7de70f613502cdbc3dfa1
Parents: 9369cf2
Author: zhangduo 
Authored: Sat Mar 24 16:25:20 2018 +0800
Committer: zhangduo 
Committed: Mon Apr 9 15:18:44 2018 +0800

--
 .../replication/regionserver/ReplicationSourceWALReader.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/6f13b28c/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
index 2154856..7ba347f 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
@@ -174,7 +174,8 @@ class ReplicationSourceWALReader extends Thread {
   }
 
   protected static final boolean switched(WALEntryStream entryStream, Path 
path) {
-return !path.equals(entryStream.getCurrentPath());
+Path newPath = entryStream.getCurrentPath();
+return newPath == null || !path.getName().equals(newPath.getName());
   }
 
   protected WALEntryBatch readWALEntries(WALEntryStream entryStream)



[15/20] hbase git commit: HBASE-20271 ReplicationSourceWALReader.switched should use the file name instead of the path object directly

2018-04-07 Thread zhangduo
HBASE-20271 ReplicationSourceWALReader.switched should use the file name 
instead of the path object directly


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5510389b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5510389b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5510389b

Branch: refs/heads/HBASE-20046-branch-2
Commit: 5510389bf76dfcc14afa3411502ba0c58b1bc189
Parents: 2d5c0e2
Author: zhangduo 
Authored: Sat Mar 24 16:25:20 2018 +0800
Committer: zhangduo 
Committed: Sun Apr 8 11:21:41 2018 +0800

--
 .../replication/regionserver/ReplicationSourceWALReader.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/5510389b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
index 2154856..7ba347f 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
@@ -174,7 +174,8 @@ class ReplicationSourceWALReader extends Thread {
   }
 
   protected static final boolean switched(WALEntryStream entryStream, Path 
path) {
-return !path.equals(entryStream.getCurrentPath());
+Path newPath = entryStream.getCurrentPath();
+return newPath == null || !path.getName().equals(newPath.getName());
   }
 
   protected WALEntryBatch readWALEntries(WALEntryStream entryStream)



[15/50] [abbrv] hbase git commit: HBASE-20271 ReplicationSourceWALReader.switched should use the file name instead of the path object directly

2018-03-27 Thread zhangduo
HBASE-20271 ReplicationSourceWALReader.switched should use the file name 
instead of the path object directly


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c44e8868
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c44e8868
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c44e8868

Branch: refs/heads/HBASE-19064
Commit: c44e88686084a60be7d4dd5afeabab22f7cddfd8
Parents: 64ccd2b
Author: zhangduo 
Authored: Sat Mar 24 16:25:20 2018 +0800
Committer: zhangduo 
Committed: Sat Mar 24 21:12:40 2018 +0800

--
 .../replication/regionserver/ReplicationSourceWALReader.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c44e8868/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
index 2154856..7ba347f 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
@@ -174,7 +174,8 @@ class ReplicationSourceWALReader extends Thread {
   }
 
   protected static final boolean switched(WALEntryStream entryStream, Path 
path) {
-return !path.equals(entryStream.getCurrentPath());
+Path newPath = entryStream.getCurrentPath();
+return newPath == null || !path.getName().equals(newPath.getName());
   }
 
   protected WALEntryBatch readWALEntries(WALEntryStream entryStream)



hbase git commit: HBASE-20271 ReplicationSourceWALReader.switched should use the file name instead of the path object directly

2018-03-24 Thread zhangduo
Repository: hbase
Updated Branches:
  refs/heads/master 64ccd2b29 -> c44e88686


HBASE-20271 ReplicationSourceWALReader.switched should use the file name 
instead of the path object directly


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c44e8868
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c44e8868
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c44e8868

Branch: refs/heads/master
Commit: c44e88686084a60be7d4dd5afeabab22f7cddfd8
Parents: 64ccd2b
Author: zhangduo 
Authored: Sat Mar 24 16:25:20 2018 +0800
Committer: zhangduo 
Committed: Sat Mar 24 21:12:40 2018 +0800

--
 .../replication/regionserver/ReplicationSourceWALReader.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c44e8868/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
index 2154856..7ba347f 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
@@ -174,7 +174,8 @@ class ReplicationSourceWALReader extends Thread {
   }
 
   protected static final boolean switched(WALEntryStream entryStream, Path 
path) {
-return !path.equals(entryStream.getCurrentPath());
+Path newPath = entryStream.getCurrentPath();
+return newPath == null || !path.getName().equals(newPath.getName());
   }
 
   protected WALEntryBatch readWALEntries(WALEntryStream entryStream)