cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
Date Sun, 27 Mar 2016 22:31:33 GMT
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/b6ff7f6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6ff7f6c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6ff7f6c

Branch: refs/heads/trunk
Commit: b6ff7f6c0d2849676efe05422e7c0d5bf0949a3e
Parents: 494386d 5c4d5c7
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Sun Mar 27 15:24:29 2016 -0700
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Sun Mar 27 15:24:29 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../sasi/disk/AbstractTokenTreeBuilder.java     | 672 ++++++++++++++++
 .../sasi/disk/DynamicTokenTreeBuilder.java      | 189 +++++
 .../index/sasi/disk/OnDiskIndexBuilder.java     |  52 +-
 .../index/sasi/disk/PerSSTableIndexWriter.java  |  38 +-
 .../index/sasi/disk/StaticTokenTreeBuilder.java | 266 ++++++
 .../apache/cassandra/index/sasi/disk/Token.java |   5 +
 .../cassandra/index/sasi/disk/TokenTree.java    |   6 +-
 .../index/sasi/disk/TokenTreeBuilder.java       | 805 +------------------
 .../index/sasi/memory/KeyRangeIterator.java     |  11 +
 .../cassandra/index/sasi/sa/SuffixSA.java       |   7 +-
 .../index/sasi/utils/CombinedTerm.java          |  47 +-
 .../index/sasi/disk/OnDiskIndexTest.java        |  20 +-
 .../sasi/disk/PerSSTableIndexWriterTest.java    |  90 +++
 .../index/sasi/disk/TokenTreeTest.java          | 217 +++--
 .../index/sasi/utils/LongIterator.java          |   8 +
 16 files changed, 1482 insertions(+), 952 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6ff7f6c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b1b9034,2907df9..1a548d7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 +3.6
 + * Add auto import java.util for UDF code block (CASSANDRA-11392)
 + * Add --hex-format option to nodetool getsstables (CASSANDRA-11337)
 + * sstablemetadata should print sstable min/max token (CASSANDRA-7159)
 + * Do not wrap CassandraException in TriggerExecutor (CASSANDRA-9421)
 + * COPY TO should have higher double precision (CASSANDRA-11255)
 + * Stress should exit with non-zero status after failure (CASSANDRA-10340)
 + * Add client to cqlsh SHOW_SESSION (CASSANDRA-8958)
 + * Fix nodetool tablestats keyspace level metrics (CASSANDRA-11226)
 + * Store repair options in parent_repair_history (CASSANDRA-11244)
 + * Print current leveling in sstableofflinerelevel (CASSANDRA-9588)
 + * Change repair message for keyspaces with RF 1 (CASSANDRA-11203)
 + * Remove hard-coded SSL cipher suites and protocols (CASSANDRA-10508)
 + * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099)
 + * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274)
 + * Refuse to start and print txn log information in case of disk
 +   corruption (CASSANDRA-10112)
 + * Resolve some eclipse-warnings (CASSANDRA-11086)
 + * (cqlsh) Show static columns in a different color (CASSANDRA-11059)
 + * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207)
 +
 +
  3.5
+  * Avoid index segment stitching in RAM which lead to OOM on big SSTable files (CASSANDRA-11383)
   * Fix clustering and row filters for LIKE queries on clustering columns (CASSANDRA-11397)
  Merged from 3.0:
   * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6ff7f6c/src/java/org/apache/cassandra/index/sasi/disk/OnDiskIndexBuilder.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6ff7f6c/src/java/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6ff7f6c/test/unit/org/apache/cassandra/index/sasi/disk/PerSSTableIndexWriterTest.java
----------------------------------------------------------------------


Mime
View raw message