This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new aa9679d HBASE-22718 Removal of org.apache.hadoop.hbase.util.Counter
(#396)
aa9679d is described below
commit aa9679ddbc1f3c38ac2f1afd7c04ec4abb4a5f13
Author: Viraj Jasani <[email protected]>
AuthorDate: Mon Jul 22 17:26:08 2019 +0530
HBASE-22718 Removal of org.apache.hadoop.hbase.util.Counter (#396)
Signed-off-by: Sean Busbey <[email protected]>
Signed-off-by: Duo Zhang <[email protected]>
---
.../java/org/apache/hadoop/hbase/util/Counter.java | 194 ---------------------
.../org/apache/hadoop/hbase/util/TestCounter.java | 108 ------------
2 files changed, 302 deletions(-)
diff --git
a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Counter.java
b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Counter.java
deleted file mode 100644
index 2d97405..0000000
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Counter.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.util;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.apache.yetus.audience.InterfaceAudience;
-
-/**
- * High scalable counter. Thread safe.
- * @deprecated since 2.0.0 and will be removed in 3.0.0. Use
- * {@link java.util.concurrent.atomic.LongAdder} instead.
- * @see java.util.concurrent.atomic.LongAdder
- * @see <a
href="https://issues.apache.org/jira/browse/HBASE-7612";>HBASE-7612</a>
- */
[email protected]
-@Deprecated
-public class Counter {
- private static final int MAX_CELLS_LENGTH = 1 << 20;
-
- private static class Cell {
- // Pads are added around the value to avoid cache-line contention with
- // another cell's value. The cache-line size is expected to be equal to or
- // less than about 128 Bytes (= 64 Bits * 16).
-
- @SuppressWarnings("unused")
- volatile long p0, p1, p2, p3, p4, p5, p6;
- volatile long value;
- @SuppressWarnings("unused")
- volatile long q0, q1, q2, q3, q4, q5, q6;
-
- static final AtomicLongFieldUpdater<Cell> valueUpdater =
- AtomicLongFieldUpdater.newUpdater(Cell.class, "value");
-
- Cell() {}
-
- Cell(long initValue) {
- value = initValue;
- }
-
- long get() {
- return value;
- }
-
- boolean add(long delta) {
- long current = value;
- return valueUpdater.compareAndSet(this, current, current + delta);
- }
- }
-
- private static class Container {
- /** The length should be a power of 2. */
- final Cell[] cells;
-
- /** True if a new extended container is going to replace this. */
- final AtomicBoolean demoted = new AtomicBoolean();
-
- Container(Cell cell) {
- this(new Cell[] { cell });
- }
-
- /**
- * @param cells the length should be a power of 2
- */
- Container(Cell[] cells) {
- this.cells = cells;
- }
- }
-
- private final AtomicReference<Container> containerRef;
-
- public Counter() {
- this(new Cell());
- }
-
- public Counter(long initValue) {
- this(new Cell(initValue));
- }
-
- private Counter(Cell initCell) {
- containerRef = new AtomicReference<>(new Container(initCell));
- }
-
- private static int hash() {
- // The logic is borrowed from high-scale-lib's ConcurrentAutoTable.
-
- int h = System.identityHashCode(Thread.currentThread());
- // You would think that System.identityHashCode on the current thread
- // would be a good hash fcn, but actually on SunOS 5.8 it is pretty lousy
- // in the low bits.
-
- h ^= (h >>> 20) ^ (h >>> 12); // Bit spreader, borrowed from Doug Lea
- h ^= (h >>> 7) ^ (h >>> 4);
- return h;
- }
-
- public void add(long delta) {
- Container container = containerRef.get();
- Cell[] cells = container.cells;
- int mask = cells.length - 1;
-
- int baseIndex = hash();
- if(cells[baseIndex & mask].add(delta)) {
- return;
- }
-
- int index = baseIndex + 1;
- while(true) {
- if(cells[index & mask].add(delta)) {
- break;
- }
- index++;
- }
-
- if(index - baseIndex >= cells.length &&
- cells.length < MAX_CELLS_LENGTH &&
- container.demoted.compareAndSet(false, true)) {
-
- if(containerRef.get() == container) {
- Cell[] newCells = new Cell[cells.length * 2];
- System.arraycopy(cells, 0, newCells, 0, cells.length);
- for(int i = cells.length; i < newCells.length; i++) {
- newCells[i] = new Cell();
- // Fill all of the elements with instances. Creating a cell on demand
- // and putting it into the array makes a concurrent problem about
- // visibility or, in other words, happens-before relation, because
- // each element of the array is not volatile so that you should
- // establish the relation by some piggybacking.
- }
- containerRef.compareAndSet(container, new Container(newCells));
- }
- }
- }
-
- public void increment() {
- add(1);
- }
-
- public void decrement() {
- add(-1);
- }
-
- public void set(long value) {
- containerRef.set(new Container(new Cell(value)));
- }
-
- public long get() {
- long sum = 0;
- for(Cell cell : containerRef.get().cells) {
- sum += cell.get();
- }
- return sum;
- }
-
- @Override
- public String toString() {
- Cell[] cells = containerRef.get().cells;
-
- long min = Long.MAX_VALUE;
- long max = Long.MIN_VALUE;
- long sum = 0;
-
- for(Cell cell : cells) {
- long value = cell.get();
- sum += value;
- if(min > value) { min = value; }
- if(max < value) { max = value; }
- }
-
- return new StringBuilder(100)
- .append("[value=").append(sum)
- .append(", cells=[length=").append(cells.length)
- .append(", min=").append(min)
- .append(", max=").append(max)
- .append("]]").toString();
- }
-}
diff --git
a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCounter.java
b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCounter.java
deleted file mode 100644
index 1b8bcc0..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCounter.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * 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
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.util;
-
-import java.util.concurrent.CountDownLatch;
-import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.testclassification.MediumTests;
-import org.apache.hadoop.hbase.testclassification.MiscTests;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-@Category({MiscTests.class, MediumTests.class})
-public class TestCounter {
-
- @ClassRule
- public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestCounter.class);
-
- private static final int[] THREAD_COUNTS = {1, 10, 100};
- private static final int DATA_COUNT = 1000000;
-
- private interface Operation {
- void execute();
- }
-
- @Test
- public void testIncrement() throws Exception {
- for(int threadCount : THREAD_COUNTS) {
- final Counter counter = new Counter();
-
- execute(new Operation() {
- @Override
- public void execute() {
- counter.increment();
- }
- }, threadCount);
-
- Assert.assertEquals(threadCount * (long)DATA_COUNT, counter.get());
- }
- }
-
- @Test
- public void testIncrementAndGet() throws Exception {
- for(int threadCount: THREAD_COUNTS) {
- final Counter counter = new Counter();
-
- execute(new Operation() {
- @Override
- public void execute() {
- counter.increment();
- counter.get();
- }
- }, threadCount);
-
- Assert.assertEquals(threadCount * (long)DATA_COUNT, counter.get());
- }
- }
-
- private static void execute(final Operation op, int threadCount)
- throws InterruptedException {
-
- final CountDownLatch prepareLatch = new CountDownLatch(threadCount);
- final CountDownLatch startLatch = new CountDownLatch(1);
- final CountDownLatch endLatch = new CountDownLatch(threadCount);
-
- class OperationThread extends Thread {
- @Override
- public void run() {
- try {
- prepareLatch.countDown();
- startLatch.await();
-
- for(int i=0; i<DATA_COUNT; i++) {
- op.execute();
- }
-
- endLatch.countDown();
-
- } catch(Exception e) {}
- }
- }
-
- for(int j=0; j<threadCount; j++) {
- new OperationThread().start();
- }
-
- prepareLatch.await();
- startLatch.countDown();
- endLatch.await();
- }
-}
