wip

Author: smiklosovic

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

@@ -23,9 +23,11 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 import com.google.common.collect.ImmutableList;
 
@@ -124,7 +126,17 @@ public static SerializationHeader make(TableMetadata metadata, Collection<SSTabl
 
         if (latestColumnsOnly)
         {
-            columns.addAll(metadata.regularAndStaticColumns());
+            RegularAndStaticColumns droppedColumns = metadata.droppedColumns();
+            Set<ColumnMetadata> nonDroppedColumnsOfSSTables = new LinkedHashSet<>();
+            for (SSTableReader sstable : ssTableReaders)
+            {
+                for (ColumnMetadata columnMetadata : sstable.header.columns)
+                {
+                    if (!droppedColumns.contains(columnMetadata))
+                        nonDroppedColumnsOfSSTables.add(columnMetadata);
+                }
+            }
+            columns.addAll(nonDroppedColumnsOfSSTables);
         }
         else
         {

src/java/org/apache/cassandra/schema/TableMetadata.java

@@ -453,6 +453,21 @@ public RegularAndStaticColumns regularAndStaticAndDroppedColumns()
         return regularAndStaticAndDroppedColumns;
     }
 
+    public RegularAndStaticColumns droppedColumns()
+    {
+        RegularAndStaticColumns droppedColumns = regularAndStaticAndDroppedColumns;
+        Iterator<ColumnMetadata> iterator = regularAndStaticAndDroppedColumns.iterator();
+        while (iterator.hasNext())
+        {
+            ColumnMetadata next = iterator.next();
+
+            if (regularAndStaticColumns.contains(next))
+                droppedColumns = droppedColumns.without(next);
+        }
+
+        return droppedColumns;
+    }
+
     public Columns regularColumns()
     {
         return regularAndStaticColumns.regulars;