cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject git commit: Don't swap max/min column names when mutating sstable metadata.
Date Mon, 28 Jul 2014 10:49:51 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 6f15fe260 -> ee62ae104


Don't swap max/min column names when mutating sstable metadata.

Patch by marcuse; reviewed by benedict for CASSANDRA-7596.


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee62ae10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee62ae10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee62ae10

Branch: refs/heads/cassandra-2.1.0
Commit: ee62ae104ee2c69d852b488f904b1854aa58aa2a
Parents: 6f15fe2
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Jul 28 12:48:24 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Jul 28 12:48:24 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                      | 1 +
 .../org/apache/cassandra/io/sstable/metadata/StatsMetadata.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee62ae10/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0a1ba51..c6aaef9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@
  * Fix tracing of range slices and secondary index lookups that are local
    to the coordinator (CASSANDRA-7599)
  * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
+ * Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596)
 Merged from 2.0:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee62ae10/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
index 900bd4e..a557b88 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
@@ -124,8 +124,8 @@ public class StatsMetadata extends MetadataComponent
                                  compressionRatio,
                                  estimatedTombstoneDropTime,
                                  newLevel,
-                                 maxColumnNames,
                                  minColumnNames,
+                                 maxColumnNames,
                                  hasLegacyCounterShards,
                                  repairedAt);
     }
@@ -141,8 +141,8 @@ public class StatsMetadata extends MetadataComponent
                                  compressionRatio,
                                  estimatedTombstoneDropTime,
                                  sstableLevel,
-                                 maxColumnNames,
                                  minColumnNames,
+                                 maxColumnNames,
                                  hasLegacyCounterShards,
                                  newRepairedAt);
     }


Mime
View raw message