Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 7a0caf838 -> d29da2524
PHOENIX-4477 Reflect changes in Cell/CellBuilder.DataType (HBASE-19122) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d29da252 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d29da252 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d29da252 Branch: refs/heads/5.x-HBase-2.0 Commit: d29da25244389f7ae59ab590622cc78ca780624d Parents: 7a0caf8 Author: Sergey Soldatov <[email protected]> Authored: Tue Dec 19 18:16:56 2017 -0800 Committer: Sergey Soldatov <[email protected]> Committed: Tue Dec 19 18:18:53 2017 -0800 ---------------------------------------------------------------------- .../coprocessor/DelegateRegionCoprocessorEnvironment.java | 3 ++- .../org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java | 2 +- .../src/main/java/org/apache/phoenix/util/IndexUtil.java | 5 +++++ .../main/java/org/apache/phoenix/util/PhoenixKeyValueUtil.java | 5 ++--- .../java/org/apache/phoenix/execute/UnnestArrayPlanTest.java | 3 ++- .../phoenix/query/EncodedColumnQualifierCellsListTest.java | 5 ++++- 6 files changed, 16 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d29da252/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionCoprocessorEnvironment.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionCoprocessorEnvironment.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionCoprocessorEnvironment.java index 4e6bb2e..7c07068 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionCoprocessorEnvironment.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionCoprocessorEnvironment.java @@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentMap; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.ExtendedCellBuilder; +import org.apache.hadoop.hbase.RawCellBuilder; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.RegionInfo; @@ -122,7 +123,7 @@ public class DelegateRegionCoprocessorEnvironment implements RegionCoprocessorEn } @Override - public ExtendedCellBuilder getCellBuilder() { + public RawCellBuilder getCellBuilder() { return delegate.getCellBuilder(); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/d29da252/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java index c7151ea..c84c4e4 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java @@ -98,8 +98,8 @@ import java.util.NavigableMap; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.Cell.DataType; import org.apache.hadoop.hbase.CellBuilder; -import org.apache.hadoop.hbase.CellBuilder.DataType; import org.apache.hadoop.hbase.CellBuilderFactory; import org.apache.hadoop.hbase.CellBuilderType; import org.apache.hadoop.hbase.CellComparatorImpl; http://git-wip-us.apache.org/repos/asf/phoenix/blob/d29da252/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java index 9193172..f1e5582 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java @@ -658,6 +658,11 @@ public class IndexUtil { public int getTagsLength() { return cell.getTagsLength(); } + + @Override + public DataType getType() { + return cell.getType(); + } }; itr.set(newCell); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/d29da252/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixKeyValueUtil.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixKeyValueUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixKeyValueUtil.java index ed4104b..d041f55 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixKeyValueUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixKeyValueUtil.java @@ -25,8 +25,7 @@ import java.util.Map; import java.util.Map.Entry; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.CellBuilder; -import org.apache.hadoop.hbase.CellBuilder.DataType; +import org.apache.hadoop.hbase.Cell.DataType; import org.apache.hadoop.hbase.CellBuilderFactory; import org.apache.hadoop.hbase.CellBuilderType; import org.apache.hadoop.hbase.CellUtil; @@ -77,7 +76,7 @@ public class PhoenixKeyValueUtil { public static Cell newKeyValue(byte[] key, int keyOffset, int keyLength, byte[] cf, int cfOffset, int cfLength, byte[] cq, int cqOffset, int cqLength, long ts, byte[] value, - int valueOffset, int valueLength,CellBuilder.DataType type) { + int valueOffset, int valueLength,DataType type) { return CellBuilderFactory.create(CellBuilderType.DEEP_COPY) .setRow(key, keyOffset, keyLength).setFamily(cf, cfOffset, cfLength) .setQualifier(cq, cqOffset, cqLength).setTimestamp(ts) http://git-wip-us.apache.org/repos/asf/phoenix/blob/d29da252/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java b/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java index f2d9c03..1b521e1 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java @@ -31,6 +31,7 @@ import java.sql.SQLException; import java.util.Arrays; import java.util.List; +import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellBuilder; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; @@ -160,7 +161,7 @@ public class UnnestArrayPlanTest { for (Object[] array : arrays) { PhoenixArray pArray = new PhoenixArray(baseType, array); byte[] bytes = arrayType.toBytes(pArray); - tuples.add(new SingleKeyValueTuple(PhoenixKeyValueUtil.newKeyValue(bytes, 0, bytes.length, bytes, 0, 0, bytes, 0, 0, 0, bytes, 0, 0,CellBuilder.DataType.Put))); + tuples.add(new SingleKeyValueTuple(PhoenixKeyValueUtil.newKeyValue(bytes, 0, bytes.length, bytes, 0, 0, bytes, 0, 0, 0, bytes, 0, 0, Cell.DataType.Put))); } return tuples; http://git-wip-us.apache.org/repos/asf/phoenix/blob/d29da252/phoenix-core/src/test/java/org/apache/phoenix/query/EncodedColumnQualifierCellsListTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/EncodedColumnQualifierCellsListTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/EncodedColumnQualifierCellsListTest.java index b9aabfa..51dd3b9 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/EncodedColumnQualifierCellsListTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/EncodedColumnQualifierCellsListTest.java @@ -578,6 +578,9 @@ public class EncodedColumnQualifierCellsListTest { return delegate.getTagsLength(); } + @Override + public DataType getType() { + return delegate.getType(); + } } - }
