Updated Branches: refs/heads/cassandra-1.2 cc0c9f35b -> bdcf2cf44
Pick the correct value validator in sstable2json for CQL3 patch by slebresne; reviewed by driftx for CASSANDRA-5134 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bdcf2cf4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bdcf2cf4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bdcf2cf4 Branch: refs/heads/cassandra-1.2 Commit: bdcf2cf44af8a76c056d9a5a9e6ebe4643c28ffc Parents: cc0c9f3 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jan 9 13:52:28 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jan 9 13:52:28 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/tools/SSTableExport.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdcf2cf4/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f8609bc..d4c6697 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -25,6 +25,7 @@ * Fix exception when adding collection (CASSANDRA-5117) * Handle states for non-vnode clusters correctly (CASSANDRA-5127) * Refuse unrecognized replication strategy options (CASSANDRA-4795) + * Pick the correct value validator in sstable2json for cql3 tables (CASSANDRA-5134) Merged from 1.1: * Simplify CompressedRandomAccessReader to work around JDK FD bug (CASSANDRA-5088) * Improve handling a changing target throttle rate mid-compaction (CASSANDRA-5087) http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdcf2cf4/src/java/org/apache/cassandra/tools/SSTableExport.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java index fe7d6c0..51cdc72 100644 --- a/src/java/org/apache/cassandra/tools/SSTableExport.java +++ b/src/java/org/apache/cassandra/tools/SSTableExport.java @@ -234,7 +234,7 @@ public class SSTableExport } else { - AbstractType<?> validator = cfMetaData.getValueValidator(name); + AbstractType<?> validator = cfMetaData.getValueValidator(cfMetaData.getColumnDefinitionFromColumnName(name)); serializedColumn.add(validator.getString(value)); } serializedColumn.add(column.timestamp());