You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/02/09 07:20:40 UTC
[01/14] cassandra git commit: Make it clear what timestamp_resolution
is used for
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 6fe70c652 -> 725b9b1f7
refs/heads/cassandra-2.2 029b22e84 -> c08aaf69b
refs/heads/cassandra-3.0 0d30540f6 -> a598ebeef
refs/heads/trunk c227b928a -> 9adc6d820
Make it clear what timestamp_resolution is used for
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-11041
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8408f06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8408f06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8408f06
Branch: refs/heads/cassandra-2.1
Commit: b8408f068bf2fc73f632d09239ba892a9835416f
Parents: 6fe70c6
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Jan 20 08:58:05 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:08:22 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
doc/cql3/CQL.textile | 2 +-
pylib/cqlshlib/cql3handling.py | 1 -
.../db/compaction/DateTieredCompactionStrategyOptions.java | 6 ++++++
4 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 806e6d5..e5d6ff1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 3b69fcc..812a75e 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -347,7 +347,7 @@ The @compaction@ property must at least define the @'class'@ sub-option, that de
| @bucket_low@ | SizeTieredCompactionStrategy | 0.5 | Size tiered consider sstables to be within the same bucket if their size is within [average_size * @bucket_low@, average_size * @bucket_high@ ] (i.e the default groups sstable whose sizes diverges by at most 50%)|
| @bucket_high@ | SizeTieredCompactionStrategy | 1.5 | Size tiered consider sstables to be within the same bucket if their size is within [average_size * @bucket_low@, average_size * @bucket_high@ ] (i.e the default groups sstable whose sizes diverges by at most 50%).|
| @sstable_size_in_mb@ | LeveledCompactionStrategy | 5MB | The target size (in MB) for sstables in the leveled strategy. Note that while sstable sizes should stay less or equal to @sstable_size_in_mb@, it is possible to exceptionally have a larger sstable as during compaction, data for a given partition key are never split into 2 sstables|
-| @timestamp_resolution@ | DateTieredCompactionStrategy | MICROSECONDS | The timestamp resolution used when inserting data, could be MILLISECONDS, MICROSECONDS etc (should be understandable by Java TimeUnit)|
+| @timestamp_resolution@ | DateTieredCompactionStrategy | MICROSECONDS | The timestamp resolution used when inserting data, could be MILLISECONDS, MICROSECONDS etc (should be understandable by Java TimeUnit) - don't change this unless you do mutations with USING TIMESTAMP <non_microsecond_timestamps> (or equivalent directly in the client)|
| @base_time_seconds@ | DateTieredCompactionStrategy | 60 | The base size of the time windows. |
| @max_sstable_age_days@ | DateTieredCompactionStrategy | 365 | SSTables only containing data that is older than this will never be compacted. |
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 38f118f..029e0c7 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -470,7 +470,6 @@ def cf_prop_val_mapkey_completer(ctxt, cass):
elif csc == 'DateTieredCompactionStrategy':
opts.add('base_time_seconds')
opts.add('max_sstable_age_days')
- opts.add('timestamp_resolution')
opts.add('min_threshold')
opts.add('max_window_size_seconds')
return map(escape_value, opts)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
index 5803115..78a0cab 100644
--- a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
+++ b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
@@ -20,10 +20,14 @@ package org.apache.cassandra.db.compaction;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.exceptions.ConfigurationException;
public final class DateTieredCompactionStrategyOptions
{
+ private static final Logger logger = LoggerFactory.getLogger(DateTieredCompactionStrategy.class);
protected static final TimeUnit DEFAULT_TIMESTAMP_RESOLUTION = TimeUnit.MICROSECONDS;
@Deprecated
protected static final double DEFAULT_MAX_SSTABLE_AGE_DAYS = 365*1000;
@@ -48,6 +52,8 @@ public final class DateTieredCompactionStrategyOptions
{
String optionValue = options.get(TIMESTAMP_RESOLUTION_KEY);
TimeUnit timestampResolution = optionValue == null ? DEFAULT_TIMESTAMP_RESOLUTION : TimeUnit.valueOf(optionValue);
+ if (timestampResolution != DEFAULT_TIMESTAMP_RESOLUTION)
+ logger.warn("Using a non-default timestamp_resolution {} - are you really doing inserts with USING TIMESTAMP <non_microsecond_timestamp> (or driver equivalent)?", timestampResolution.toString());
optionValue = options.get(MAX_SSTABLE_AGE_KEY);
double fractionalDays = optionValue == null ? DEFAULT_MAX_SSTABLE_AGE_DAYS : Double.parseDouble(optionValue);
maxSSTableAge = Math.round(fractionalDays * timestampResolution.convert(1, TimeUnit.DAYS));
[10/14] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c08aaf69
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c08aaf69
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c08aaf69
Branch: refs/heads/cassandra-2.2
Commit: c08aaf69b4bb62e2fe50342dfaa329dfd833ee1e
Parents: 029b22e 725b9b1
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 9 07:14:00 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:14:00 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
doc/cql3/CQL.textile | 2 +-
pylib/cqlshlib/cql3handling.py | 1 -
.../db/compaction/DateTieredCompactionStrategyOptions.java | 6 ++++++
4 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c08aaf69/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 770c394,72b3d59..fdd1122
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,11 +1,42 @@@
-2.1.14
- * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
+2.2.6
+ * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010)
+Merged from 2.1:
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
* Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
++ * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
+ * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
-2.1.13
+2.2.5
+ * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
+ * Apply change to compaction throughput in real time (CASSANDRA-10025)
+ * Fix potential NPE on ORDER BY queries with IN (CASSANDRA-10955)
+ * Avoid over-fetching during the page of range queries (CASSANDRA-8521)
+ * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
+ going (CASSANDRA-10979)
+ * Make UUID LSB unique per process (CASSANDRA-7925)
+ * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
+ * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
+ * Fix error streaming section more than 2GB (CASSANDRA-10961)
+ * (cqlsh) Also apply --connect-timeout to control connection
+ timeout (CASSANDRA-10959)
+ * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
+ * Enable GC logging by default (CASSANDRA-10140)
+ * Optimize pending range computation (CASSANDRA-9258)
+ * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
+ * drop/alter user should be case sensitive (CASSANDRA-10817)
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+ * (cqlsh) encode input correctly when saving history
+Merged from 2.1:
- * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
* Fix isJoined return true only after becoming cluster member (CASANDRA-11007)
* Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)
* Avoid NPE when incremental repair fails (CASSANDRA-10909)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c08aaf69/doc/cql3/CQL.textile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c08aaf69/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
[08/14] cassandra git commit: fix CHANGES.txt after 2.1.13 release
Posted by ma...@apache.org.
fix CHANGES.txt after 2.1.13 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/725b9b1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/725b9b1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/725b9b1f
Branch: refs/heads/cassandra-3.0
Commit: 725b9b1f7f16ff8ad8e77ad0f7679d39bc7f05b2
Parents: b8408f0
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 9 07:09:54 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:09:54 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/725b9b1f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e5d6ff1..72b3d59 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,11 @@
2.1.14
* Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
+ * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
+ * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
2.1.13
- * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
- * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
* Fix isJoined return true only after becoming cluster member (CASANDRA-11007)
* Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)
* Avoid NPE when incremental repair fails (CASSANDRA-10909)
[14/14] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9adc6d82
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9adc6d82
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9adc6d82
Branch: refs/heads/trunk
Commit: 9adc6d82097e30bc25f218a65ed71f36d3cf0dab
Parents: c227b92 a598ebe
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 9 07:16:00 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:16:00 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
doc/cql3/CQL.textile | 2 +-
pylib/cqlshlib/cql3handling.py | 1 -
.../db/compaction/DateTieredCompactionStrategyOptions.java | 6 ++++++
4 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9adc6d82/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 86996d9,4074c66..f2e37a5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -24,13 -8,10 +24,14 @@@ Merged from 2.2.6
Merged from 2.1:
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
* Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
+ * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
-3.0.3
+3.3
+ * Avoid infinite loop if owned range is smaller than number of
+ data dirs (CASSANDRA-11034)
+ * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
+Merged from 3.0:
* Remove double initialization of newly added tables (CASSANDRA-11027)
* Filter keys searcher results by target range (CASSANDRA-11104)
* Fix deserialization of legacy read commands (CASSANDRA-11087)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9adc6d82/doc/cql3/CQL.textile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9adc6d82/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
[05/14] cassandra git commit: fix CHANGES.txt after 2.1.13 release
Posted by ma...@apache.org.
fix CHANGES.txt after 2.1.13 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/725b9b1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/725b9b1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/725b9b1f
Branch: refs/heads/trunk
Commit: 725b9b1f7f16ff8ad8e77ad0f7679d39bc7f05b2
Parents: b8408f0
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 9 07:09:54 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:09:54 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/725b9b1f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e5d6ff1..72b3d59 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,11 @@
2.1.14
* Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
+ * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
+ * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
2.1.13
- * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
- * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
* Fix isJoined return true only after becoming cluster member (CASANDRA-11007)
* Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)
* Avoid NPE when incremental repair fails (CASSANDRA-10909)
[02/14] cassandra git commit: Make it clear what timestamp_resolution
is used for
Posted by ma...@apache.org.
Make it clear what timestamp_resolution is used for
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-11041
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8408f06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8408f06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8408f06
Branch: refs/heads/trunk
Commit: b8408f068bf2fc73f632d09239ba892a9835416f
Parents: 6fe70c6
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Jan 20 08:58:05 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:08:22 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
doc/cql3/CQL.textile | 2 +-
pylib/cqlshlib/cql3handling.py | 1 -
.../db/compaction/DateTieredCompactionStrategyOptions.java | 6 ++++++
4 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 806e6d5..e5d6ff1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 3b69fcc..812a75e 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -347,7 +347,7 @@ The @compaction@ property must at least define the @'class'@ sub-option, that de
| @bucket_low@ | SizeTieredCompactionStrategy | 0.5 | Size tiered consider sstables to be within the same bucket if their size is within [average_size * @bucket_low@, average_size * @bucket_high@ ] (i.e the default groups sstable whose sizes diverges by at most 50%)|
| @bucket_high@ | SizeTieredCompactionStrategy | 1.5 | Size tiered consider sstables to be within the same bucket if their size is within [average_size * @bucket_low@, average_size * @bucket_high@ ] (i.e the default groups sstable whose sizes diverges by at most 50%).|
| @sstable_size_in_mb@ | LeveledCompactionStrategy | 5MB | The target size (in MB) for sstables in the leveled strategy. Note that while sstable sizes should stay less or equal to @sstable_size_in_mb@, it is possible to exceptionally have a larger sstable as during compaction, data for a given partition key are never split into 2 sstables|
-| @timestamp_resolution@ | DateTieredCompactionStrategy | MICROSECONDS | The timestamp resolution used when inserting data, could be MILLISECONDS, MICROSECONDS etc (should be understandable by Java TimeUnit)|
+| @timestamp_resolution@ | DateTieredCompactionStrategy | MICROSECONDS | The timestamp resolution used when inserting data, could be MILLISECONDS, MICROSECONDS etc (should be understandable by Java TimeUnit) - don't change this unless you do mutations with USING TIMESTAMP <non_microsecond_timestamps> (or equivalent directly in the client)|
| @base_time_seconds@ | DateTieredCompactionStrategy | 60 | The base size of the time windows. |
| @max_sstable_age_days@ | DateTieredCompactionStrategy | 365 | SSTables only containing data that is older than this will never be compacted. |
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 38f118f..029e0c7 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -470,7 +470,6 @@ def cf_prop_val_mapkey_completer(ctxt, cass):
elif csc == 'DateTieredCompactionStrategy':
opts.add('base_time_seconds')
opts.add('max_sstable_age_days')
- opts.add('timestamp_resolution')
opts.add('min_threshold')
opts.add('max_window_size_seconds')
return map(escape_value, opts)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
index 5803115..78a0cab 100644
--- a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
+++ b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
@@ -20,10 +20,14 @@ package org.apache.cassandra.db.compaction;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.exceptions.ConfigurationException;
public final class DateTieredCompactionStrategyOptions
{
+ private static final Logger logger = LoggerFactory.getLogger(DateTieredCompactionStrategy.class);
protected static final TimeUnit DEFAULT_TIMESTAMP_RESOLUTION = TimeUnit.MICROSECONDS;
@Deprecated
protected static final double DEFAULT_MAX_SSTABLE_AGE_DAYS = 365*1000;
@@ -48,6 +52,8 @@ public final class DateTieredCompactionStrategyOptions
{
String optionValue = options.get(TIMESTAMP_RESOLUTION_KEY);
TimeUnit timestampResolution = optionValue == null ? DEFAULT_TIMESTAMP_RESOLUTION : TimeUnit.valueOf(optionValue);
+ if (timestampResolution != DEFAULT_TIMESTAMP_RESOLUTION)
+ logger.warn("Using a non-default timestamp_resolution {} - are you really doing inserts with USING TIMESTAMP <non_microsecond_timestamp> (or driver equivalent)?", timestampResolution.toString());
optionValue = options.get(MAX_SSTABLE_AGE_KEY);
double fractionalDays = optionValue == null ? DEFAULT_MAX_SSTABLE_AGE_DAYS : Double.parseDouble(optionValue);
maxSSTableAge = Math.round(fractionalDays * timestampResolution.convert(1, TimeUnit.DAYS));
[07/14] cassandra git commit: fix CHANGES.txt after 2.1.13 release
Posted by ma...@apache.org.
fix CHANGES.txt after 2.1.13 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/725b9b1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/725b9b1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/725b9b1f
Branch: refs/heads/cassandra-2.2
Commit: 725b9b1f7f16ff8ad8e77ad0f7679d39bc7f05b2
Parents: b8408f0
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 9 07:09:54 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:09:54 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/725b9b1f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e5d6ff1..72b3d59 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,11 @@
2.1.14
* Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
+ * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
+ * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
2.1.13
- * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
- * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
* Fix isJoined return true only after becoming cluster member (CASANDRA-11007)
* Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)
* Avoid NPE when incremental repair fails (CASSANDRA-10909)
[13/14] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ma...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a598ebee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a598ebee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a598ebee
Branch: refs/heads/trunk
Commit: a598ebeef47e7affa9d59d0bb95abe71447eed5b
Parents: 0d30540 c08aaf6
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 9 07:14:23 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:15:40 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
doc/cql3/CQL.textile | 2 +-
pylib/cqlshlib/cql3handling.py | 1 -
.../db/compaction/DateTieredCompactionStrategyOptions.java | 6 ++++++
4 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a598ebee/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c6111e5,fdd1122..4074c66
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -8,45 -4,10 +8,46 @@@ Merged from 2.2.6
Merged from 2.1:
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
* Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
+ * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
- * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
+3.0.3
+ * Remove double initialization of newly added tables (CASSANDRA-11027)
+ * Filter keys searcher results by target range (CASSANDRA-11104)
+ * Fix deserialization of legacy read commands (CASSANDRA-11087)
+ * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102)
+ * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
+ * Mutations do not block for completion under view lock contention (CASSANDRA-10779)
+ * Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
+ * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
+ (CASSANDRA-11003)
+ * Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762)
+ * Migrate build status for indexes along with legacy schema (CASSANDRA-11046)
+ * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045)
+ * Added support for IBM zSystems architecture (CASSANDRA-11054)
+ * Update CQL documentation (CASSANDRA-10899)
+ * Check the column name, not cell name, for dropped columns when reading
+ legacy sstables (CASSANDRA-11018)
+ * Don't attempt to index clustering values of static rows (CASSANDRA-11021)
+ * Remove checksum files after replaying hints (CASSANDRA-10947)
+ * Support passing base table metadata to custom 2i validation (CASSANDRA-10924)
+ * Ensure stale index entries are purged during reads (CASSANDRA-11013)
+ * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
+ * Fix UnsupportedOperationException when reading old sstable with range
+ tombstone (CASSANDRA-10743)
+ * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
+ * Fix potential assertion error during compaction (CASSANDRA-10944)
+ * Fix counting of received sstables in streaming (CASSANDRA-10949)
+ * Implement hints compression (CASSANDRA-9428)
+ * Fix potential assertion error when reading static columns (CASSANDRA-10903)
+ * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
+ * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
+ * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
+ * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)
+ * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
+ * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837)
+ * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
+Merged from 2.2:
2.2.5
* maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
* Apply change to compaction throughput in real time (CASSANDRA-10025)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a598ebee/doc/cql3/CQL.textile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a598ebee/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
[11/14] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c08aaf69
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c08aaf69
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c08aaf69
Branch: refs/heads/trunk
Commit: c08aaf69b4bb62e2fe50342dfaa329dfd833ee1e
Parents: 029b22e 725b9b1
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 9 07:14:00 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:14:00 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
doc/cql3/CQL.textile | 2 +-
pylib/cqlshlib/cql3handling.py | 1 -
.../db/compaction/DateTieredCompactionStrategyOptions.java | 6 ++++++
4 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c08aaf69/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 770c394,72b3d59..fdd1122
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,11 +1,42 @@@
-2.1.14
- * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
+2.2.6
+ * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010)
+Merged from 2.1:
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
* Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
++ * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
+ * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
-2.1.13
+2.2.5
+ * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
+ * Apply change to compaction throughput in real time (CASSANDRA-10025)
+ * Fix potential NPE on ORDER BY queries with IN (CASSANDRA-10955)
+ * Avoid over-fetching during the page of range queries (CASSANDRA-8521)
+ * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
+ going (CASSANDRA-10979)
+ * Make UUID LSB unique per process (CASSANDRA-7925)
+ * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
+ * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
+ * Fix error streaming section more than 2GB (CASSANDRA-10961)
+ * (cqlsh) Also apply --connect-timeout to control connection
+ timeout (CASSANDRA-10959)
+ * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
+ * Enable GC logging by default (CASSANDRA-10140)
+ * Optimize pending range computation (CASSANDRA-9258)
+ * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
+ * drop/alter user should be case sensitive (CASSANDRA-10817)
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+ * (cqlsh) encode input correctly when saving history
+Merged from 2.1:
- * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
* Fix isJoined return true only after becoming cluster member (CASANDRA-11007)
* Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)
* Avoid NPE when incremental repair fails (CASSANDRA-10909)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c08aaf69/doc/cql3/CQL.textile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c08aaf69/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
[12/14] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ma...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a598ebee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a598ebee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a598ebee
Branch: refs/heads/cassandra-3.0
Commit: a598ebeef47e7affa9d59d0bb95abe71447eed5b
Parents: 0d30540 c08aaf6
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 9 07:14:23 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:15:40 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
doc/cql3/CQL.textile | 2 +-
pylib/cqlshlib/cql3handling.py | 1 -
.../db/compaction/DateTieredCompactionStrategyOptions.java | 6 ++++++
4 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a598ebee/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c6111e5,fdd1122..4074c66
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -8,45 -4,10 +8,46 @@@ Merged from 2.2.6
Merged from 2.1:
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
* Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
+ * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
- * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
+3.0.3
+ * Remove double initialization of newly added tables (CASSANDRA-11027)
+ * Filter keys searcher results by target range (CASSANDRA-11104)
+ * Fix deserialization of legacy read commands (CASSANDRA-11087)
+ * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102)
+ * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
+ * Mutations do not block for completion under view lock contention (CASSANDRA-10779)
+ * Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
+ * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
+ (CASSANDRA-11003)
+ * Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762)
+ * Migrate build status for indexes along with legacy schema (CASSANDRA-11046)
+ * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045)
+ * Added support for IBM zSystems architecture (CASSANDRA-11054)
+ * Update CQL documentation (CASSANDRA-10899)
+ * Check the column name, not cell name, for dropped columns when reading
+ legacy sstables (CASSANDRA-11018)
+ * Don't attempt to index clustering values of static rows (CASSANDRA-11021)
+ * Remove checksum files after replaying hints (CASSANDRA-10947)
+ * Support passing base table metadata to custom 2i validation (CASSANDRA-10924)
+ * Ensure stale index entries are purged during reads (CASSANDRA-11013)
+ * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
+ * Fix UnsupportedOperationException when reading old sstable with range
+ tombstone (CASSANDRA-10743)
+ * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
+ * Fix potential assertion error during compaction (CASSANDRA-10944)
+ * Fix counting of received sstables in streaming (CASSANDRA-10949)
+ * Implement hints compression (CASSANDRA-9428)
+ * Fix potential assertion error when reading static columns (CASSANDRA-10903)
+ * Avoid NoSuchElementException when executing empty batch (CASSANDRA-10711)
+ * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
+ * Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
+ * Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)
+ * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
+ * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837)
+ * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
+Merged from 2.2:
2.2.5
* maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
* Apply change to compaction throughput in real time (CASSANDRA-10025)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a598ebee/doc/cql3/CQL.textile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a598ebee/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
[03/14] cassandra git commit: Make it clear what timestamp_resolution
is used for
Posted by ma...@apache.org.
Make it clear what timestamp_resolution is used for
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-11041
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8408f06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8408f06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8408f06
Branch: refs/heads/cassandra-2.2
Commit: b8408f068bf2fc73f632d09239ba892a9835416f
Parents: 6fe70c6
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Jan 20 08:58:05 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:08:22 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
doc/cql3/CQL.textile | 2 +-
pylib/cqlshlib/cql3handling.py | 1 -
.../db/compaction/DateTieredCompactionStrategyOptions.java | 6 ++++++
4 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 806e6d5..e5d6ff1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 3b69fcc..812a75e 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -347,7 +347,7 @@ The @compaction@ property must at least define the @'class'@ sub-option, that de
| @bucket_low@ | SizeTieredCompactionStrategy | 0.5 | Size tiered consider sstables to be within the same bucket if their size is within [average_size * @bucket_low@, average_size * @bucket_high@ ] (i.e the default groups sstable whose sizes diverges by at most 50%)|
| @bucket_high@ | SizeTieredCompactionStrategy | 1.5 | Size tiered consider sstables to be within the same bucket if their size is within [average_size * @bucket_low@, average_size * @bucket_high@ ] (i.e the default groups sstable whose sizes diverges by at most 50%).|
| @sstable_size_in_mb@ | LeveledCompactionStrategy | 5MB | The target size (in MB) for sstables in the leveled strategy. Note that while sstable sizes should stay less or equal to @sstable_size_in_mb@, it is possible to exceptionally have a larger sstable as during compaction, data for a given partition key are never split into 2 sstables|
-| @timestamp_resolution@ | DateTieredCompactionStrategy | MICROSECONDS | The timestamp resolution used when inserting data, could be MILLISECONDS, MICROSECONDS etc (should be understandable by Java TimeUnit)|
+| @timestamp_resolution@ | DateTieredCompactionStrategy | MICROSECONDS | The timestamp resolution used when inserting data, could be MILLISECONDS, MICROSECONDS etc (should be understandable by Java TimeUnit) - don't change this unless you do mutations with USING TIMESTAMP <non_microsecond_timestamps> (or equivalent directly in the client)|
| @base_time_seconds@ | DateTieredCompactionStrategy | 60 | The base size of the time windows. |
| @max_sstable_age_days@ | DateTieredCompactionStrategy | 365 | SSTables only containing data that is older than this will never be compacted. |
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 38f118f..029e0c7 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -470,7 +470,6 @@ def cf_prop_val_mapkey_completer(ctxt, cass):
elif csc == 'DateTieredCompactionStrategy':
opts.add('base_time_seconds')
opts.add('max_sstable_age_days')
- opts.add('timestamp_resolution')
opts.add('min_threshold')
opts.add('max_window_size_seconds')
return map(escape_value, opts)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
index 5803115..78a0cab 100644
--- a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
+++ b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
@@ -20,10 +20,14 @@ package org.apache.cassandra.db.compaction;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.exceptions.ConfigurationException;
public final class DateTieredCompactionStrategyOptions
{
+ private static final Logger logger = LoggerFactory.getLogger(DateTieredCompactionStrategy.class);
protected static final TimeUnit DEFAULT_TIMESTAMP_RESOLUTION = TimeUnit.MICROSECONDS;
@Deprecated
protected static final double DEFAULT_MAX_SSTABLE_AGE_DAYS = 365*1000;
@@ -48,6 +52,8 @@ public final class DateTieredCompactionStrategyOptions
{
String optionValue = options.get(TIMESTAMP_RESOLUTION_KEY);
TimeUnit timestampResolution = optionValue == null ? DEFAULT_TIMESTAMP_RESOLUTION : TimeUnit.valueOf(optionValue);
+ if (timestampResolution != DEFAULT_TIMESTAMP_RESOLUTION)
+ logger.warn("Using a non-default timestamp_resolution {} - are you really doing inserts with USING TIMESTAMP <non_microsecond_timestamp> (or driver equivalent)?", timestampResolution.toString());
optionValue = options.get(MAX_SSTABLE_AGE_KEY);
double fractionalDays = optionValue == null ? DEFAULT_MAX_SSTABLE_AGE_DAYS : Double.parseDouble(optionValue);
maxSSTableAge = Math.round(fractionalDays * timestampResolution.convert(1, TimeUnit.DAYS));
[06/14] cassandra git commit: fix CHANGES.txt after 2.1.13 release
Posted by ma...@apache.org.
fix CHANGES.txt after 2.1.13 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/725b9b1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/725b9b1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/725b9b1f
Branch: refs/heads/cassandra-2.1
Commit: 725b9b1f7f16ff8ad8e77ad0f7679d39bc7f05b2
Parents: b8408f0
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 9 07:09:54 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:09:54 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/725b9b1f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e5d6ff1..72b3d59 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,11 @@
2.1.14
* Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
+ * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
+ * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
2.1.13
- * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
- * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
* Fix isJoined return true only after becoming cluster member (CASANDRA-11007)
* Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)
* Avoid NPE when incremental repair fails (CASSANDRA-10909)
[09/14] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c08aaf69
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c08aaf69
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c08aaf69
Branch: refs/heads/cassandra-3.0
Commit: c08aaf69b4bb62e2fe50342dfaa329dfd833ee1e
Parents: 029b22e 725b9b1
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Feb 9 07:14:00 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:14:00 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
doc/cql3/CQL.textile | 2 +-
pylib/cqlshlib/cql3handling.py | 1 -
.../db/compaction/DateTieredCompactionStrategyOptions.java | 6 ++++++
4 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c08aaf69/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 770c394,72b3d59..fdd1122
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,11 +1,42 @@@
-2.1.14
- * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
+2.2.6
+ * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010)
+Merged from 2.1:
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
* Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
++ * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
+ * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
-2.1.13
+2.2.5
+ * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
+ * Apply change to compaction throughput in real time (CASSANDRA-10025)
+ * Fix potential NPE on ORDER BY queries with IN (CASSANDRA-10955)
+ * Avoid over-fetching during the page of range queries (CASSANDRA-8521)
+ * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
+ going (CASSANDRA-10979)
+ * Make UUID LSB unique per process (CASSANDRA-7925)
+ * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
+ * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
+ * Fix error streaming section more than 2GB (CASSANDRA-10961)
+ * (cqlsh) Also apply --connect-timeout to control connection
+ timeout (CASSANDRA-10959)
+ * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
+ * Enable GC logging by default (CASSANDRA-10140)
+ * Optimize pending range computation (CASSANDRA-9258)
+ * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
+ * drop/alter user should be case sensitive (CASSANDRA-10817)
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+ * (cqlsh) encode input correctly when saving history
+Merged from 2.1:
- * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
* Fix isJoined return true only after becoming cluster member (CASANDRA-11007)
* Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)
* Avoid NPE when incremental repair fails (CASSANDRA-10909)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c08aaf69/doc/cql3/CQL.textile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c08aaf69/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
[04/14] cassandra git commit: Make it clear what timestamp_resolution
is used for
Posted by ma...@apache.org.
Make it clear what timestamp_resolution is used for
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-11041
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8408f06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8408f06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8408f06
Branch: refs/heads/cassandra-3.0
Commit: b8408f068bf2fc73f632d09239ba892a9835416f
Parents: 6fe70c6
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Jan 20 08:58:05 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue Feb 9 07:08:22 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
doc/cql3/CQL.textile | 2 +-
pylib/cqlshlib/cql3handling.py | 1 -
.../db/compaction/DateTieredCompactionStrategyOptions.java | 6 ++++++
4 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 806e6d5..e5d6ff1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
* Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 3b69fcc..812a75e 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -347,7 +347,7 @@ The @compaction@ property must at least define the @'class'@ sub-option, that de
| @bucket_low@ | SizeTieredCompactionStrategy | 0.5 | Size tiered consider sstables to be within the same bucket if their size is within [average_size * @bucket_low@, average_size * @bucket_high@ ] (i.e the default groups sstable whose sizes diverges by at most 50%)|
| @bucket_high@ | SizeTieredCompactionStrategy | 1.5 | Size tiered consider sstables to be within the same bucket if their size is within [average_size * @bucket_low@, average_size * @bucket_high@ ] (i.e the default groups sstable whose sizes diverges by at most 50%).|
| @sstable_size_in_mb@ | LeveledCompactionStrategy | 5MB | The target size (in MB) for sstables in the leveled strategy. Note that while sstable sizes should stay less or equal to @sstable_size_in_mb@, it is possible to exceptionally have a larger sstable as during compaction, data for a given partition key are never split into 2 sstables|
-| @timestamp_resolution@ | DateTieredCompactionStrategy | MICROSECONDS | The timestamp resolution used when inserting data, could be MILLISECONDS, MICROSECONDS etc (should be understandable by Java TimeUnit)|
+| @timestamp_resolution@ | DateTieredCompactionStrategy | MICROSECONDS | The timestamp resolution used when inserting data, could be MILLISECONDS, MICROSECONDS etc (should be understandable by Java TimeUnit) - don't change this unless you do mutations with USING TIMESTAMP <non_microsecond_timestamps> (or equivalent directly in the client)|
| @base_time_seconds@ | DateTieredCompactionStrategy | 60 | The base size of the time windows. |
| @max_sstable_age_days@ | DateTieredCompactionStrategy | 365 | SSTables only containing data that is older than this will never be compacted. |
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 38f118f..029e0c7 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -470,7 +470,6 @@ def cf_prop_val_mapkey_completer(ctxt, cass):
elif csc == 'DateTieredCompactionStrategy':
opts.add('base_time_seconds')
opts.add('max_sstable_age_days')
- opts.add('timestamp_resolution')
opts.add('min_threshold')
opts.add('max_window_size_seconds')
return map(escape_value, opts)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8408f06/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
index 5803115..78a0cab 100644
--- a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
+++ b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyOptions.java
@@ -20,10 +20,14 @@ package org.apache.cassandra.db.compaction;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.exceptions.ConfigurationException;
public final class DateTieredCompactionStrategyOptions
{
+ private static final Logger logger = LoggerFactory.getLogger(DateTieredCompactionStrategy.class);
protected static final TimeUnit DEFAULT_TIMESTAMP_RESOLUTION = TimeUnit.MICROSECONDS;
@Deprecated
protected static final double DEFAULT_MAX_SSTABLE_AGE_DAYS = 365*1000;
@@ -48,6 +52,8 @@ public final class DateTieredCompactionStrategyOptions
{
String optionValue = options.get(TIMESTAMP_RESOLUTION_KEY);
TimeUnit timestampResolution = optionValue == null ? DEFAULT_TIMESTAMP_RESOLUTION : TimeUnit.valueOf(optionValue);
+ if (timestampResolution != DEFAULT_TIMESTAMP_RESOLUTION)
+ logger.warn("Using a non-default timestamp_resolution {} - are you really doing inserts with USING TIMESTAMP <non_microsecond_timestamp> (or driver equivalent)?", timestampResolution.toString());
optionValue = options.get(MAX_SSTABLE_AGE_KEY);
double fractionalDays = optionValue == null ? DEFAULT_MAX_SSTABLE_AGE_DAYS : Double.parseDouble(optionValue);
maxSSTableAge = Math.round(fractionalDays * timestampResolution.convert(1, TimeUnit.DAYS));