This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d9192745bc4c67f14445b5fea416736b5cec5a46 Merge: c33c8ebab4 82297b490e Author: Jacek Lewandowski <[email protected]> AuthorDate: Thu Apr 18 12:33:56 2024 +0200 Merge branch 'cassandra-5.0' into trunk * cassandra-5.0: Fix few types issues and implement types compatibility tests CHANGES.txt | 1 + .../db/marshal/AbstractCompositeType.java | 2 +- .../org/apache/cassandra/db/marshal/TupleType.java | 6 +- .../apache/cassandra/db/marshal/TypeParser.java | 2 +- .../org/apache/cassandra/db/marshal/UserType.java | 2 +- .../apache/cassandra/utils/CassandraVersion.java | 5 + test/data/types-compatibility/4.0.json.gz | Bin 0 -> 397346 bytes test/data/types-compatibility/4.1.json.gz | Bin 0 -> 396407 bytes test/data/types-compatibility/5.0.json.gz | Bin 0 -> 397761 bytes .../cassandra/db/marshal/AbstractTypeTest.java | 922 ++++++++++++++++++++- .../cassandra/utils/AbstractTypeGenerators.java | 228 ++++- .../utils/asserts/SoftAssertionsWithLimit.java | 42 + 12 files changed, 1200 insertions(+), 10 deletions(-) diff --cc CHANGES.txt index 6d9856ae5c,99f938c40b..4f07c455df --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -69,9 -36,10 +69,10 @@@ Merged from 4.1 * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * Fix few types issues and implement types compatibility tests (CASSANDRA-19479) * Change logging to TRACE when failing to get peer certificate (CASSANDRA-19508) * Push LocalSessions info logs to debug (CASSANDRA-18335) * Filter remote DC replicas out when constructing the initial replica plan for the local read repair (CASSANDRA-19120) diff --cc test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java index 22925d1e1f,499470904d..35ecfab60d --- a/test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/AbstractTypeTest.java @@@ -42,11 -70,23 +70,23 @@@ import org.apache.cassandra.config.Data import org.apache.cassandra.cql3.AssignmentTestable; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.ColumnSpecification; -import org.apache.cassandra.cql3.Constants; +import org.apache.cassandra.cql3.terms.Constants; import org.apache.cassandra.cql3.Json; import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.cql3.Term; +import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.VariableSpecifications; + import org.apache.cassandra.db.SerializationHeader; + import org.apache.cassandra.db.filter.ColumnFilter; + import org.apache.cassandra.db.rows.BTreeRow; + import org.apache.cassandra.db.rows.Cell; + import org.apache.cassandra.db.rows.CellPath; + import org.apache.cassandra.db.rows.ComplexColumnData; + import org.apache.cassandra.db.rows.DeserializationHelper; + import org.apache.cassandra.db.rows.EncodingStats; + import org.apache.cassandra.db.rows.Row; + import org.apache.cassandra.db.rows.Rows; + import org.apache.cassandra.db.rows.SerializationHelper; + import org.apache.cassandra.db.rows.UnfilteredSerializer; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputBuffer; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
