From 6a5244912a7a7ef2e1d9f4d10beee0ecc75216b6 Mon Sep 17 00:00:00 2001 From: Zhihong Yu Date: Wed, 23 May 2012 03:18:39 +0000 Subject: [PATCH] HBASE-6047 Put.has() can't determine result correctly (Alex Newman) git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1341737 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/hadoop/hbase/client/Put.java | 32 +++++--- .../hadoop/hbase/client/TestPutDotHas.java | 76 +++++++++++++++++++ 2 files changed, 98 insertions(+), 10 deletions(-) create mode 100644 src/test/java/org/apache/hadoop/hbase/client/TestPutDotHas.java diff --git a/src/main/java/org/apache/hadoop/hbase/client/Put.java b/src/main/java/org/apache/hadoop/hbase/client/Put.java index fcbeb954b4d..e420a6d91f6 100644 --- a/src/main/java/org/apache/hadoop/hbase/client/Put.java +++ b/src/main/java/org/apache/hadoop/hbase/client/Put.java @@ -256,8 +256,8 @@ public class Put extends Mutation * @return returns true if the given family, qualifier timestamp and value * already has an existing KeyValue object in the family map. */ - private boolean has(byte [] family, byte [] qualifier, long ts, byte [] value, - boolean ignoreTS, boolean ignoreValue) { + private boolean has(byte[] family, byte[] qualifier, long ts, byte[] value, + boolean ignoreTS, boolean ignoreValue) { List list = getKeyValueList(family); if (list.size() == 0) { return false; @@ -268,20 +268,32 @@ public class Put extends Mutation // F T => 2 // F F => 1 if (!ignoreTS && !ignoreValue) { - KeyValue kv = createPutKeyValue(family, qualifier, ts, value); - return (list.contains(kv)); - } else if (ignoreValue) { - for (KeyValue kv: list) { + for (KeyValue kv : list) { + if (Arrays.equals(kv.getFamily(), family) && + Arrays.equals(kv.getQualifier(), qualifier) && + Arrays.equals(kv.getValue(), value) && + kv.getTimestamp() == ts) { + return true; + } + } + } else if (ignoreValue && !ignoreTS) { + for (KeyValue kv : list) { if (Arrays.equals(kv.getFamily(), family) && Arrays.equals(kv.getQualifier(), qualifier) && kv.getTimestamp() == ts) { return true; } } + } else if (!ignoreValue && ignoreTS) { + for (KeyValue kv : list) { + if (Arrays.equals(kv.getFamily(), family) && Arrays.equals(kv.getQualifier(), qualifier) + && Arrays.equals(kv.getValue(), value)) { + return true; + } + } } else { - // ignoreTS is always true - for (KeyValue kv: list) { - if (Arrays.equals(kv.getFamily(), family) && Arrays.equals(kv.getQualifier(), qualifier) - && Arrays.equals(kv.getValue(), value)) { + for (KeyValue kv : list) { + if (Arrays.equals(kv.getFamily(), family) && + Arrays.equals(kv.getQualifier(), qualifier)) { return true; } } diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestPutDotHas.java b/src/test/java/org/apache/hadoop/hbase/client/TestPutDotHas.java new file mode 100644 index 00000000000..49cfcdc2cc1 --- /dev/null +++ b/src/test/java/org/apache/hadoop/hbase/client/TestPutDotHas.java @@ -0,0 +1,76 @@ +/* + * 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 org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.util.Bytes; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +@Category(SmallTests.class) +/** + * Addresses HBASE-6047 + * We test put.has call with all of its polymorphic magic + */ +public class TestPutDotHas { + + public static final byte[] ROW_01 = Bytes.toBytes("row-01"); + public static final byte[] QUALIFIER_01 = Bytes.toBytes("qualifier-01"); + public static final byte[] VALUE_01 = Bytes.toBytes("value-01"); + public static final byte[] FAMILY_01 = Bytes.toBytes("family-01"); + public static final long TS = 1234567L; + public Put put = new Put(ROW_01); + + @Before + public void setUp() { + put.add(FAMILY_01, QUALIFIER_01, TS, VALUE_01); + } + + @Test + public void testHasIgnoreValueIgnoreTS() { + Assert.assertTrue(put.has(FAMILY_01, QUALIFIER_01)); + Assert.assertFalse(put.has(QUALIFIER_01, FAMILY_01)); + } + + @Test + public void testHasIgnoreValue() { + Assert.assertTrue(put.has(FAMILY_01, QUALIFIER_01, TS)); + Assert.assertFalse(put.has(FAMILY_01, QUALIFIER_01, TS + 1)); + } + + @Test + public void testHasIgnoreTS() { + Assert.assertTrue(put.has(FAMILY_01, QUALIFIER_01, VALUE_01)); + Assert.assertFalse(put.has(FAMILY_01, VALUE_01, QUALIFIER_01)); + } + + @Test + public void testHas() { + Assert.assertTrue(put.has(FAMILY_01, QUALIFIER_01, TS, VALUE_01)); + // Bad TS + Assert.assertFalse(put.has(FAMILY_01, QUALIFIER_01, TS + 1, VALUE_01)); + // Bad Value + Assert.assertFalse(put.has(FAMILY_01, QUALIFIER_01, TS, QUALIFIER_01)); + // Bad Family + Assert.assertFalse(put.has(QUALIFIER_01, QUALIFIER_01, TS, VALUE_01)); + // Bad Qual + Assert.assertFalse(put.has(FAMILY_01, FAMILY_01, TS, VALUE_01)); + } +}