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 2021/07/01 12:10:01 UTC

[cassandra] branch trunk updated (3b0ceec -> dfc3dbc)

This is an automated email from the ASF dual-hosted git repository.

blerer pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 3b0ceec  Merge branch 'cassandra-4.0' into trunk
     add 3aa49b9  Read only the required SSTables for single partition queries
     add 2fb3d9e  Merge branch cassandra-3.11 into cassandra-4.0
     new dfc3dbc  Merge branch cassandra-4.0 into trunk

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt                                        |  2 +
 .../cassandra/db/SinglePartitionReadCommand.java   | 31 +++++--
 .../test/SinglePartitionReadCommandTest.java       | 43 ++++++++++
 .../org/apache/cassandra/cql3/KeyCacheCqlTest.java | 43 ++++++++--
 .../miscellaneous/SSTablesIteratedTest.java        | 99 +++++++++++++++++++---
 5 files changed, 191 insertions(+), 27 deletions(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[cassandra] 01/01: Merge branch cassandra-4.0 into trunk

Posted by bl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit dfc3dbc18d0f4b517847464e7fe5217f04efb119
Merge: 3b0ceec 2fb3d9e
Author: Benjamin Lerer <b....@gmail.com>
AuthorDate: Thu Jul 1 14:08:52 2021 +0200

    Merge branch cassandra-4.0 into trunk

 CHANGES.txt                                        |  2 +
 .../cassandra/db/SinglePartitionReadCommand.java   | 31 +++++--
 .../test/SinglePartitionReadCommandTest.java       | 43 ++++++++++
 .../org/apache/cassandra/cql3/KeyCacheCqlTest.java | 43 ++++++++--
 .../miscellaneous/SSTablesIteratedTest.java        | 99 +++++++++++++++++++---
 5 files changed, 191 insertions(+), 27 deletions(-)

diff --cc CHANGES.txt
index 9a0bc72,e976214..bef29da
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,10 +1,15 @@@
 -4.0.1
 +4.1
 + * Add isolated flush timer to CommitLogMetrics and ensure writes correspond to single WaitingOnCommit data points (CASSANDRA-16701)
 + * Add a system property to set hostId if not yet initialized (CASSANDRA-14582)
 + * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651)
 +Merged from 4.0:
   * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
   * Improve DiagnosticEventService.publish(event) logging message of events (CASSANDRA-16749)
 + * Obfuscate passwords in statements in QueryEvents (CASSANDRA-16669)
   * Cleanup dependency scopes (CASSANDRA-16704)
   * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() thread-safe (CASSANDRA-16707)
+ Merged from 3.11:
+  * Read only the required SSTables for single partition queries (CASSANDRA-16737)
  Merged from 3.0:
   * Clean transaction log leftovers at the beginning of sstablelevelreset and sstableofflinerelevel (CASSANDRA-12519)
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org