[08/34] hbase git commit: HBASE-20485 Copy constructor of Scan doesn't copy the readType and replicaId

[zhangduo]

HBASE-20485 Copy constructor of Scan doesn't copy the readType and replicaId

Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/HBASE-19064
Commit: f8281aa20877bfb3c0cb8e11f27e1de26250f90c
Parents: c51e9ad
Author: Nihal Jain 
Authored: Wed Apr 25 12:17:14 2018 +0530
Committer: Chia-Ping Tsai 
Committed: Wed May 9 16:39:57 2018 +0800

--
 .../org/apache/hadoop/hbase/client/Scan.java|  3 +
 .../apache/hadoop/hbase/client/TestScan.java| 94 +++-
 .../hbase/master/SplitOrMergeTracker.java   |  1 -
 3 files changed, 94 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f8281aa2/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
index b02bdc1..32fe2dc 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
@@ -279,6 +279,8 @@ public class Scan extends Query {
 this.limit = scan.getLimit();
 this.needCursorResult = scan.isNeedCursorResult();
 setPriority(scan.getPriority());
+readType = scan.getReadType();
+super.setReplicaId(scan.getReplicaId());
   }
 
   /**
@@ -310,6 +312,7 @@ public class Scan extends Query {
 }
 this.mvccReadPoint = -1L;
 setPriority(get.getPriority());
+super.setReplicaId(get.getReplicaId());
   }
 
   public boolean isGetScan() {

http://git-wip-us.apache.org/repos/asf/hbase/blob/f8281aa2/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
--
diff --git 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
index 18dcb46..7ef9524 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
@@ -24,9 +24,13 @@ import static org.junit.Assert.fail;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Set;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.client.Scan.ReadType;
 import org.apache.hadoop.hbase.filter.FilterList;
+import org.apache.hadoop.hbase.security.access.Permission;
 import org.apache.hadoop.hbase.security.visibility.Authorizations;
 import org.apache.hadoop.hbase.testclassification.ClientTests;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -35,7 +39,6 @@ import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;
 
@@ -66,7 +69,7 @@ public class TestScan {
   }
 
   @Test
-  public void testGetToScan() throws IOException {
+  public void testGetToScan() throws Exception {
 Get get = new Get(Bytes.toBytes(1));
 get.setCacheBlocks(true)
 .setConsistency(Consistency.TIMELINE)
@@ -79,7 +82,12 @@ public class TestScan {
 .setRowOffsetPerColumnFamily(5)
 .setTimeRange(0, 13)
 .setAttribute("att_v0", Bytes.toBytes("att_v0"))
-.setColumnFamilyTimeRange(Bytes.toBytes("cf"), 0, 123);
+.setColumnFamilyTimeRange(Bytes.toBytes("cf"), 0, 123)
+.setReplicaId(3)
+.setACL("test_user", new Permission(Permission.Action.READ))
+.setAuthorizations(new Authorizations("test_label"))
+.setPriority(3);
+
 Scan scan = new Scan(get);
 assertEquals(get.getCacheBlocks(), scan.getCacheBlocks());
 assertEquals(get.getConsistency(), scan.getConsistency());
@@ -97,6 +105,10 @@ public class TestScan {
 scan.getColumnFamilyTimeRange().get(Bytes.toBytes("cf")).getMin());
 
assertEquals(get.getColumnFamilyTimeRange().get(Bytes.toBytes("cf")).getMax(),
 scan.getColumnFamilyTimeRange().get(Bytes.toBytes("cf")).getMax());
+assertEquals(get.getReplicaId(), scan.getReplicaId());
+assertEquals(get.getACL(), scan.getACL());
+assertEquals(get.getAuthorizations().getLabels(), 

hbase git commit: HBASE-20485 Copy constructor of Scan doesn't copy the readType and replicaId

[chia7712]

Repository: hbase
Updated Branches:
  refs/heads/master c51e9adc7 -> f8281aa20


HBASE-20485 Copy constructor of Scan doesn't copy the readType and replicaId

Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/master
Commit: f8281aa20877bfb3c0cb8e11f27e1de26250f90c
Parents: c51e9ad
Author: Nihal Jain 
Authored: Wed Apr 25 12:17:14 2018 +0530
Committer: Chia-Ping Tsai 
Committed: Wed May 9 16:39:57 2018 +0800

--
 .../org/apache/hadoop/hbase/client/Scan.java|  3 +
 .../apache/hadoop/hbase/client/TestScan.java| 94 +++-
 .../hbase/master/SplitOrMergeTracker.java   |  1 -
 3 files changed, 94 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f8281aa2/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
index b02bdc1..32fe2dc 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
@@ -279,6 +279,8 @@ public class Scan extends Query {
 this.limit = scan.getLimit();
 this.needCursorResult = scan.isNeedCursorResult();
 setPriority(scan.getPriority());
+readType = scan.getReadType();
+super.setReplicaId(scan.getReplicaId());
   }
 
   /**
@@ -310,6 +312,7 @@ public class Scan extends Query {
 }
 this.mvccReadPoint = -1L;
 setPriority(get.getPriority());
+super.setReplicaId(get.getReplicaId());
   }
 
   public boolean isGetScan() {

http://git-wip-us.apache.org/repos/asf/hbase/blob/f8281aa2/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
--
diff --git 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
index 18dcb46..7ef9524 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
@@ -24,9 +24,13 @@ import static org.junit.Assert.fail;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Set;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.client.Scan.ReadType;
 import org.apache.hadoop.hbase.filter.FilterList;
+import org.apache.hadoop.hbase.security.access.Permission;
 import org.apache.hadoop.hbase.security.visibility.Authorizations;
 import org.apache.hadoop.hbase.testclassification.ClientTests;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -35,7 +39,6 @@ import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;
 
@@ -66,7 +69,7 @@ public class TestScan {
   }
 
   @Test
-  public void testGetToScan() throws IOException {
+  public void testGetToScan() throws Exception {
 Get get = new Get(Bytes.toBytes(1));
 get.setCacheBlocks(true)
 .setConsistency(Consistency.TIMELINE)
@@ -79,7 +82,12 @@ public class TestScan {
 .setRowOffsetPerColumnFamily(5)
 .setTimeRange(0, 13)
 .setAttribute("att_v0", Bytes.toBytes("att_v0"))
-.setColumnFamilyTimeRange(Bytes.toBytes("cf"), 0, 123);
+.setColumnFamilyTimeRange(Bytes.toBytes("cf"), 0, 123)
+.setReplicaId(3)
+.setACL("test_user", new Permission(Permission.Action.READ))
+.setAuthorizations(new Authorizations("test_label"))
+.setPriority(3);
+
 Scan scan = new Scan(get);
 assertEquals(get.getCacheBlocks(), scan.getCacheBlocks());
 assertEquals(get.getConsistency(), scan.getConsistency());
@@ -97,6 +105,10 @@ public class TestScan {
 scan.getColumnFamilyTimeRange().get(Bytes.toBytes("cf")).getMin());
 
assertEquals(get.getColumnFamilyTimeRange().get(Bytes.toBytes("cf")).getMax(),
 scan.getColumnFamilyTimeRange().get(Bytes.toBytes("cf")).getMax());
+assertEquals(get.getReplicaId(), scan.getReplicaId());
+assertEquals(get.getACL(), scan.getACL());
+

hbase git commit: HBASE-20485 Copy constructor of Scan doesn't copy the readType and replicaId

[chia7712]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 421ed6ca5 -> 55badefa3


HBASE-20485 Copy constructor of Scan doesn't copy the readType and replicaId

Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/branch-2
Commit: 55badefa3817b9dd43797b7e6acdd429782e81e1
Parents: 421ed6c
Author: Nihal Jain 
Authored: Wed Apr 25 12:17:14 2018 +0530
Committer: Chia-Ping Tsai 
Committed: Wed May 9 16:45:39 2018 +0800

--
 .../org/apache/hadoop/hbase/client/Scan.java|  3 +
 .../apache/hadoop/hbase/client/TestScan.java| 94 +++-
 .../hbase/master/SplitOrMergeTracker.java   |  1 -
 3 files changed, 94 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/55badefa/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
index b02bdc1..32fe2dc 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
@@ -279,6 +279,8 @@ public class Scan extends Query {
 this.limit = scan.getLimit();
 this.needCursorResult = scan.isNeedCursorResult();
 setPriority(scan.getPriority());
+readType = scan.getReadType();
+super.setReplicaId(scan.getReplicaId());
   }
 
   /**
@@ -310,6 +312,7 @@ public class Scan extends Query {
 }
 this.mvccReadPoint = -1L;
 setPriority(get.getPriority());
+super.setReplicaId(get.getReplicaId());
   }
 
   public boolean isGetScan() {

http://git-wip-us.apache.org/repos/asf/hbase/blob/55badefa/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
--
diff --git 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
index 18dcb46..7ef9524 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
@@ -24,9 +24,13 @@ import static org.junit.Assert.fail;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Set;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.client.Scan.ReadType;
 import org.apache.hadoop.hbase.filter.FilterList;
+import org.apache.hadoop.hbase.security.access.Permission;
 import org.apache.hadoop.hbase.security.visibility.Authorizations;
 import org.apache.hadoop.hbase.testclassification.ClientTests;
 import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -35,7 +39,6 @@ import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos;
 
@@ -66,7 +69,7 @@ public class TestScan {
   }
 
   @Test
-  public void testGetToScan() throws IOException {
+  public void testGetToScan() throws Exception {
 Get get = new Get(Bytes.toBytes(1));
 get.setCacheBlocks(true)
 .setConsistency(Consistency.TIMELINE)
@@ -79,7 +82,12 @@ public class TestScan {
 .setRowOffsetPerColumnFamily(5)
 .setTimeRange(0, 13)
 .setAttribute("att_v0", Bytes.toBytes("att_v0"))
-.setColumnFamilyTimeRange(Bytes.toBytes("cf"), 0, 123);
+.setColumnFamilyTimeRange(Bytes.toBytes("cf"), 0, 123)
+.setReplicaId(3)
+.setACL("test_user", new Permission(Permission.Action.READ))
+.setAuthorizations(new Authorizations("test_label"))
+.setPriority(3);
+
 Scan scan = new Scan(get);
 assertEquals(get.getCacheBlocks(), scan.getCacheBlocks());
 assertEquals(get.getConsistency(), scan.getConsistency());
@@ -97,6 +105,10 @@ public class TestScan {
 scan.getColumnFamilyTimeRange().get(Bytes.toBytes("cf")).getMin());
 
assertEquals(get.getColumnFamilyTimeRange().get(Bytes.toBytes("cf")).getMax(),
 scan.getColumnFamilyTimeRange().get(Bytes.toBytes("cf")).getMax());
+assertEquals(get.getReplicaId(), scan.getReplicaId());
+assertEquals(get.getACL(), scan.getACL());
+