[1/7] git commit: Fix bad default for min/max timestamp in SSTableMetadata
Updated Branches: refs/heads/trunk 381fe751b -> 64cbd0c48 Fix bad default for min/max timestamp in SSTableMetadata patch by slebresne; reviewed by jasobrown for CASSANDRA-5372 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4d26bb4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4d26bb4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4d26bb4 Branch: refs/heads/trunk Commit: b4d26bb4e417ef1d0ac02955eac041489fa5b508 Parents: 0e03790 Author: Sylvain Lebresne Authored: Mon Mar 25 15:25:08 2013 +0100 Committer: Sylvain Lebresne Committed: Mon Mar 25 15:25:08 2013 +0100 -- CHANGES.txt|1 + .../cassandra/io/sstable/SSTableMetadata.java |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4d26bb4/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 010bdc0..0580d15 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,7 @@ * Fix race when initializing ColumnFamilyStore (CASSANDRA-5350) * Add UseTLAB JVM flag (CASSANDRA-5361) * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052) + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372) 1.1.10 http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4d26bb4/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java -- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java index 99ced30..64555a0 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java @@ -62,7 +62,7 @@ public class SSTableMetadata this(defaultRowSizeHistogram(), defaultColumnCountHistogram(), ReplayPosition.NONE, - Long.MIN_VALUE, + Long.MAX_VALUE, Double.MIN_VALUE, null, Collections.emptySet()); @@ -223,7 +223,7 @@ public class SSTableMetadata // make sure we don't omit replaying something that we should. see CASSANDRA-4782 replayPosition = ReplayPosition.NONE; } -long maxTimestamp = desc.containsTimestamp() ? dis.readLong() : Long.MIN_VALUE; +long maxTimestamp = desc.containsTimestamp() ? dis.readLong() : Long.MAX_VALUE; if (!desc.tracksMaxTimestamp) // see javadoc to Descriptor.containsTimestamp maxTimestamp = Long.MAX_VALUE; double compressionRatio = desc.hasCompressionRatio
[6/7] git commit: Fix bad default for min/max timestamp in SSTableMetadata
Fix bad default for min/max timestamp in SSTableMetadata patch by slebresne; reviewed by jasobrown for CASSANDRA-5372 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04397241 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04397241 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04397241 Branch: refs/heads/trunk Commit: 043972417976cd1947d02d3da21437ae73fdac56 Parents: 381fe75 Author: Sylvain Lebresne Authored: Mon Mar 25 15:25:08 2013 +0100 Committer: Sylvain Lebresne Committed: Mon Mar 25 20:12:36 2013 +0100 -- CHANGES.txt|1 + .../cassandra/io/sstable/SSTableMetadata.java |4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04397241/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 4c7fdb4..dfeb19e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -39,6 +39,7 @@ (CASSANDRA-4937) Merged from 1.1: * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052) + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372) 1.2.3 http://git-wip-us.apache.org/repos/asf/cassandra/blob/04397241/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java -- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java index 28a6485..e38e091 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java @@ -410,9 +410,7 @@ public class SSTableMetadata replayPosition = ReplayPosition.NONE; } long minTimestamp = desc.version.tracksMinTimestamp ? dis.readLong() : Long.MIN_VALUE; -if (!desc.version.tracksMinTimestamp) -minTimestamp = Long.MAX_VALUE; -long maxTimestamp = desc.version.containsTimestamp() ? dis.readLong() : Long.MIN_VALUE; +long maxTimestamp = desc.version.containsTimestamp() ? dis.readLong() : Long.MAX_VALUE; if (!desc.version.tracksMaxTimestamp) // see javadoc to Descriptor.containsTimestamp maxTimestamp = Long.MAX_VALUE; int maxLocalDeletionTime = desc.version.tracksMaxLocalDeletionTime ? dis.readInt() : Integer.MAX_VALUE;
[1/2] git commit: Fix bad default for min/max timestamp in SSTableMetadata
Updated Branches: refs/heads/cassandra-1.2 25f5afa67 -> 737ef7710 Fix bad default for min/max timestamp in SSTableMetadata patch by slebresne; reviewed by jasobrown for CASSANDRA-5372 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4d26bb4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4d26bb4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4d26bb4 Branch: refs/heads/cassandra-1.2 Commit: b4d26bb4e417ef1d0ac02955eac041489fa5b508 Parents: 0e03790 Author: Sylvain Lebresne Authored: Mon Mar 25 15:25:08 2013 +0100 Committer: Sylvain Lebresne Committed: Mon Mar 25 15:25:08 2013 +0100 -- CHANGES.txt|1 + .../cassandra/io/sstable/SSTableMetadata.java |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4d26bb4/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 010bdc0..0580d15 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,7 @@ * Fix race when initializing ColumnFamilyStore (CASSANDRA-5350) * Add UseTLAB JVM flag (CASSANDRA-5361) * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052) + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372) 1.1.10 http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4d26bb4/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java -- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java index 99ced30..64555a0 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java @@ -62,7 +62,7 @@ public class SSTableMetadata this(defaultRowSizeHistogram(), defaultColumnCountHistogram(), ReplayPosition.NONE, - Long.MIN_VALUE, + Long.MAX_VALUE, Double.MIN_VALUE, null, Collections.emptySet()); @@ -223,7 +223,7 @@ public class SSTableMetadata // make sure we don't omit replaying something that we should. see CASSANDRA-4782 replayPosition = ReplayPosition.NONE; } -long maxTimestamp = desc.containsTimestamp() ? dis.readLong() : Long.MIN_VALUE; +long maxTimestamp = desc.containsTimestamp() ? dis.readLong() : Long.MAX_VALUE; if (!desc.tracksMaxTimestamp) // see javadoc to Descriptor.containsTimestamp maxTimestamp = Long.MAX_VALUE; double compressionRatio = desc.hasCompressionRatio
git commit: Fix bad default for min/max timestamp in SSTableMetadata
Updated Branches: refs/heads/cassandra-1.1 0e0379005 -> b4d26bb4e Fix bad default for min/max timestamp in SSTableMetadata patch by slebresne; reviewed by jasobrown for CASSANDRA-5372 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4d26bb4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4d26bb4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4d26bb4 Branch: refs/heads/cassandra-1.1 Commit: b4d26bb4e417ef1d0ac02955eac041489fa5b508 Parents: 0e03790 Author: Sylvain Lebresne Authored: Mon Mar 25 15:25:08 2013 +0100 Committer: Sylvain Lebresne Committed: Mon Mar 25 15:25:08 2013 +0100 -- CHANGES.txt|1 + .../cassandra/io/sstable/SSTableMetadata.java |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4d26bb4/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 010bdc0..0580d15 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,7 @@ * Fix race when initializing ColumnFamilyStore (CASSANDRA-5350) * Add UseTLAB JVM flag (CASSANDRA-5361) * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052) + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372) 1.1.10 http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4d26bb4/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java -- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java index 99ced30..64555a0 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java @@ -62,7 +62,7 @@ public class SSTableMetadata this(defaultRowSizeHistogram(), defaultColumnCountHistogram(), ReplayPosition.NONE, - Long.MIN_VALUE, + Long.MAX_VALUE, Double.MIN_VALUE, null, Collections.emptySet()); @@ -223,7 +223,7 @@ public class SSTableMetadata // make sure we don't omit replaying something that we should. see CASSANDRA-4782 replayPosition = ReplayPosition.NONE; } -long maxTimestamp = desc.containsTimestamp() ? dis.readLong() : Long.MIN_VALUE; +long maxTimestamp = desc.containsTimestamp() ? dis.readLong() : Long.MAX_VALUE; if (!desc.tracksMaxTimestamp) // see javadoc to Descriptor.containsTimestamp maxTimestamp = Long.MAX_VALUE; double compressionRatio = desc.hasCompressionRatio
