You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2018/02/11 17:27:07 UTC
[1/3] cassandra git commit: ninja: fix bad #14092 merge from
cassandra-3.0 to cassandra-3.11
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 0a6b6f506 -> fa39b6e27
refs/heads/trunk 6034c268c -> 66b2b3f5f
ninja: fix bad #14092 merge from cassandra-3.0 to cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa39b6e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa39b6e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa39b6e2
Branch: refs/heads/cassandra-3.11
Commit: fa39b6e2775abef6323598461f8fadbcbbe793e5
Parents: 0a6b6f5
Author: Paulo Motta <pa...@apache.org>
Authored: Sun Feb 11 15:17:11 2018 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Sun Feb 11 15:17:11 2018 -0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/StandaloneScrubber.java | 8 +++++++-
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 3 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa39b6e2/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
index ead8fc5..f4a5f9b 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
@@ -43,6 +43,12 @@ import static org.apache.cassandra.tools.BulkLoader.CmdLineOptions;
public class StandaloneScrubber
{
+ public static final String REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION = "Rewrites rows with overflowed expiration date affected by CASSANDRA-14092 with " +
+ "the maximum supported expiration date of 2038-01-19T03:14:06+00:00. " +
+ "The rows are rewritten with the original timestamp incremented by one millisecond " +
+ "to override/supersede any potential tombstone that may have been generated " +
+ "during compaction of the affected rows.";
+
private static final String TOOL_NAME = "sstablescrub";
private static final String VERBOSE_OPTION = "verbose";
private static final String DEBUG_OPTION = "debug";
@@ -269,7 +275,7 @@ public class StandaloneScrubber
options.addOption("m", MANIFEST_CHECK_OPTION, "only check and repair the leveled manifest, without actually scrubbing the sstables");
options.addOption("s", SKIP_CORRUPTED_OPTION, "skip corrupt rows in counter tables");
options.addOption("n", NO_VALIDATE_OPTION, "do not validate columns using column validator");
- options.addOption("r", REINSERT_OVERFLOWED_TTL_OPTION, "Reinsert found rows with overflowed TTL affected by CASSANDRA-14092");
+ options.addOption("r", REINSERT_OVERFLOWED_TTL_OPTION, REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION);
return options;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa39b6e2/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
index 812202d..ead2fd4 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.cassandra.tools.NodeProbe;
import org.apache.cassandra.tools.NodeTool.NodeToolCmd;
+import org.apache.cassandra.tools.StandaloneScrubber;
@Command(name = "scrub", description = "Scrub (rebuild sstables for) one or more tables")
public class Scrub extends NodeToolCmd
@@ -50,7 +51,7 @@ public class Scrub extends NodeToolCmd
@Option(title = "reinsert_overflowed_ttl",
name = {"r", "--reinsert-overflowed-ttl"},
- description = "Reinsert found rows with overflowed TTL affected by CASSANDRA-14092")
+ description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
private boolean reinsertOverflowedTTL = false;
@Option(title = "jobs",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by pa...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66b2b3f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66b2b3f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66b2b3f5
Branch: refs/heads/trunk
Commit: 66b2b3f5f39fa9568f17569b74aec2b48e206efe
Parents: 6034c26 fa39b6e
Author: Paulo Motta <pa...@apache.org>
Authored: Sun Feb 11 15:18:35 2018 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Sun Feb 11 15:18:35 2018 -0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/StandaloneScrubber.java | 8 +++++++-
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 3 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66b2b3f5/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66b2b3f5/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/3] cassandra git commit: ninja: fix bad #14092 merge from
cassandra-3.0 to cassandra-3.11
Posted by pa...@apache.org.
ninja: fix bad #14092 merge from cassandra-3.0 to cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa39b6e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa39b6e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa39b6e2
Branch: refs/heads/trunk
Commit: fa39b6e2775abef6323598461f8fadbcbbe793e5
Parents: 0a6b6f5
Author: Paulo Motta <pa...@apache.org>
Authored: Sun Feb 11 15:17:11 2018 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Sun Feb 11 15:17:11 2018 -0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/StandaloneScrubber.java | 8 +++++++-
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 3 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa39b6e2/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
index ead8fc5..f4a5f9b 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
@@ -43,6 +43,12 @@ import static org.apache.cassandra.tools.BulkLoader.CmdLineOptions;
public class StandaloneScrubber
{
+ public static final String REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION = "Rewrites rows with overflowed expiration date affected by CASSANDRA-14092 with " +
+ "the maximum supported expiration date of 2038-01-19T03:14:06+00:00. " +
+ "The rows are rewritten with the original timestamp incremented by one millisecond " +
+ "to override/supersede any potential tombstone that may have been generated " +
+ "during compaction of the affected rows.";
+
private static final String TOOL_NAME = "sstablescrub";
private static final String VERBOSE_OPTION = "verbose";
private static final String DEBUG_OPTION = "debug";
@@ -269,7 +275,7 @@ public class StandaloneScrubber
options.addOption("m", MANIFEST_CHECK_OPTION, "only check and repair the leveled manifest, without actually scrubbing the sstables");
options.addOption("s", SKIP_CORRUPTED_OPTION, "skip corrupt rows in counter tables");
options.addOption("n", NO_VALIDATE_OPTION, "do not validate columns using column validator");
- options.addOption("r", REINSERT_OVERFLOWED_TTL_OPTION, "Reinsert found rows with overflowed TTL affected by CASSANDRA-14092");
+ options.addOption("r", REINSERT_OVERFLOWED_TTL_OPTION, REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION);
return options;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa39b6e2/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
index 812202d..ead2fd4 100644
--- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.cassandra.tools.NodeProbe;
import org.apache.cassandra.tools.NodeTool.NodeToolCmd;
+import org.apache.cassandra.tools.StandaloneScrubber;
@Command(name = "scrub", description = "Scrub (rebuild sstables for) one or more tables")
public class Scrub extends NodeToolCmd
@@ -50,7 +51,7 @@ public class Scrub extends NodeToolCmd
@Option(title = "reinsert_overflowed_ttl",
name = {"r", "--reinsert-overflowed-ttl"},
- description = "Reinsert found rows with overflowed TTL affected by CASSANDRA-14092")
+ description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
private boolean reinsertOverflowedTTL = false;
@Option(title = "jobs",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org