Merge branch 'branch-2' of https://git-wip-us.apache.org/repos/asf/hbase into branch-2

This commit is contained in:
anastas 2017-10-01 16:23:57 +03:00
commit 6cf647a0df
1 changed files with 1 additions and 1 deletions

View File

@ -748,7 +748,7 @@ EOF
end end
end end
if kv.isDelete if org.apache.hadoop.hbase.CellUtil.isDelete(kv)
val = "timestamp=#{kv.getTimestamp}, type=#{org.apache.hadoop.hbase.KeyValue::Type.codeToType(kv.getType)}" val = "timestamp=#{kv.getTimestamp}, type=#{org.apache.hadoop.hbase.KeyValue::Type.codeToType(kv.getType)}"
else else
val = "timestamp=#{kv.getTimestamp}, value=#{convert(column, kv, converter_class, converter)}" val = "timestamp=#{kv.getTimestamp}, value=#{convert(column, kv, converter_class, converter)}"