From 03da864bab9740c067363a8dcce13db2bfd47ce2 Mon Sep 17 00:00:00 2001
From: mghildiy <manish.c.ghildiyal@gmail.com>
Date: Fri, 19 May 2023 11:31:45 +0530
Subject: [PATCH] Add keyspace and table name to exception message during
 ColumnSubselection deserialization

patch by Manish Ghildiyal; reviewed by Brandon Williams and Stefan Miklosovic for CASSANDRA-18346
---
 CHANGES.txt                                               | 2 +-
 .../apache/cassandra/db/filter/ColumnSubselection.java    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d86b27595f..cd7fe124ea 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,7 @@
 3.11.16
+ * Add keyspace and table name to exception message during ColumnSubselection deserialization (CASSANDRA-18346)
  * Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202)
 Merged from 3.0:
-3.0.30
  * Suppress CVE-2023-2976 (CASSANDRA-18562)
  * Remove dh_python use in Debian packaging (CASSANDRA-18558)
  * Pass down all contact points to driver for cassandra-stress (CASSANDRA-18025)
diff --git a/src/java/org/apache/cassandra/db/filter/ColumnSubselection.java b/src/java/org/apache/cassandra/db/filter/ColumnSubselection.java
index 2fdb3e1bd8..00d96cf7df 100644
--- a/src/java/org/apache/cassandra/db/filter/ColumnSubselection.java
+++ b/src/java/org/apache/cassandra/db/filter/ColumnSubselection.java
@@ -194,10 +194,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" ColumnDefinition that ensure proper
-                // deserialization. The column will be ignore later on anyway.
+                // deserialization. The column will be ignored later on anyway.
                 column = metadata.getDroppedColumnDefinition(name);
                 if (column == null)
-                    throw new RuntimeException("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.ksName, metadata.cfName);
+                    throw new RuntimeException(errorMsg);
+                }
             }
 
             Kind kind = Kind.values()[in.readUnsignedByte()];