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/10/03 16:31:25 UTC
[1/4] git commit: Disallow empty column names in cql patch by
dbrosius reviewed by slebresne for cassandra-6136
Updated Branches:
refs/heads/cassandra-2.0 27f4ea2bf -> 31a9a2fd1
refs/heads/trunk ec308e66b -> db8294932
Disallow empty column names in cql
patch by dbrosius reviewed by slebresne for cassandra-6136
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27f4ea2b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27f4ea2b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27f4ea2b
Branch: refs/heads/trunk
Commit: 27f4ea2bfd8831ee147ee1ed7a59be9c3308a558
Parents: b3647d9
Author: Dave Brosius <db...@apache.org>
Authored: Thu Oct 3 10:29:04 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu Oct 3 10:29:04 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/Cql.g | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/27f4ea2b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 994e8c3..e08e5b6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@
* Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
* Delete can potentially be skipped in batch (CASSANDRA-6115)
* Allow alter keyspace on system_traces (CASSANDRA-6016)
+ * Disallow empty column names in cql (CASSANDRA-6136)
Merged from 1.2:
* Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
* Tracing should log write failure rather than raw exceptions (CASSANDRA-6133)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/27f4ea2b/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/Cql.g b/src/java/org/apache/cassandra/cql3/Cql.g
index 17afb00..ed950da 100644
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@ -1096,7 +1096,7 @@ STRING_LITERAL
QUOTED_NAME
@init{ StringBuilder b = new StringBuilder(); }
@after{ setText(b.toString()); }
- : '\"' (c=~('\"') { b.appendCodePoint(c); } | '\"' '\"' { b.appendCodePoint('\"'); })* '\"'
+ : '\"' (c=~('\"') { b.appendCodePoint(c); } | '\"' '\"' { b.appendCodePoint('\"'); })+ '\"'
;
fragment DIGIT
[3/4] git commit: add concurrent sets to progressByHost
(CASSANDRA-6129)
Posted by jb...@apache.org.
add concurrent sets to progressByHost (CASSANDRA-6129)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31a9a2fd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31a9a2fd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31a9a2fd
Branch: refs/heads/cassandra-2.0
Commit: 31a9a2fd1e93e41632b729b43c0894c0e8e0c4e9
Parents: 27f4ea2
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 09:30:50 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 09:30:50 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/BulkLoader.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31a9a2fd/src/java/org/apache/cassandra/tools/BulkLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java
index cd3c7e1..c89bb83 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -24,6 +24,7 @@ import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
+import com.google.common.collect.Sets;
import org.apache.commons.cli.*;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
@@ -115,7 +116,7 @@ public class BulkLoader
Set<ProgressInfo> progresses = progressByHost.get(progressInfo.peer);
if (progresses == null)
{
- progresses = new HashSet<>();
+ progresses = Sets.newSetFromMap(new ConcurrentHashMap<ProgressInfo, Boolean>());
progressByHost.put(progressInfo.peer, progresses);
}
if (progresses.contains(progressInfo))
[2/4] git commit: add concurrent sets to progressByHost
(CASSANDRA-6129)
Posted by jb...@apache.org.
add concurrent sets to progressByHost (CASSANDRA-6129)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31a9a2fd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31a9a2fd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31a9a2fd
Branch: refs/heads/trunk
Commit: 31a9a2fd1e93e41632b729b43c0894c0e8e0c4e9
Parents: 27f4ea2
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 09:30:50 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 09:30:50 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/BulkLoader.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/31a9a2fd/src/java/org/apache/cassandra/tools/BulkLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java
index cd3c7e1..c89bb83 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -24,6 +24,7 @@ import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
+import com.google.common.collect.Sets;
import org.apache.commons.cli.*;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
@@ -115,7 +116,7 @@ public class BulkLoader
Set<ProgressInfo> progresses = progressByHost.get(progressInfo.peer);
if (progresses == null)
{
- progresses = new HashSet<>();
+ progresses = Sets.newSetFromMap(new ConcurrentHashMap<ProgressInfo, Boolean>());
progressByHost.put(progressInfo.peer, progresses);
}
if (progresses.contains(progressInfo))
[4/4] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.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/db829493
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db829493
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db829493
Branch: refs/heads/trunk
Commit: db8294932d0dfaa3cc354794fee61c5531fbb101
Parents: ec308e6 31a9a2f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Oct 3 09:31:16 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Oct 3 09:31:16 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/Cql.g | 2 +-
src/java/org/apache/cassandra/tools/BulkLoader.java | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/db829493/CHANGES.txt
----------------------------------------------------------------------