[03/26] hbase git commit: HBASE-19575 add copy constructor to Mutation

2017-12-22 Thread zhangduo 
HBASE-19575 add copy constructor to Mutation


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

Branch: refs/heads/HBASE-19397
Commit: 59baf12c03303dab2a69352d5f35d38bd464d943
Parents: 6cefabe
Author: Chia-Ping Tsai 
Authored: Fri Dec 22 03:13:03 2017 +0800
Committer: Chia-Ping Tsai 
Committed: Fri Dec 22 03:24:43 2017 +0800

--
 .../org/apache/hadoop/hbase/client/Append.java  |  32 ++-
 .../org/apache/hadoop/hbase/client/Delete.java  |  32 ++-
 .../apache/hadoop/hbase/client/Increment.java   |  32 ++-
 .../apache/hadoop/hbase/client/Mutation.java|  45 +++-
 .../hbase/client/OperationWithAttributes.java   |  21 +-
 .../org/apache/hadoop/hbase/client/Put.java |  30 ++-
 .../hadoop/hbase/client/TestMutation.java   | 239 +++
 .../org/apache/hadoop/hbase/client/TestPut.java | 125 --
 .../hbase/regionserver/TestMetricsRegion.java   |   2 +-
 9 files changed, 387 insertions(+), 171 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/59baf12c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
index 24e9512..0cb51a2 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
@@ -112,17 +112,11 @@ public class Append extends Mutation {
   }
   /**
* Copy constructor
-   * @param a
+   * @param appendToCopy append to copy
*/
-  public Append(Append a) {
-this.row = a.getRow();
-this.ts = a.getTimeStamp();
-this.tr = a.getTimeRange();
-this.familyMap.putAll(a.getFamilyCellMap());
-for (Map.Entry entry : a.getAttributesMap().entrySet()) {
-  this.setAttribute(entry.getKey(), entry.getValue());
-}
-this.setPriority(a.getPriority());
+  public Append(Append appendToCopy) {
+super(appendToCopy);
+this.tr = appendToCopy.getTimeRange();
   }
 
   /** Create a Append operation for the specified row.
@@ -138,6 +132,18 @@ public class Append extends Mutation {
   }
 
   /**
+   * Construct the Append with user defined data. NOTED:
+   * 1) all cells in the familyMap must have the DataType.Put
+   * 2) the row of each cell must be same with passed row.
+   * @param row row. CAN'T be null
+   * @param ts timestamp
+   * @param familyMap the map to collect all cells internally. CAN'T be null
+   */
+  public Append(byte[] row, long ts, NavigableMap> 
familyMap) {
+super(row, ts, familyMap);
+  }
+
+  /**
* Add the specified column and value to this Append operation.
* @param family family name
* @param qualifier column qualifier
@@ -202,6 +208,12 @@ public class Append extends Mutation {
 return (Append) super.setDurability(d);
   }
 
+  /**
+   * Method for setting the Append's familyMap
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0.
+   * Use {@link Append#Append(byte[], long, NavigableMap)} instead
+   */
+  @Deprecated
   @Override
   public Append setFamilyCellMap(NavigableMap map) {
 return (Append) super.setFamilyCellMap(map);

http://git-wip-us.apache.org/repos/asf/hbase/blob/59baf12c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
index 2d296fb..57f5648 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
@@ -135,17 +135,23 @@ public class Delete extends Mutation implements 
Comparable {
   }
 
   /**
-   * @param d Delete to clone.
+   * @param deleteToCopy delete to copy
*/
-  public Delete(final Delete d) {
-this.row = d.getRow();
-this.ts = d.getTimeStamp();
-this.familyMap.putAll(d.getFamilyCellMap());
-this.durability = d.durability;
-for (Map.Entry entry : d.getAttributesMap().entrySet()) {
-  this.setAttribute(entry.getKey(), entry.getValue());
-}
-super.setPriority(d.getPriority());
+  public Delete(final Delete deleteToCopy) {
+super(deleteToCopy);
+  }
+
+  /**
+   * Construct the Delete with user defined data. NOTED:
+   * 1) all cells in the familyMap must have the delete type.
+   * see

hbase git commit: HBASE-19575 add copy constructor to Mutation

2017-12-21 Thread chia7712 
Repository: hbase
Updated Branches:
  refs/heads/master 6cefabee2 -> 59baf12c0


HBASE-19575 add copy constructor to Mutation


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

Branch: refs/heads/master
Commit: 59baf12c03303dab2a69352d5f35d38bd464d943
Parents: 6cefabe
Author: Chia-Ping Tsai 
Authored: Fri Dec 22 03:13:03 2017 +0800
Committer: Chia-Ping Tsai 
Committed: Fri Dec 22 03:24:43 2017 +0800

--
 .../org/apache/hadoop/hbase/client/Append.java  |  32 ++-
 .../org/apache/hadoop/hbase/client/Delete.java  |  32 ++-
 .../apache/hadoop/hbase/client/Increment.java   |  32 ++-
 .../apache/hadoop/hbase/client/Mutation.java|  45 +++-
 .../hbase/client/OperationWithAttributes.java   |  21 +-
 .../org/apache/hadoop/hbase/client/Put.java |  30 ++-
 .../hadoop/hbase/client/TestMutation.java   | 239 +++
 .../org/apache/hadoop/hbase/client/TestPut.java | 125 --
 .../hbase/regionserver/TestMetricsRegion.java   |   2 +-
 9 files changed, 387 insertions(+), 171 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/59baf12c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
index 24e9512..0cb51a2 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
@@ -112,17 +112,11 @@ public class Append extends Mutation {
   }
   /**
* Copy constructor
-   * @param a
+   * @param appendToCopy append to copy
*/
-  public Append(Append a) {
-this.row = a.getRow();
-this.ts = a.getTimeStamp();
-this.tr = a.getTimeRange();
-this.familyMap.putAll(a.getFamilyCellMap());
-for (Map.Entry entry : a.getAttributesMap().entrySet()) {
-  this.setAttribute(entry.getKey(), entry.getValue());
-}
-this.setPriority(a.getPriority());
+  public Append(Append appendToCopy) {
+super(appendToCopy);
+this.tr = appendToCopy.getTimeRange();
   }
 
   /** Create a Append operation for the specified row.
@@ -138,6 +132,18 @@ public class Append extends Mutation {
   }
 
   /**
+   * Construct the Append with user defined data. NOTED:
+   * 1) all cells in the familyMap must have the DataType.Put
+   * 2) the row of each cell must be same with passed row.
+   * @param row row. CAN'T be null
+   * @param ts timestamp
+   * @param familyMap the map to collect all cells internally. CAN'T be null
+   */
+  public Append(byte[] row, long ts, NavigableMap> 
familyMap) {
+super(row, ts, familyMap);
+  }
+
+  /**
* Add the specified column and value to this Append operation.
* @param family family name
* @param qualifier column qualifier
@@ -202,6 +208,12 @@ public class Append extends Mutation {
 return (Append) super.setDurability(d);
   }
 
+  /**
+   * Method for setting the Append's familyMap
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0.
+   * Use {@link Append#Append(byte[], long, NavigableMap)} instead
+   */
+  @Deprecated
   @Override
   public Append setFamilyCellMap(NavigableMap map) {
 return (Append) super.setFamilyCellMap(map);

http://git-wip-us.apache.org/repos/asf/hbase/blob/59baf12c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
index 2d296fb..57f5648 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
@@ -135,17 +135,23 @@ public class Delete extends Mutation implements 
Comparable {
   }
 
   /**
-   * @param d Delete to clone.
+   * @param deleteToCopy delete to copy
*/
-  public Delete(final Delete d) {
-this.row = d.getRow();
-this.ts = d.getTimeStamp();
-this.familyMap.putAll(d.getFamilyCellMap());
-this.durability = d.durability;
-for (Map.Entry entry : d.getAttributesMap().entrySet()) {
-  this.setAttribute(entry.getKey(), entry.getValue());
-}
-super.setPriority(d.getPriority());
+  public Delete(final Delete deleteToCopy) {
+super(deleteToCopy);
+  }
+
+  /**
+   * Construct the Delete with user defined data. NOTED:
+

hbase git commit: HBASE-19575 add copy constructor to Mutation

2017-12-21 Thread chia7712 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 a28156be9 -> 4aec7a491


HBASE-19575 add copy constructor to Mutation


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

Branch: refs/heads/branch-2
Commit: 4aec7a491a15edac33bcb192f8c347b299b3990c
Parents: a28156b
Author: Chia-Ping Tsai 
Authored: Fri Dec 22 03:13:03 2017 +0800
Committer: Chia-Ping Tsai 
Committed: Fri Dec 22 03:19:47 2017 +0800

--
 .../org/apache/hadoop/hbase/client/Append.java  |  32 ++-
 .../org/apache/hadoop/hbase/client/Delete.java  |  32 ++-
 .../apache/hadoop/hbase/client/Increment.java   |  32 ++-
 .../apache/hadoop/hbase/client/Mutation.java|  45 +++-
 .../hbase/client/OperationWithAttributes.java   |  21 +-
 .../org/apache/hadoop/hbase/client/Put.java |  30 ++-
 .../hadoop/hbase/client/TestMutation.java   | 239 +++
 .../org/apache/hadoop/hbase/client/TestPut.java | 125 --
 .../hbase/regionserver/TestMetricsRegion.java   |   2 +-
 9 files changed, 387 insertions(+), 171 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/4aec7a49/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
index 24e9512..0cb51a2 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Append.java
@@ -112,17 +112,11 @@ public class Append extends Mutation {
   }
   /**
* Copy constructor
-   * @param a
+   * @param appendToCopy append to copy
*/
-  public Append(Append a) {
-this.row = a.getRow();
-this.ts = a.getTimeStamp();
-this.tr = a.getTimeRange();
-this.familyMap.putAll(a.getFamilyCellMap());
-for (Map.Entry entry : a.getAttributesMap().entrySet()) {
-  this.setAttribute(entry.getKey(), entry.getValue());
-}
-this.setPriority(a.getPriority());
+  public Append(Append appendToCopy) {
+super(appendToCopy);
+this.tr = appendToCopy.getTimeRange();
   }
 
   /** Create a Append operation for the specified row.
@@ -138,6 +132,18 @@ public class Append extends Mutation {
   }
 
   /**
+   * Construct the Append with user defined data. NOTED:
+   * 1) all cells in the familyMap must have the DataType.Put
+   * 2) the row of each cell must be same with passed row.
+   * @param row row. CAN'T be null
+   * @param ts timestamp
+   * @param familyMap the map to collect all cells internally. CAN'T be null
+   */
+  public Append(byte[] row, long ts, NavigableMap> 
familyMap) {
+super(row, ts, familyMap);
+  }
+
+  /**
* Add the specified column and value to this Append operation.
* @param family family name
* @param qualifier column qualifier
@@ -202,6 +208,12 @@ public class Append extends Mutation {
 return (Append) super.setDurability(d);
   }
 
+  /**
+   * Method for setting the Append's familyMap
+   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0.
+   * Use {@link Append#Append(byte[], long, NavigableMap)} instead
+   */
+  @Deprecated
   @Override
   public Append setFamilyCellMap(NavigableMap map) {
 return (Append) super.setFamilyCellMap(map);

http://git-wip-us.apache.org/repos/asf/hbase/blob/4aec7a49/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
index 2d296fb..57f5648 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
@@ -135,17 +135,23 @@ public class Delete extends Mutation implements 
Comparable {
   }
 
   /**
-   * @param d Delete to clone.
+   * @param deleteToCopy delete to copy
*/
-  public Delete(final Delete d) {
-this.row = d.getRow();
-this.ts = d.getTimeStamp();
-this.familyMap.putAll(d.getFamilyCellMap());
-this.durability = d.durability;
-for (Map.Entry entry : d.getAttributesMap().entrySet()) {
-  this.setAttribute(entry.getKey(), entry.getValue());
-}
-super.setPriority(d.getPriority());
+  public Delete(final Delete deleteToCopy) {
+super(deleteToCopy);
+  }
+
+  /**
+   * Construct the Delete with user defined data.