Updated Branches: refs/heads/trunk 1a362131a -> 489049824
Merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/48904982 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48904982 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48904982 Branch: refs/heads/trunk Commit: 4890498243ed007459021efde9a7d7a77957a782 Parents: 1a36213 c3690da Author: Brandon Williams <[email protected]> Authored: Mon Mar 19 13:52:08 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Mar 19 13:52:08 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/hadoop/BulkOutputFormat.java | 2 +- .../apache/cassandra/hadoop/BulkRecordWriter.java | 35 ++++++++-- .../cassandra/hadoop/ColumnFamilyOutputFormat.java | 2 +- .../cassandra/hadoop/ColumnFamilyRecordWriter.java | 9 +++ .../org/apache/cassandra/hadoop/Progressable.java | 50 +++++++++++++++ 5 files changed, 89 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/48904982/src/java/org/apache/cassandra/hadoop/BulkOutputFormat.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/48904982/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java index b87b7af,69be255..31765f4 --- a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java +++ b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java @@@ -159,13 -173,14 +170,14 @@@ implements org.apache.hadoop.mapred.Rec if (colType == ColType.COUNTER) writer.addCounterColumn(mut.getColumn_or_supercolumn().counter_column.name, mut.getColumn_or_supercolumn().counter_column.value); else - { + { if(mut.getColumn_or_supercolumn().column.ttl == 0) - writer.addColumn(mut.getColumn_or_supercolumn().column.name, mut.getColumn_or_supercolumn().column.value, mut.getColumn_or_supercolumn().column.timestamp); + writer.addColumn(mut.getColumn_or_supercolumn().column.name, mut.getColumn_or_supercolumn().column.value, mut.getColumn_or_supercolumn().column.timestamp); else writer.addExpiringColumn(mut.getColumn_or_supercolumn().column.name, mut.getColumn_or_supercolumn().column.value, mut.getColumn_or_supercolumn().column.timestamp, mut.getColumn_or_supercolumn().column.ttl, System.currentTimeMillis() + ((long)(mut.getColumn_or_supercolumn().column.ttl) * 1000)); - } + } } + progress.progress(); } } @Override http://git-wip-us.apache.org/repos/asf/cassandra/blob/48904982/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/48904982/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java ----------------------------------------------------------------------
