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 2013/05/23 19:42:14 UTC
[1/3] git commit: unquote uuid in cql string
Updated Branches:
refs/heads/cassandra-1.2 57e6888e6 -> 6abb1d499
refs/heads/trunk 1c8e627a6 -> 342050fcd
unquote uuid in cql string
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6abb1d49
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6abb1d49
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6abb1d49
Branch: refs/heads/cassandra-1.2
Commit: 6abb1d499e850ebc7d3d5ee140a868d743f9f441
Parents: 57e6888
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 23 12:41:58 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 23 12:41:58 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/SystemTable.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6abb1d49/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java
index ecdad94..187aac5 100644
--- a/src/java/org/apache/cassandra/db/SystemTable.java
+++ b/src/java/org/apache/cassandra/db/SystemTable.java
@@ -193,7 +193,7 @@ public class SystemTable
*/
public static void removeTruncationRecord(UUID cfId)
{
- String req = "DELETE truncated_at['%s'] from system.%s WHERE key = '%s'";
+ String req = "DELETE truncated_at[%s] from system.%s WHERE key = '%s'";
processInternal(String.format(req, cfId, LOCAL_CF, LOCAL_KEY));
forceBlockingFlush(LOCAL_CF);
}
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/342050fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/342050fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/342050fc
Branch: refs/heads/trunk
Commit: 342050fcd73d0cd5f8db9c9a17f05c3260114437
Parents: 1c8e627 6abb1d4
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 23 12:42:07 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 23 12:42:07 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/SystemTable.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/342050fc/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------
[2/3] git commit: unquote uuid in cql string
Posted by jb...@apache.org.
unquote uuid in cql string
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6abb1d49
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6abb1d49
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6abb1d49
Branch: refs/heads/trunk
Commit: 6abb1d499e850ebc7d3d5ee140a868d743f9f441
Parents: 57e6888
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu May 23 12:41:58 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu May 23 12:41:58 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/SystemTable.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6abb1d49/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java
index ecdad94..187aac5 100644
--- a/src/java/org/apache/cassandra/db/SystemTable.java
+++ b/src/java/org/apache/cassandra/db/SystemTable.java
@@ -193,7 +193,7 @@ public class SystemTable
*/
public static void removeTruncationRecord(UUID cfId)
{
- String req = "DELETE truncated_at['%s'] from system.%s WHERE key = '%s'";
+ String req = "DELETE truncated_at[%s] from system.%s WHERE key = '%s'";
processInternal(String.format(req, cfId, LOCAL_CF, LOCAL_KEY));
forceBlockingFlush(LOCAL_CF);
}