From c259ec601abbaa2aa4577618b71b920c1ac447b9 Mon Sep 17 00:00:00 2001 From: Zheng Wang <18031031@qq.com> Date: Wed, 20 Feb 2019 00:13:18 +0800 Subject: [PATCH] HBASE-21918 the use cases in doc should use Cell instead of KeyValue --- src/main/asciidoc/_chapters/architecture.adoc | 12 ++++++------ src/main/asciidoc/_chapters/datamodel.adoc | 2 +- src/main/asciidoc/_chapters/mapreduce.adoc | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/asciidoc/_chapters/architecture.adoc b/src/main/asciidoc/_chapters/architecture.adoc index 3ed4fb3ac7..3b54d153c2 100644 --- a/src/main/asciidoc/_chapters/architecture.adoc +++ b/src/main/asciidoc/_chapters/architecture.adoc @@ -452,8 +452,8 @@ scan.setFilter(f); scan.setBatch(10); // set this if there could be many columns returned ResultScanner rs = t.getScanner(scan); for (Result r = rs.next(); r != null; r = rs.next()) { - for (KeyValue kv : r.raw()) { - // each kv represents a column + for (Cell cell : result.listCells()) { + // each cell represents a column } } rs.close(); @@ -482,8 +482,8 @@ scan.setFilter(f); scan.setBatch(10); // set this if there could be many columns returned ResultScanner rs = t.getScanner(scan); for (Result r = rs.next(); r != null; r = rs.next()) { - for (KeyValue kv : r.raw()) { - // each kv represents a column + for (Cell cell : result.listCells()) { + // each cell represents a column } } rs.close(); @@ -518,8 +518,8 @@ scan.setFilter(f); scan.setBatch(10); // set this if there could be many columns returned ResultScanner rs = t.getScanner(scan); for (Result r = rs.next(); r != null; r = rs.next()) { - for (KeyValue kv : r.raw()) { - // each kv represents a column + for (Cell cell : result.listCells()) { + // each cell represents a column } } rs.close(); diff --git a/src/main/asciidoc/_chapters/datamodel.adoc b/src/main/asciidoc/_chapters/datamodel.adoc index ba4961a5a1..7d1aece00b 100644 --- a/src/main/asciidoc/_chapters/datamodel.adoc +++ b/src/main/asciidoc/_chapters/datamodel.adoc @@ -425,7 +425,7 @@ Get get = new Get(Bytes.toBytes("row1")); get.setMaxVersions(3); // will return last 3 versions of row Result r = table.get(get); byte[] b = r.getValue(CF, ATTR); // returns current version of value -List kv = r.getColumn(CF, ATTR); // returns all versions of this column +List cells = r.getColumnCells(CF, ATTR); // returns all versions of this column ---- ==== Put diff --git a/src/main/asciidoc/_chapters/mapreduce.adoc b/src/main/asciidoc/_chapters/mapreduce.adoc index 61cff86993..bba8cc92b9 100644 --- a/src/main/asciidoc/_chapters/mapreduce.adoc +++ b/src/main/asciidoc/_chapters/mapreduce.adoc @@ -417,8 +417,8 @@ public static class MyMapper extends TableMapper { private static Put resultToPut(ImmutableBytesWritable key, Result result) throws IOException { Put put = new Put(key.get()); - for (KeyValue kv : result.raw()) { - put.add(kv); + for (Cell cell : result.listCells()) { + put.add(cell); } return put; } -- 2.20.1.windows.1