You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2016/03/17 14:34:04 UTC
[1/4] cassandra git commit: Fix UTF8Validator.validate() for modified
UTF-8
Repository: cassandra
Updated Branches:
refs/heads/trunk 6a8c747c6 -> 645829214
Fix UTF8Validator.validate() for modified UTF-8
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10748
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42cd66a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42cd66a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42cd66a1
Branch: refs/heads/trunk
Commit: 42cd66a1f91dcd0cf9238e7915d5efe5779b9933
Parents: 5e2d3d2
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Mar 17 14:27:27 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Mar 17 14:27:27 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/serializers/UTF8Serializer.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/42cd66a1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fdb5807..fa4a726 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
* Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900)
* Fix bloom filter sizing with LCS (CASSANDRA-11344)
* (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/42cd66a1/src/java/org/apache/cassandra/serializers/UTF8Serializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/serializers/UTF8Serializer.java b/src/java/org/apache/cassandra/serializers/UTF8Serializer.java
index be5d2d6..e3ea2d5 100644
--- a/src/java/org/apache/cassandra/serializers/UTF8Serializer.java
+++ b/src/java/org/apache/cassandra/serializers/UTF8Serializer.java
@@ -71,11 +71,12 @@ public class UTF8Serializer extends AbstractTextSerializer
{
// validate first byte of 2-byte char, 0xc2-0xdf
if (b == (byte) 0xc0)
- // speical case: modified utf8 null is 0xc080.
+ // special case: modified utf8 null is 0xc080.
state = State.TWO_80;
else if ((b & 0x1e) == 0)
return false;
- state = State.TWO;
+ else
+ state = State.TWO;
}
else if ((b >> 4) == -2)
{
[4/4] cassandra git commit: Merge branch cassandra-3.5 into trunk
Posted by bl...@apache.org.
Merge branch cassandra-3.5 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64582921
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64582921
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64582921
Branch: refs/heads/trunk
Commit: 64582921438c43d662ca261289ec56e721e7204c
Parents: 6a8c747 e3716ee
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Mar 17 14:33:27 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Mar 17 14:33:32 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/serializers/UTF8Serializer.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/64582921/CHANGES.txt
----------------------------------------------------------------------
[2/4] cassandra git commit: Merge branch cassandra-2.2 into
cassandra-3.0
Posted by bl...@apache.org.
Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f1339cc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f1339cc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f1339cc
Branch: refs/heads/trunk
Commit: 7f1339cc9f9f2e46406596cbe57bf8826afb57ba
Parents: 8d101fd 42cd66a
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Mar 17 14:30:51 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Mar 17 14:30:51 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/serializers/UTF8Serializer.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f1339cc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c3d218a,fa4a726..defc25a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
-2.2.6
+3.0.5
+ * Add backpressure to compressed commit log (CASSANDRA-10971)
+ * SSTableExport supports secondary index tables (CASSANDRA-11330)
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
+ * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
+Merged from 2.2:
+ * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
* Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900)
* Fix bloom filter sizing with LCS (CASSANDRA-11344)
* (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092)
[3/4] cassandra git commit: Merge branch cassandra-3.0 into
cassandra-3.5
Posted by bl...@apache.org.
Merge branch cassandra-3.0 into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e3716ee3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3716ee3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3716ee3
Branch: refs/heads/trunk
Commit: e3716ee3649b73b175abb24cefef46fe30e63227
Parents: d526ad7 7f1339c
Author: Benjamin Lerer <b....@gmail.com>
Authored: Thu Mar 17 14:32:07 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Thu Mar 17 14:32:21 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/serializers/UTF8Serializer.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3716ee3/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3716ee3/src/java/org/apache/cassandra/serializers/UTF8Serializer.java
----------------------------------------------------------------------