Fix LegacyLayout to have same behavior as 2.x when handling unknown column names

patch by Cameron Zemek; reviewed by Mick Semb Wever for CASSANDRA-15081

CHANGES.txt

@@ -1,4 +1,5 @@
 3.11.6
+ * Fix LegacyLayout to have same behavior as 2.x when handling unknown column names (CASSANDRA-15081)
 Merged from 3.0:
  * Minimize clustering values in metadata collector (CASSANDRA-15400)
  * Avoid over-trimming of results in mixed mode clusters (CASSANDRA-15405)

src/java/org/apache/cassandra/db/LegacyLayout.java

@@ -1213,10 +1213,10 @@ public abstract class LegacyLayout
             // but we don't do this here and re-throw the exception because the calling code sometimes has to know
             // about this happening. This does mean code calling this method should handle this case properly.
             if (!metadata.ksName.equals(SchemaConstants.SYSTEM_KEYSPACE_NAME) && metadata.getDroppedColumnDefinition(e.columnName) == null)
-                throw new IllegalStateException(String.format("Got cell for unknown column %s in sstable of %s.%s: " +
+                logger.warn(String.format("Got cell for unknown column %s in sstable of %s.%s: " +
-                                                              "This suggest a problem with the schema which doesn't list " +
+                                          "This suggest a problem with the schema which doesn't list " +
-                                                              "this column. Even if that column was dropped, it should have " +
+                                          "this column. Even if that column was dropped, it should have " +
-                                                              "been listed as such", metadata.ksName, metadata.cfName, UTF8Type.instance.compose(e.columnName)), e);
+                                          "been listed as such", metadata.ksName, metadata.cfName, UTF8Type.instance.compose(e.columnName)), e);
 
             throw e;
         }

test/data/legacy-sstables/ka/legacy_tables/legacy_ka_15081/legacy_tables-legacy_ka_15081-ka-1-Digest.sha1

@@ -0,0 +1 @@
+718738748

test/data/legacy-sstables/ka/legacy_tables/legacy_ka_15081/legacy_tables-legacy_ka_15081-ka-1-TOC.txt

@@ -0,0 +1,8 @@
+Digest.sha1
+Data.db
+Statistics.db
+Summary.db
+Index.db
+TOC.txt
+Filter.db
+CompressionInfo.db

test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java

@@ -110,7 +110,7 @@ public class LegacySSTableTest
     public static void defineSchema() throws ConfigurationException
     {
         String scp = System.getProperty(LEGACY_SSTABLE_PROP);
-        Assert.assertNotNull("System property " + LEGACY_SSTABLE_ROOT + " not set", scp);
+        Assert.assertNotNull("System property " + LEGACY_SSTABLE_PROP + " not set", scp);
         
         LEGACY_SSTABLE_ROOT = new File(scp).getAbsoluteFile();
         Assert.assertTrue("System property " + LEGACY_SSTABLE_ROOT + " does not specify a directory", LEGACY_SSTABLE_ROOT.isDirectory());
@@ -436,6 +436,17 @@ public class LegacySSTableTest
         assertExpectedRowsWithDroppedCollection(false);
     }
 
+    @Test
+    public void test15081() throws Exception
+    {
+        QueryProcessor.executeInternal("CREATE TABLE legacy_tables.legacy_ka_15081 (id int primary key, payload text)");
+        loadLegacyTable("legacy_%s_15081%s", "ka", "");
+        UntypedResultSet results =
+            QueryProcessor.executeOnceInternal(
+                String.format("SELECT * FROM legacy_tables.legacy_ka_15081"));
+        assertRows(results, row(1, "hello world"));
+    }
+
     @Test
     public void testReadingLegacyTablesWithIllegalCellNames() throws Exception {
         /**