You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/07/31 19:11:42 UTC
[1/5] git commit: Fix tracing on the new SEPExecutor patch by jbellis;
reviewed by bes for CASSANDRA-7644
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 63407db7e -> b888f80d6
refs/heads/cassandra-2.1.0 ef099c317 -> d4d624684
refs/heads/trunk 90ade6b45 -> b8a4e4ff7
Fix tracing on the new SEPExecutor
patch by jbellis; reviewed by bes for CASSANDRA-7644
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4d62468
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4d62468
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4d62468
Branch: refs/heads/cassandra-2.1
Commit: d4d62468462ac854c4855d31a363deab6a41692d
Parents: ef099c3
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jul 31 10:21:22 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jul 31 12:11:20 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../concurrent/AbstractTracingAwareExecutorService.java | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d62468/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0ce0eaa..5210e0d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.0-final
+ * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
* Remove shuffle and taketoken (CASSANDRA-7601)
* Clean up Windows batch scripts (CASSANDRA-7619)
* Fix native protocol drop user type notification (CASSANDRA-7571)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d62468/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java b/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
index 95c55d3..8fa3ec9 100644
--- a/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
+++ b/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
@@ -81,12 +81,12 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
protected <T> FutureTask<T> newTaskFor(Runnable runnable, T result)
{
- return newTaskFor(runnable, result, null);
+ return newTaskFor(runnable, result, Tracing.instance.get());
}
protected <T> FutureTask<T> newTaskFor(Runnable runnable, T result, TraceState traceState)
{
- if (traceState != null || isTracing())
+ if (traceState != null)
{
if (runnable instanceof TraceSessionFutureTask)
return (TraceSessionFutureTask<T>) runnable;
@@ -103,7 +103,7 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
{
if (callable instanceof TraceSessionFutureTask)
return (TraceSessionFutureTask<T>) callable;
- return new TraceSessionFutureTask<T>(callable, null);
+ return new TraceSessionFutureTask<T>(callable, Tracing.instance.get());
}
if (callable instanceof FutureTask)
return (FutureTask<T>) callable;
@@ -128,6 +128,7 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
public void run()
{
+ TraceState oldState = Tracing.instance.get();
Tracing.instance.set(state);
try
{
@@ -135,7 +136,7 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
}
finally
{
- Tracing.instance.set(null);
+ Tracing.instance.set(oldState);
}
}
}
@@ -223,5 +224,4 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
{
addTask(newTaskFor(command, null, state));
}
-
}
[3/5] git commit: Fix tracing on the new SEPExecutor patch by jbellis;
reviewed by bes for CASSANDRA-7644
Posted by jb...@apache.org.
Fix tracing on the new SEPExecutor
patch by jbellis; reviewed by bes for CASSANDRA-7644
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4d62468
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4d62468
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4d62468
Branch: refs/heads/trunk
Commit: d4d62468462ac854c4855d31a363deab6a41692d
Parents: ef099c3
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jul 31 10:21:22 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jul 31 12:11:20 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../concurrent/AbstractTracingAwareExecutorService.java | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d62468/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0ce0eaa..5210e0d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.0-final
+ * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
* Remove shuffle and taketoken (CASSANDRA-7601)
* Clean up Windows batch scripts (CASSANDRA-7619)
* Fix native protocol drop user type notification (CASSANDRA-7571)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d62468/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java b/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
index 95c55d3..8fa3ec9 100644
--- a/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
+++ b/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
@@ -81,12 +81,12 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
protected <T> FutureTask<T> newTaskFor(Runnable runnable, T result)
{
- return newTaskFor(runnable, result, null);
+ return newTaskFor(runnable, result, Tracing.instance.get());
}
protected <T> FutureTask<T> newTaskFor(Runnable runnable, T result, TraceState traceState)
{
- if (traceState != null || isTracing())
+ if (traceState != null)
{
if (runnable instanceof TraceSessionFutureTask)
return (TraceSessionFutureTask<T>) runnable;
@@ -103,7 +103,7 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
{
if (callable instanceof TraceSessionFutureTask)
return (TraceSessionFutureTask<T>) callable;
- return new TraceSessionFutureTask<T>(callable, null);
+ return new TraceSessionFutureTask<T>(callable, Tracing.instance.get());
}
if (callable instanceof FutureTask)
return (FutureTask<T>) callable;
@@ -128,6 +128,7 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
public void run()
{
+ TraceState oldState = Tracing.instance.get();
Tracing.instance.set(state);
try
{
@@ -135,7 +136,7 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
}
finally
{
- Tracing.instance.set(null);
+ Tracing.instance.set(oldState);
}
}
}
@@ -223,5 +224,4 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
{
addTask(newTaskFor(command, null, state));
}
-
}
[2/5] git commit: Fix tracing on the new SEPExecutor patch by jbellis;
reviewed by bes for CASSANDRA-7644
Posted by jb...@apache.org.
Fix tracing on the new SEPExecutor
patch by jbellis; reviewed by bes for CASSANDRA-7644
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4d62468
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4d62468
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4d62468
Branch: refs/heads/cassandra-2.1.0
Commit: d4d62468462ac854c4855d31a363deab6a41692d
Parents: ef099c3
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jul 31 10:21:22 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jul 31 12:11:20 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../concurrent/AbstractTracingAwareExecutorService.java | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d62468/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0ce0eaa..5210e0d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.0-final
+ * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
* Remove shuffle and taketoken (CASSANDRA-7601)
* Clean up Windows batch scripts (CASSANDRA-7619)
* Fix native protocol drop user type notification (CASSANDRA-7571)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d62468/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java b/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
index 95c55d3..8fa3ec9 100644
--- a/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
+++ b/src/java/org/apache/cassandra/concurrent/AbstractTracingAwareExecutorService.java
@@ -81,12 +81,12 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
protected <T> FutureTask<T> newTaskFor(Runnable runnable, T result)
{
- return newTaskFor(runnable, result, null);
+ return newTaskFor(runnable, result, Tracing.instance.get());
}
protected <T> FutureTask<T> newTaskFor(Runnable runnable, T result, TraceState traceState)
{
- if (traceState != null || isTracing())
+ if (traceState != null)
{
if (runnable instanceof TraceSessionFutureTask)
return (TraceSessionFutureTask<T>) runnable;
@@ -103,7 +103,7 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
{
if (callable instanceof TraceSessionFutureTask)
return (TraceSessionFutureTask<T>) callable;
- return new TraceSessionFutureTask<T>(callable, null);
+ return new TraceSessionFutureTask<T>(callable, Tracing.instance.get());
}
if (callable instanceof FutureTask)
return (FutureTask<T>) callable;
@@ -128,6 +128,7 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
public void run()
{
+ TraceState oldState = Tracing.instance.get();
Tracing.instance.set(state);
try
{
@@ -135,7 +136,7 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
}
finally
{
- Tracing.instance.set(null);
+ Tracing.instance.set(oldState);
}
}
}
@@ -223,5 +224,4 @@ public abstract class AbstractTracingAwareExecutorService implements TracingAwar
{
addTask(newTaskFor(command, null, state));
}
-
}
[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b888f80d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b888f80d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b888f80d
Branch: refs/heads/cassandra-2.1
Commit: b888f80d679b6bf1059ed9a7227b74ea10f06143
Parents: 63407db d4d6246
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jul 31 12:11:27 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jul 31 12:11:27 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../concurrent/AbstractTracingAwareExecutorService.java | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b888f80d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8aedebe,5210e0d..4a49256
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
+2.1.1
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+
+
2.1.0-final
+ * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
* Remove shuffle and taketoken (CASSANDRA-7601)
* Clean up Windows batch scripts (CASSANDRA-7619)
* Fix native protocol drop user type notification (CASSANDRA-7571)
[5/5] git commit: Merge branch 'cassandra-2.1.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1.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/b8a4e4ff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8a4e4ff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8a4e4ff
Branch: refs/heads/trunk
Commit: b8a4e4ff7b53faa47f3857fe1f926f3d67b9fc85
Parents: 90ade6b d4d6246
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jul 31 12:11:36 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jul 31 12:11:36 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../concurrent/AbstractTracingAwareExecutorService.java | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8a4e4ff/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3d07769,5210e0d..5e80ccc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
+3.0
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+
+
+2.1.1
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add duration mode to cassandra-stress (CASSANDRA-7468)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+
+
2.1.0-final
+ * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
* Remove shuffle and taketoken (CASSANDRA-7601)
* Clean up Windows batch scripts (CASSANDRA-7619)
* Fix native protocol drop user type notification (CASSANDRA-7571)