Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/ErrorCollector.java
test/unit/org/apache/cassandra/cql3/ErrorCollectorTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a609c20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a609c20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a609c20
Branch: refs/heads/trunk
Commit: 3a609c20c947910116ec1447e2dd1227b616b2e8
Parents: 66789fe 254d6f7
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Dec 12 12:06:56 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Dec 12 12:06:56 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../org/apache/cassandra/cql3/QueryProcessor.java | 1 +
.../apache/cassandra/cql3/ErrorCollectorTest.java | 17 +++++++++++++++++
3 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a609c20/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 10c9fc8,07d526c..985a3c9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,6 +1,47 @@@
+3.0
+ * Support for user-defined aggregation functions (CASSANDRA-8053)
+ * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
+ * Refactor SelectStatement, return IN results in natural order instead
+ of IN value list order (CASSANDRA-7981)
+ * Support UDTs, tuples, and collections in user-defined
+ functions (CASSANDRA-7563)
+ * Fix aggregate fn results on empty selection, result column name,
+ and cqlsh parsing (CASSANDRA-8229)
+ * Mark sstables as repaired after full repair (CASSANDRA-7586)
+ * Extend Descriptor to include a format value and refactor reader/writer
apis (CASSANDRA-7443)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup
(CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740,
7781, 7929,
+ 7924, 7812, 8063, 7813)
+ * 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)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+ * Improve concurrency of repair (CASSANDRA-6455, 8208)
+
+
2.1.3
+ * Fix ArrayIndexOutOfBoundsException when generating error message
+ for some CQL syntax errors (CASSANDRA-8455)
* Scale memtable slab allocation logarithmically (CASSANDRA-7882)
* cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964)
* Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a609c20/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a609c20/test/unit/org/apache/cassandra/cql3/ErrorCollectorTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/ErrorCollectorTest.java
index 4ecf460,fca93df..899aeec
--- a/test/unit/org/apache/cassandra/cql3/ErrorCollectorTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ErrorCollectorTest.java
@@@ -107,30 -107,23 +107,47 @@@ public class ErrorCollectorTes
assertEquals(expected, builder.toString());
}
+ /**
+ * With ANTLR 3.5.2 it appears that some tokens can contains unexpected
values: a line = 0
+ * and a charPositionInLine = -1.
+ */
+ @Test
+ public void testAppendSnippetWithInvalidToken()
+ {
+ String query = "select * fom users";
+
+ ErrorCollector collector = new ErrorCollector(query);
+
+ StringBuilder builder = new StringBuilder();
+
+ Token from = new MockToken(1, 5, "select");
+ Token to = new MockToken(0, -1, "");
+ Token offending = new MockToken(0, -1, "");
+
+ collector.appendSnippet(builder, from, to, offending);
+
+ String expected = "";
+
+ assertEquals(expected, builder.toString());
+ }
+
+ @Test
+ public void testAppendSnippetWithInvalidToToken()
+ {
+ String query = "CREATE TABLE test (a int PRIMARY KEY, b set<int>;";
+
+ ErrorCollector collector = new ErrorCollector(query);
+
+ StringBuilder builder = new StringBuilder();
+
+ Token from = new MockToken(1, 32, " ");
+ Token to = new MockToken(0, -1, "<no text>");
+ Token offending = new MockToken(1, 48, ";");
+
+ collector.appendSnippet(builder, from, to, offending);
+ assertEquals("", builder.toString());
+ }
+
private final static class MockToken implements Token
{
/**
