You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/12/19 20:19:37 UTC
cassandra git commit: More Tracing OCD
Repository: cassandra
Updated Branches:
refs/heads/trunk c0e3f66d6 -> bf599fb5b
More Tracing OCD
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf599fb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf599fb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf599fb5
Branch: refs/heads/trunk
Commit: bf599fb5b062cbcc652da78b7d699e7a01b949ad
Parents: c0e3f66
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Dec 19 22:19:29 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Dec 19 22:19:29 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/Config.java | 6 ++++--
src/java/org/apache/cassandra/tracing/TraceKeyspace.java | 9 ++-------
2 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf599fb5/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index 8c3021d..52a8073 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -19,8 +19,10 @@ package org.apache.cassandra.config;
import java.io.IOException;
import java.io.StringReader;
+import java.sql.Time;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import com.google.common.collect.Sets;
import org.supercsv.io.CsvListReader;
@@ -215,8 +217,8 @@ public class Config
.surroundingSpacesNeedQuotes(true).build();
// TTL for different types of trace events.
- public Integer tracetype_query_ttl = 60 * 60 * 24;
- public Integer tracetype_repair_ttl = 60 * 60 * 24 * 7;
+ public int tracetype_query_ttl = (int) TimeUnit.DAYS.toSeconds(1);
+ public int tracetype_repair_ttl = (int) TimeUnit.DAYS.toSeconds(7);
public static boolean getOutboundBindAny()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf599fb5/src/java/org/apache/cassandra/tracing/TraceKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tracing/TraceKeyspace.java b/src/java/org/apache/cassandra/tracing/TraceKeyspace.java
index 8c13a81..392eb42 100644
--- a/src/java/org/apache/cassandra/tracing/TraceKeyspace.java
+++ b/src/java/org/apache/cassandra/tracing/TraceKeyspace.java
@@ -18,11 +18,7 @@
package org.apache.cassandra.tracing;
import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
+import java.util.*;
import com.google.common.collect.ImmutableMap;
@@ -70,8 +66,7 @@ public final class TraceKeyspace
private static CFMetaData compile(String name, String description, String schema)
{
return CFMetaData.compile(String.format(schema, name), NAME)
- .comment(description)
- .defaultTimeToLive((int) TimeUnit.DAYS.toSeconds(1));
+ .comment(description);
}
public static KSMetaData definition()