[04/50] [abbrv] hbase git commit: Revert "HBASE-19835 Use explicit casting to avoid side effects"

2018-02-26 Thread zhangduo 
Revert "HBASE-19835 Use explicit casting to avoid side effects"

This reverts commit bc080e75000aa16ee05d42033ec5e4d984985205.

 Conflicts:

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java

patch reverted changes that happened in parallel without explanation. see jira.


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

Branch: refs/heads/HBASE-19397-branch-2
Commit: a66fa85a1650808658db9556dbdf1fac5745c9b2
Parents: d6d1e49
Author: Sean Busbey 
Authored: Fri Feb 23 19:46:12 2018 -0600
Committer: Sean Busbey 
Committed: Fri Feb 23 23:04:34 2018 -0600

--
 .../org/apache/hadoop/hbase/client/Append.java  |  2 +-
 .../apache/hadoop/hbase/client/Mutation.java|  6 +-
 .../hadoop/hbase/IndividualBytesFieldCell.java  |  2 +-
 .../apache/hadoop/hbase/PrivateCellUtil.java|  4 +-
 .../hbase/regionserver/CompactionPipeline.java  |  2 +-
 .../hadoop/hbase/regionserver/HRegion.java  |  4 +-
 .../hadoop/hbase/regionserver/HStore.java   | 94 +++-
 .../hbase/regionserver/MemStoreCompactor.java   |  2 +-
 .../MultiVersionConcurrencyControl.java |  2 +-
 .../hadoop/hbase/regionserver/ScanInfo.java |  2 +-
 .../hadoop/hbase/regionserver/wal/FSHLog.java   |  2 +-
 .../apache/hadoop/hbase/wal/WALSplitter.java|  2 +-
 12 files changed, 67 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a66fa85a/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 042209c..61474b7 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
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
 @InterfaceAudience.Public
 public class Append extends Mutation {
   private static final Logger LOG = LoggerFactory.getLogger(Append.class);
-  private static final long HEAP_OVERHEAD = (long)ClassSize.REFERENCE + 
ClassSize.TIMERANGE;
+  private static final long HEAP_OVERHEAD = ClassSize.REFERENCE + 
ClassSize.TIMERANGE;
   private TimeRange tr = new TimeRange();
 
   /**

http://git-wip-us.apache.org/repos/asf/hbase/blob/a66fa85a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
index 09000ac..1338fff 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
@@ -66,7 +66,7 @@ public abstract class Mutation extends 
OperationWithAttributes implements Row, C
 HeapSize {
   public static final long MUTATION_OVERHEAD = ClassSize.align(
   // This
-  (long)ClassSize.OBJECT +
+  ClassSize.OBJECT +
   // row + OperationWithAttributes.attributes
   2 * ClassSize.REFERENCE +
   // Timestamp
@@ -791,10 +791,10 @@ public abstract class Mutation extends 
OperationWithAttributes implements Row, C
 
   private static final class CellWrapper implements ExtendedCell {
 private static final long FIXED_OVERHEAD = ClassSize.align(
-  (long)ClassSize.OBJECT  // object header
+  ClassSize.OBJECT  // object header
 + KeyValue.TIMESTAMP_SIZE   // timestamp
 + Bytes.SIZEOF_LONG // sequence id
-+ 1L * ClassSize.REFERENCE); // references to cell
++ 1 * ClassSize.REFERENCE); // references to cell
 private final Cell cell;
 private long sequenceId;
 private long timestamp;

http://git-wip-us.apache.org/repos/asf/hbase/blob/a66fa85a/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
index 6a95a7c..7093b4b 100644
--- 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
+++ 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
@@ -27,7 +27,7

hbase git commit: Revert "HBASE-19835 Use explicit casting to avoid side effects"

2018-02-23 Thread busbey 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 d6d1e49a7 -> a66fa85a1


Revert "HBASE-19835 Use explicit casting to avoid side effects"

This reverts commit bc080e75000aa16ee05d42033ec5e4d984985205.

 Conflicts:

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java

patch reverted changes that happened in parallel without explanation. see jira.


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

Branch: refs/heads/branch-2
Commit: a66fa85a1650808658db9556dbdf1fac5745c9b2
Parents: d6d1e49
Author: Sean Busbey 
Authored: Fri Feb 23 19:46:12 2018 -0600
Committer: Sean Busbey 
Committed: Fri Feb 23 23:04:34 2018 -0600

--
 .../org/apache/hadoop/hbase/client/Append.java  |  2 +-
 .../apache/hadoop/hbase/client/Mutation.java|  6 +-
 .../hadoop/hbase/IndividualBytesFieldCell.java  |  2 +-
 .../apache/hadoop/hbase/PrivateCellUtil.java|  4 +-
 .../hbase/regionserver/CompactionPipeline.java  |  2 +-
 .../hadoop/hbase/regionserver/HRegion.java  |  4 +-
 .../hadoop/hbase/regionserver/HStore.java   | 94 +++-
 .../hbase/regionserver/MemStoreCompactor.java   |  2 +-
 .../MultiVersionConcurrencyControl.java |  2 +-
 .../hadoop/hbase/regionserver/ScanInfo.java |  2 +-
 .../hadoop/hbase/regionserver/wal/FSHLog.java   |  2 +-
 .../apache/hadoop/hbase/wal/WALSplitter.java|  2 +-
 12 files changed, 67 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a66fa85a/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 042209c..61474b7 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
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
 @InterfaceAudience.Public
 public class Append extends Mutation {
   private static final Logger LOG = LoggerFactory.getLogger(Append.class);
-  private static final long HEAP_OVERHEAD = (long)ClassSize.REFERENCE + 
ClassSize.TIMERANGE;
+  private static final long HEAP_OVERHEAD = ClassSize.REFERENCE + 
ClassSize.TIMERANGE;
   private TimeRange tr = new TimeRange();
 
   /**

http://git-wip-us.apache.org/repos/asf/hbase/blob/a66fa85a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
index 09000ac..1338fff 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
@@ -66,7 +66,7 @@ public abstract class Mutation extends 
OperationWithAttributes implements Row, C
 HeapSize {
   public static final long MUTATION_OVERHEAD = ClassSize.align(
   // This
-  (long)ClassSize.OBJECT +
+  ClassSize.OBJECT +
   // row + OperationWithAttributes.attributes
   2 * ClassSize.REFERENCE +
   // Timestamp
@@ -791,10 +791,10 @@ public abstract class Mutation extends 
OperationWithAttributes implements Row, C
 
   private static final class CellWrapper implements ExtendedCell {
 private static final long FIXED_OVERHEAD = ClassSize.align(
-  (long)ClassSize.OBJECT  // object header
+  ClassSize.OBJECT  // object header
 + KeyValue.TIMESTAMP_SIZE   // timestamp
 + Bytes.SIZEOF_LONG // sequence id
-+ 1L * ClassSize.REFERENCE); // references to cell
++ 1 * ClassSize.REFERENCE); // references to cell
 private final Cell cell;
 private long sequenceId;
 private long timestamp;

http://git-wip-us.apache.org/repos/asf/hbase/blob/a66fa85a/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
index 6a95a7c..7093b4b 100644
--- 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
+++

hbase git commit: Revert "HBASE-19835 Use explicit casting to avoid side effects"

2018-02-23 Thread busbey 
Repository: hbase
Updated Branches:
  refs/heads/master ad5cd50df -> 216d2d464


Revert "HBASE-19835 Use explicit casting to avoid side effects"

This reverts commit f1a81618fdd6318df5edded64fbb07e085e10853.

 Conflicts:

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Segment.java

patch reverted changes that happened in parallel without explanation. see jira.


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

Branch: refs/heads/master
Commit: 216d2d464833c683b07c5d9fb0568f31819261a9
Parents: ad5cd50
Author: Sean Busbey 
Authored: Fri Feb 23 16:50:15 2018 -0600
Committer: Sean Busbey 
Committed: Fri Feb 23 16:50:15 2018 -0600

--
 .../org/apache/hadoop/hbase/client/Append.java  |  2 +-
 .../apache/hadoop/hbase/client/Mutation.java|  6 +-
 .../hadoop/hbase/IndividualBytesFieldCell.java  |  2 +-
 .../apache/hadoop/hbase/PrivateCellUtil.java|  4 +-
 .../hbase/regionserver/CompactionPipeline.java  |  2 +-
 .../hadoop/hbase/regionserver/HRegion.java  |  4 +-
 .../hadoop/hbase/regionserver/HStore.java   | 94 +++-
 .../hbase/regionserver/MemStoreCompactor.java   |  2 +-
 .../MultiVersionConcurrencyControl.java |  2 +-
 .../hadoop/hbase/regionserver/ScanInfo.java |  2 +-
 .../hadoop/hbase/regionserver/wal/FSHLog.java   |  2 +-
 .../apache/hadoop/hbase/wal/WALSplitter.java|  2 +-
 12 files changed, 67 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/216d2d46/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 042209c..61474b7 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
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
 @InterfaceAudience.Public
 public class Append extends Mutation {
   private static final Logger LOG = LoggerFactory.getLogger(Append.class);
-  private static final long HEAP_OVERHEAD = (long)ClassSize.REFERENCE + 
ClassSize.TIMERANGE;
+  private static final long HEAP_OVERHEAD = ClassSize.REFERENCE + 
ClassSize.TIMERANGE;
   private TimeRange tr = new TimeRange();
 
   /**

http://git-wip-us.apache.org/repos/asf/hbase/blob/216d2d46/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
index 09000ac..1338fff 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Mutation.java
@@ -66,7 +66,7 @@ public abstract class Mutation extends 
OperationWithAttributes implements Row, C
 HeapSize {
   public static final long MUTATION_OVERHEAD = ClassSize.align(
   // This
-  (long)ClassSize.OBJECT +
+  ClassSize.OBJECT +
   // row + OperationWithAttributes.attributes
   2 * ClassSize.REFERENCE +
   // Timestamp
@@ -791,10 +791,10 @@ public abstract class Mutation extends 
OperationWithAttributes implements Row, C
 
   private static final class CellWrapper implements ExtendedCell {
 private static final long FIXED_OVERHEAD = ClassSize.align(
-  (long)ClassSize.OBJECT  // object header
+  ClassSize.OBJECT  // object header
 + KeyValue.TIMESTAMP_SIZE   // timestamp
 + Bytes.SIZEOF_LONG // sequence id
-+ 1L * ClassSize.REFERENCE); // references to cell
++ 1 * ClassSize.REFERENCE); // references to cell
 private final Cell cell;
 private long sequenceId;
 private long timestamp;

http://git-wip-us.apache.org/repos/asf/hbase/blob/216d2d46/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
index 6a95a7c..7093b4b 100644
--- 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/IndividualBytesFieldCell.java
+++