Repository: hbase Updated Branches: refs/heads/branch-1 844596e09 -> 44651e52d
HBASE-18267 The result from the postAppend is ignored Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/44651e52 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/44651e52 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/44651e52 Branch: refs/heads/branch-1 Commit: 44651e52d831328802accd06bd5e93a6f3c15549 Parents: 844596e Author: Chia-Ping Tsai <chia7...@gmail.com> Authored: Tue Jul 11 10:31:21 2017 +0800 Committer: Chia-Ping Tsai <chia7...@gmail.com> Committed: Tue Jul 11 10:31:21 2017 +0800 ---------------------------------------------------------------------- .../hbase/regionserver/RSRpcServices.java | 2 +- .../regionserver/RegionCoprocessorHost.java | 7 +- .../hbase/client/TestResultFromCoprocessor.java | 128 +++++++++++++++++++ 3 files changed, 133 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/44651e52/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java index 68fb1fb..4071fed 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -593,7 +593,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler, } } if (region.getCoprocessorHost() != null) { - region.getCoprocessorHost().postAppend(append, r); + r = region.getCoprocessorHost().postAppend(append, r); } } if (regionServer.metricsRegionServer != null) { http://git-wip-us.apache.org/repos/asf/hbase/blob/44651e52/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java index 3ecd970..96855b8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java @@ -1277,12 +1277,13 @@ public class RegionCoprocessorHost * @param result the result returned by the append * @throws IOException if an error occurred on the coprocessor */ - public void postAppend(final Append append, final Result result) throws IOException { - execOperation(coprocessors.isEmpty() ? null : new RegionOperation() { + public Result postAppend(final Append append, final Result result) throws IOException { + return execOperationWithResult(result, + coprocessors.isEmpty() ? null : new RegionOperationWithResult<Result>() { @Override public void call(RegionObserver oserver, ObserverContext<RegionCoprocessorEnvironment> ctx) throws IOException { - oserver.postAppend(ctx, append, result); + setResult(oserver.postAppend(ctx, append, result)); } }); } http://git-wip-us.apache.org/repos/asf/hbase/blob/44651e52/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResultFromCoprocessor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResultFromCoprocessor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResultFromCoprocessor.java new file mode 100644 index 0000000..79cf297 --- /dev/null +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResultFromCoprocessor.java @@ -0,0 +1,128 @@ +/** + * Copyright The Apache Software Foundation + * + * 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.client; + +import java.io.IOException; +import java.util.Arrays; +import static junit.framework.TestCase.assertTrue; +import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.CoprocessorEnvironment; +import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HColumnDescriptor; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; +import org.apache.hadoop.hbase.coprocessor.ObserverContext; +import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.util.Bytes; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +@Category({MediumTests.class, ClientTests.class}) +public class TestResultFromCoprocessor { + private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); + private static final byte[] ROW = Bytes.toBytes("normal_row"); + private static final byte[] FAMILY = Bytes.toBytes("fm"); + private static final byte[] QUAL = Bytes.toBytes("qual"); + private static final byte[] VALUE = Bytes.toBytes(100L); + private static final byte[] FIXED_VALUE = Bytes.toBytes("fixed_value"); + private static final Cell FIXED_CELL = CellUtil.createCell(ROW, FAMILY, + QUAL, 0, KeyValue.Type.Put.getCode(), FIXED_VALUE); + private static final Result FIXED_RESULT = Result.create(Arrays.asList(FIXED_CELL)); + private static final TableName TABLE_NAME = TableName.valueOf("TestResultFromCoprocessor"); + @BeforeClass + public static void setUpBeforeClass() throws Exception { + TEST_UTIL.startMiniCluster(3); + HTableDescriptor desc = new HTableDescriptor(TABLE_NAME); + desc.addCoprocessor(MyObserver.class.getName()) + .addFamily(new HColumnDescriptor(FAMILY)); + TEST_UTIL.getHBaseAdmin().createTable(desc); + } + + @AfterClass + public static void tearDownAfterClass() throws Exception { + TEST_UTIL.shutdownMiniCluster(); + } + + @Test + public void testAppend() throws IOException { + try (Table t = TEST_UTIL.getConnection().getTable(TABLE_NAME)) { + Put put = new Put(ROW); + put.addColumn(FAMILY, QUAL, VALUE); + t.put(put); + assertRowAndValue(t.get(new Get(ROW)), ROW, VALUE); + Append append = new Append(ROW); + append.add(FAMILY, QUAL, FIXED_VALUE); + assertRowAndValue(t.append(append), ROW, FIXED_VALUE); + assertRowAndValue(t.get(new Get(ROW)), ROW, Bytes.add(VALUE, FIXED_VALUE)); + } + } + + @Test + public void testIncrement() throws IOException { + try (Table t = TEST_UTIL.getConnection().getTable(TABLE_NAME)) { + Put put = new Put(ROW); + put.addColumn(FAMILY, QUAL, VALUE); + t.put(put); + assertRowAndValue(t.get(new Get(ROW)), ROW, VALUE); + Increment inc = new Increment(ROW); + inc.addColumn(FAMILY, QUAL, 99); + assertRowAndValue(t.increment(inc), ROW, FIXED_VALUE); + assertRowAndValue(t.get(new Get(ROW)), ROW, Bytes.toBytes(199L)); + } + } + + private static void assertRowAndValue(Result r, byte[] row, byte[] value) { + for (Cell c : r.rawCells()) { + assertTrue(Bytes.equals(CellUtil.cloneRow(c), row)); + assertTrue(Bytes.equals(CellUtil.cloneValue(c), value)); + } + } + + public static class MyObserver extends BaseRegionObserver { + + @Override + public Result postAppend(final ObserverContext<RegionCoprocessorEnvironment> c, + final Append append, final Result result) { + return FIXED_RESULT; + } + + @Override + public Result postIncrement(final ObserverContext<RegionCoprocessorEnvironment> c, + final Increment increment, final Result result) { + return FIXED_RESULT; + } + + @Override + public void start(CoprocessorEnvironment env) throws IOException { + } + + @Override + public void stop(CoprocessorEnvironment env) throws IOException { + } + } + +}
