You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/12/12 19:07:30 UTC
[1/2] cassandra git commit: Fix AIOOBE when building syntax error
message
Repository: cassandra
Updated Branches:
refs/heads/trunk 66789fe67 -> 3a609c20c
Fix AIOOBE when building syntax error message
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8455
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/254d6f7e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/254d6f7e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/254d6f7e
Branch: refs/heads/trunk
Commit: 254d6f7e9c689c639f85f3f5119f4a812d295f05
Parents: c3ac6ba
Author: blerer <b_...@hotmail.com>
Authored: Fri Dec 12 12:02:40 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Fri Dec 12 12:03:34 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../apache/cassandra/cql3/ErrorCollector.java | 30 ++++++++++++++++++++
.../apache/cassandra/cql3/QueryProcessor.java | 1 +
.../cassandra/cql3/ErrorCollectorTest.java | 17 +++++++++++
4 files changed, 50 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254d6f7e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5402ad5..07d526c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
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/254d6f7e/src/java/org/apache/cassandra/cql3/ErrorCollector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/ErrorCollector.java b/src/java/org/apache/cassandra/cql3/ErrorCollector.java
index cd628b8..2137da2 100644
--- a/src/java/org/apache/cassandra/cql3/ErrorCollector.java
+++ b/src/java/org/apache/cassandra/cql3/ErrorCollector.java
@@ -132,6 +132,9 @@ public final class ErrorCollector implements ErrorListener
Token to,
Token offending)
{
+ if (!areTokensValid(from, to, offending))
+ return;
+
String[] lines = query.split("\n");
boolean includeQueryStart = (from.getLine() == 1) && (from.getCharPositionInLine() == 0);
@@ -157,6 +160,33 @@ public final class ErrorCollector implements ErrorListener
}
/**
+ * Checks if the specified tokens are valid.
+ *
+ * @param tokens the tokens to check
+ * @return <code>true</code> if all the specified tokens are valid ones, <code>false</code> otherwise.
+ */
+ private static boolean areTokensValid(Token... tokens)
+ {
+ for (Token token : tokens)
+ {
+ if (!isTokenValid(token))
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Checks that the specified token is valid.
+ *
+ * @param token the token to check
+ * @return <code>true</code> if it is considered as valid, <code>false</code> otherwise.
+ */
+ private static boolean isTokenValid(Token token)
+ {
+ return token.getLine() > 0 && token.getCharPositionInLine() >= 0;
+ }
+
+ /**
* Returns the index of the offending token. <p>In the case where the offending token is an extra
* character at the end, the index returned by the <code>TokenStream</code> might be after the last token.
* To avoid that problem we need to make sure that the index of the offending token is a valid index
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254d6f7e/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index 8e829e8..197225b 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -542,6 +542,7 @@ public class QueryProcessor implements QueryHandler
}
catch (RuntimeException re)
{
+ logger.error(String.format("The statement: [%s] could not be parsed.", queryStr), re);
throw new SyntaxException(String.format("Failed parsing statement: [%s] reason: %s %s",
queryStr,
re.getClass().getSimpleName(),
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254d6f7e/test/unit/org/apache/cassandra/cql3/ErrorCollectorTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/ErrorCollectorTest.java b/test/unit/org/apache/cassandra/cql3/ErrorCollectorTest.java
index 4f5db34..fca93df 100644
--- a/test/unit/org/apache/cassandra/cql3/ErrorCollectorTest.java
+++ b/test/unit/org/apache/cassandra/cql3/ErrorCollectorTest.java
@@ -107,6 +107,23 @@ public class ErrorCollectorTest
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
{
/**
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
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
{
/**