natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.0' into cassandra-4.1

This commit is contained in:
Stefan Miklosovic 2023-06-06 16:15:33 +02:00
parent aa7ed179d3 f368b9dc1e
commit 867c074dda
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -3,6 +3,7 @@ Merged from 4.0:
* Fix Down nodes counter in nodetool describecluster (CASSANDRA-18512)
* Remove unnecessary shuffling of GossipDigests in Gossiper#makeRandomGossipDigest (CASSANDRA-18546)
Merged from 3.11:
* Add keyspace and table name to exception message during ColumnSubselection deserialization (CASSANDRA-18346)
Merged from 3.0:
* Suppress CVE-2023-2976 (CASSANDRA-18562)
* Remove dh_python use in Debian packaging (CASSANDRA-18558)

8
src/java/org/apache/cassandra/db/filter/ColumnSubselection.java
View File

@ -205,10 +205,14 @@ public abstract class ColumnSubselection implements Comparable<ColumnSubselectio
{
// If we don't find the definition, it could be we have data for a dropped column, and we shouldn't
// fail deserialization because of that. So we grab a "fake" ColumnMetadata that ensure proper
// deserialization. The column will be ignore later on anyway.
// deserialization. The column will be ignored later on anyway.
column = metadata.getDroppedColumn(name);
if (column == null)
throw new UnknownColumnException("Unknown column " + UTF8Type.instance.getString(name) + " during deserialization");
{
String errorMsg = String.format("Unknown column %s in table %s.%s during deserialization",
UTF8Type.instance.getString(name), metadata.keyspace, metadata.name);
throw new UnknownColumnException(errorMsg);
}
}
Kind kind = Kind.values()[in.readUnsignedByte()];