You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2017/04/07 09:30:15 UTC
[1/3] cassandra git commit: Add charset to Analyser input stream
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 ebdf77194 -> 5f54d4210
refs/heads/trunk 393226de6 -> 691189616
Add charset to Analyser input stream
Patch by Alex Petrov; reviewed by Jay Zhuang for CASSANDRA-13151
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f54d421
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f54d421
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f54d421
Branch: refs/heads/cassandra-3.11
Commit: 5f54d42107b0e0ece0ebb94a285cd7957b608523
Parents: ebdf771
Author: Alex Petrov <ol...@gmail.com>
Authored: Fri Apr 7 11:26:31 2017 +0200
Committer: Alex Petrov <ol...@gmail.com>
Committed: Fri Apr 7 11:26:31 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/index/sasi/analyzer/StandardAnalyzer.java | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f54d421/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0761ca5..7b03b6c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.0
+ * Add charset to Analyser input stream (CASSANDRA-13151)
* Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
* cdc column addition strikes again (CASSANDRA-13382)
* Fix static column indexes (CASSANDRA-13277)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f54d421/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java
index 069164c..3b58bf9 100644
--- a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java
+++ b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
import org.apache.cassandra.index.sasi.analyzer.filter.*;
@@ -152,7 +153,7 @@ public class StandardAnalyzer extends AbstractAnalyzer
this.options = tokenizerOptions;
this.filterPipeline = getFilterPipeline();
- Reader reader = new InputStreamReader(new DataInputBuffer(ByteBufferUtil.EMPTY_BYTE_BUFFER, false));
+ Reader reader = new InputStreamReader(new DataInputBuffer(ByteBufferUtil.EMPTY_BYTE_BUFFER, false), StandardCharsets.UTF_8);
this.scanner = new StandardTokenizerImpl(reader);
this.inputReader = reader;
}
@@ -179,15 +180,16 @@ public class StandardAnalyzer extends AbstractAnalyzer
public void reset(ByteBuffer input)
{
this.next = null;
- Reader reader = new InputStreamReader(new DataInputBuffer(input, false));
+ Reader reader = new InputStreamReader(new DataInputBuffer(input, false), StandardCharsets.UTF_8);
scanner.yyreset(reader);
this.inputReader = reader;
}
+ @VisibleForTesting
public void reset(InputStream input)
{
this.next = null;
- Reader reader = new InputStreamReader(input);
+ Reader reader = new InputStreamReader(input, StandardCharsets.UTF_8);
scanner.yyreset(reader);
this.inputReader = reader;
}
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by if...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69118961
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69118961
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69118961
Branch: refs/heads/trunk
Commit: 691189616c7413b6a70c39c81b6734b91b0425ed
Parents: 393226d 5f54d42
Author: Alex Petrov <ol...@gmail.com>
Authored: Fri Apr 7 11:29:19 2017 +0200
Committer: Alex Petrov <ol...@gmail.com>
Committed: Fri Apr 7 11:29:19 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/index/sasi/analyzer/StandardAnalyzer.java | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/69118961/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ebcfcf7,7b03b6c..6c12291
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,57 -1,5 +1,58 @@@
+4.0
+ * Skip building views during base table streams on range movements (CASSANDRA-13065)
+ * Improve error messages for +/- operations on maps and tuples (CASSANDRA-13197)
+ * Remove deprecated repair JMX APIs (CASSANDRA-11530)
+ * Fix version check to enable streaming keep-alive (CASSANDRA-12929)
+ * Make it possible to monitor an ideal consistency level separate from actual consistency level (CASSANDRA-13289)
+ * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324)
+ * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360)
+ * Cleanup ParentRepairSession after repairs (CASSANDRA-13359)
+ * Incremental repair not streaming correct sstables (CASSANDRA-13328)
+ * Upgrade the jna version to 4.3.0 (CASSANDRA-13300)
+ * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID functions (CASSANDRA-13132)
+ * Remove config option index_interval (CASSANDRA-10671)
+ * Reduce lock contention for collection types and serializers (CASSANDRA-13271)
+ * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283)
+ * Avoid synchronized on prepareForRepair in ActiveRepairService (CASSANDRA-9292)
+ * Adds the ability to use uncompressed chunks in compressed files (CASSANDRA-10520)
+ * Don't flush sstables when streaming for incremental repair (CASSANDRA-13226)
+ * Remove unused method (CASSANDRA-13227)
+ * Fix minor bugs related to #9143 (CASSANDRA-13217)
+ * Output warning if user increases RF (CASSANDRA-13079)
+ * Remove pre-3.0 streaming compatibility code for 4.0 (CASSANDRA-13081)
+ * Add support for + and - operations on dates (CASSANDRA-11936)
+ * Fix consistency of incrementally repaired data (CASSANDRA-9143)
+ * Increase commitlog version (CASSANDRA-13161)
+ * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425)
+ * Refactor ColumnCondition (CASSANDRA-12981)
+ * Parallelize streaming of different keyspaces (CASSANDRA-4663)
+ * Improved compactions metrics (CASSANDRA-13015)
+ * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031)
+ * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855)
+ * Thrift removal (CASSANDRA-11115)
+ * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
+ * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
+ * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
+ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
+ * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
+ * Use new token allocation for non bootstrap case as well (CASSANDRA-13080)
+ * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084)
+ * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510)
+ * Allow IN restrictions on column families with collections (CASSANDRA-12654)
+ * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028)
+ * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
+ * Add mutation size and batch metrics (CASSANDRA-12649)
+ * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
+ * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
+ * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969)
+ * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
+ * Add support for arithmetic operators (CASSANDRA-11935)
+ * Add histogram for delay to deliver hints (CASSANDRA-13234)
+
+
3.11.0
+ * Add charset to Analyser input stream (CASSANDRA-13151)
* Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
* cdc column addition strikes again (CASSANDRA-13382)
* Fix static column indexes (CASSANDRA-13277)
[2/3] cassandra git commit: Add charset to Analyser input stream
Posted by if...@apache.org.
Add charset to Analyser input stream
Patch by Alex Petrov; reviewed by Jay Zhuang for CASSANDRA-13151
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f54d421
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f54d421
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f54d421
Branch: refs/heads/trunk
Commit: 5f54d42107b0e0ece0ebb94a285cd7957b608523
Parents: ebdf771
Author: Alex Petrov <ol...@gmail.com>
Authored: Fri Apr 7 11:26:31 2017 +0200
Committer: Alex Petrov <ol...@gmail.com>
Committed: Fri Apr 7 11:26:31 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/index/sasi/analyzer/StandardAnalyzer.java | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f54d421/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0761ca5..7b03b6c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.0
+ * Add charset to Analyser input stream (CASSANDRA-13151)
* Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
* cdc column addition strikes again (CASSANDRA-13382)
* Fix static column indexes (CASSANDRA-13277)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f54d421/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java
index 069164c..3b58bf9 100644
--- a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java
+++ b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardAnalyzer.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
import org.apache.cassandra.index.sasi.analyzer.filter.*;
@@ -152,7 +153,7 @@ public class StandardAnalyzer extends AbstractAnalyzer
this.options = tokenizerOptions;
this.filterPipeline = getFilterPipeline();
- Reader reader = new InputStreamReader(new DataInputBuffer(ByteBufferUtil.EMPTY_BYTE_BUFFER, false));
+ Reader reader = new InputStreamReader(new DataInputBuffer(ByteBufferUtil.EMPTY_BYTE_BUFFER, false), StandardCharsets.UTF_8);
this.scanner = new StandardTokenizerImpl(reader);
this.inputReader = reader;
}
@@ -179,15 +180,16 @@ public class StandardAnalyzer extends AbstractAnalyzer
public void reset(ByteBuffer input)
{
this.next = null;
- Reader reader = new InputStreamReader(new DataInputBuffer(input, false));
+ Reader reader = new InputStreamReader(new DataInputBuffer(input, false), StandardCharsets.UTF_8);
scanner.yyreset(reader);
this.inputReader = reader;
}
+ @VisibleForTesting
public void reset(InputStream input)
{
this.next = null;
- Reader reader = new InputStreamReader(input);
+ Reader reader = new InputStreamReader(input, StandardCharsets.UTF_8);
scanner.yyreset(reader);
this.inputReader = reader;
}