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 67cab368bc89da6cab0efbf019f666f6d647ebb1 Merge: 6c30261 c9734e3 Author: Benjamin Lerer <[email protected]> AuthorDate: Thu Jun 10 11:14:49 2021 +0200 Merge branch cassandra-4.0 into trunk CHANGES.txt | 3 + .../cql3/restrictions/StatementRestrictions.java | 27 + .../cql3/selection/ColumnFilterFactory.java | 24 +- .../apache/cassandra/cql3/selection/Selection.java | 39 +- .../cql3/statements/ModificationStatement.java | 4 +- .../cassandra/cql3/statements/SelectStatement.java | 31 +- .../apache/cassandra/db/filter/ColumnFilter.java | 939 +++++++++++++++------ src/java/org/apache/cassandra/gms/Gossiper.java | 17 +- .../apache/cassandra/schema/SchemaKeyspace.java | 2 +- .../apache/cassandra/utils/CassandraVersion.java | 1 + .../distributed/upgrade/MixedModeReadTest.java | 2 +- .../validation/operations/CompactTableTest.java | 17 + .../cql3/validation/operations/DeleteTest.java | 50 +- .../InsertUpdateIfConditionStaticsTest.java | 40 + .../org/apache/cassandra/db/ReadCommandTest.java | 6 +- .../db/SSTableAndMemTableDigestMatchTest.java | 77 +- .../cassandra/db/filter/ColumnFilterTest.java | 86 +- 17 files changed, 1005 insertions(+), 360 deletions(-) diff --cc CHANGES.txt index 71018a6,94af752..637f045 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,8 +1,11 @@@ -4.0.1 +4.1 + * 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: * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() thread-safe (CASSANDRA-16707) + + 4.0-rc2 + * Fix queries on empty partitions with static data (CASSANDRA-16686) * Keep python driver in artifacts (CASSANDRA-16700) * Improve AuditLogging documentation and logback.xml(CASSANDRA-16682) * Spin up SEPWorker threads whenever we grow the number of work permits(CASSANDRA-16668) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
