Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 a324f6da6 -> d081adced
PHOENIX-4485 Fix CsvBulkLoadToolIT for RowTimestamp table upload. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d081adce Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d081adce Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d081adce Branch: refs/heads/5.x-HBase-2.0 Commit: d081adcedeb5970608df2b8f98232f316561477f Parents: a324f6d Author: Ankit Singhal <ankitsingha...@gmail.com> Authored: Fri Dec 22 12:18:05 2017 +0530 Committer: Ankit Singhal <ankitsingha...@gmail.com> Committed: Fri Dec 22 12:18:05 2017 +0530 ---------------------------------------------------------------------- .../org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d081adce/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java index e9891df..945f3ac 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java @@ -191,7 +191,9 @@ public class MultiHfileOutputFormat extends FileOutputFormat<TableRowkeyPair, Ce } // we now have the proper WAL writer. full steam ahead - CellUtil.setTimestamp(cell,this.now); + if (cell.getTimestamp() == HConstants.LATEST_TIMESTAMP) { + CellUtil.setTimestamp(cell, this.now); + } wl.writer.append(kv); wl.written += length;
