Improve Tracing

src/java/org/apache/cassandra/db/filter/ColumnFilter.java

@@ -33,6 +33,7 @@
 import org.apache.cassandra.io.util.DataOutputPlus;
 import org.apache.cassandra.schema.ColumnMetadata;
 import org.apache.cassandra.schema.TableMetadata;
+import org.apache.cassandra.utils.btree.BTree;
 
 /**
  * Represents which (non-PK) columns (and optionally which sub-part of a column for complex columns) are selected
@@ -64,7 +65,6 @@
  */
 public abstract class ColumnFilter
 {
-
     public static final ColumnFilter NONE = selection(RegularAndStaticColumns.NONE);
 
     public static final Serializer serializer = new Serializer();
@@ -305,6 +305,20 @@ public boolean isWildcard()
         return false;
     }
 
+    /**
+     * Rebinds matching columns into a new filter; ignores any missing but fails if any are a different type
+     */
+    abstract ColumnFilter rebind(TableMetadata newTable);
+
+    public static ColumnFilter rebindVirtual(ColumnFilter filter, TableMetadata newTable)
+    {
+        // review feedback; nothing actually preventing its use with other tables,
+        // but unclear utility/rationale so just some protection against incorrect usage
+        if (!newTable.isVirtual())
+            throw new UnsupportedOperationException("This feature is intended only to be used with virtual keyspaces");
+        return filter.rebind(newTable);
+    }
+
     /**
      * Returns the CQL string corresponding to this {@code ColumnFilter}.
      *
@@ -630,6 +644,12 @@ public boolean isWildcard()
             return true;
         }
 
+        @Override
+        ColumnFilter rebind(TableMetadata newTable)
+        {
+            return new WildCardColumnFilter(ColumnFilter.rebind(newTable, fetchedAndQueried));
+        }
+
         @Override
         protected SortedSetMultimap<ColumnIdentifier, ColumnSubselection> subSelections()
         {
@@ -779,6 +799,21 @@ public Tester newTester(ColumnMetadata column)
             return new Tester(fetchingStrategy.fetchesAllColumns(column.isStatic()), s.iterator());
         }
 
+        @Override
+        ColumnFilter rebind(TableMetadata newTable)
+        {
+            RegularAndStaticColumns queried = ColumnFilter.rebind(newTable, this.queried);
+            RegularAndStaticColumns fetched = this.queried == this.fetched ? queried : ColumnFilter.rebind(newTable, this.fetched);
+            SortedSetMultimap<ColumnIdentifier, ColumnSubselection> subSelections = null;
+            if (this.subSelections != null)
+            {
+                subSelections = TreeMultimap.create();
+                for (Map.Entry<ColumnIdentifier, ColumnSubselection> e : this.subSelections.entries())
+                    subSelections.put(e.getKey(), e.getValue().rebind(newTable));
+            }
+            return new SelectionColumnFilter(fetchingStrategy, queried, fetched, subSelections);
+        }
+
         @Override
         protected SortedSetMultimap<ColumnIdentifier, ColumnSubselection> subSelections()
         {
@@ -1003,4 +1038,26 @@ private long subSelectionsSerializedSize(SortedSetMultimap<ColumnIdentifier, Col
             return size;
         }
     }
+
+    private static RegularAndStaticColumns rebind(TableMetadata newTable, RegularAndStaticColumns columns)
+    {
+        return new RegularAndStaticColumns(rebind(newTable, columns.statics), rebind(newTable, columns.regulars));
+    }
+
+    private static Columns rebind(TableMetadata newTable, Columns columns)
+    {
+        if (columns.isEmpty())
+            return columns;
+
+        try (BTree.FastBuilder<ColumnMetadata> builder = BTree.fastBuilder())
+        {
+            for (ColumnMetadata in : columns)
+            {
+                ColumnMetadata out = newTable.getColumn(in.name);
+                if (out != null)
+                    builder.add(out);
+            }
+            return Columns.from(builder);
+        }
+    }
 }

src/java/org/apache/cassandra/db/filter/ColumnSubselection.java

@@ -76,6 +76,8 @@ public ColumnMetadata column()
 
     protected abstract CellPath comparisonPath();
 
+    protected abstract ColumnSubselection rebind(TableMetadata newTable);
+
     public int compareTo(ColumnSubselection other)
     {
         assert other.column().name.equals(column().name);
@@ -118,6 +120,12 @@ public CellPath comparisonPath()
             return from;
         }
 
+        @Override
+        protected ColumnSubselection rebind(TableMetadata newTable)
+        {
+            return new Slice(newTable.getColumn(column.name), from, to);
+        }
+
         public int compareInclusionOf(CellPath path)
         {
             Comparator<CellPath> cmp = column.cellPathComparator();
@@ -160,6 +168,12 @@ public CellPath comparisonPath()
             return element;
         }
 
+        @Override
+        protected ColumnSubselection rebind(TableMetadata newTable)
+        {
+            return new Element(newTable.getColumn(column.name), element);
+        }
+
         public int compareInclusionOf(CellPath path)
         {
             return column.cellPathComparator().compare(path, element);

src/java/org/apache/cassandra/db/filter/RowFilter.java

@@ -141,7 +141,7 @@ public void addCustomIndexExpression(TableMetadata metadata, IndexMetadata targe
         add(new CustomExpression(metadata, targetIndex, value));
     }
 
-    private void add(Expression expression)
+    public void add(Expression expression)
     {
         expression.validate();
         expressions.add(expression);
@@ -549,6 +549,28 @@ public void validateForIndexing()
                        "Index expression values may not be larger than 64K");
         }
 
+        /**
+         * Rebind this expression to a table metadata that is expected to have equivalent columns.
+         * If any referenced column is missing, returns null;
+         * if any referenced column has a different type throws an exception
+         */
+        public Expression rebind(TableMetadata newTable)
+        {
+            throw new UnsupportedOperationException("Expression " + toString(true) + " does not support rebinding to another table definition");
+        }
+
+        protected static ColumnMetadata rebind(ColumnMetadata in, TableMetadata newTable)
+        {
+            ColumnMetadata out = newTable.getColumn(in.name);
+            if (out == null)
+                return null;
+
+            if (!out.type.equals(in.type) && !out.type.isCompatibleWith(in.type) || !in.type.isCompatibleWith(out.type))
+                throw new IllegalArgumentException("The provided TableMetadata is not compatible with the expression");
+
+            return out;
+        }
+
         /**
          * Returns whether the provided row satisfied this expression or not.
          *
@@ -734,6 +756,16 @@ public static class SimpleExpression extends Expression
             super(column, operator, value);
         }
 
+        @Override
+        public Expression rebind(TableMetadata newTable)
+        {
+            ColumnMetadata out = rebind(column, newTable);
+            if (out == null)
+                return null;
+
+            return new SimpleExpression(out, operator, value);
+        }
+
         @Override
         public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row, long nowInSec)
         {
@@ -853,6 +885,16 @@ public void validate() throws InvalidRequestException
             checkBindValueSet(value, "Unsupported unset map value for column %s", column.name);
         }
 
+        @Override
+        public Expression rebind(TableMetadata newTable)
+        {
+            ColumnMetadata out = rebind(column, newTable);
+            if (out == null)
+                return null;
+
+            return new MapElementExpression(out, key, operator, value);
+        }
+
         @Override
         public ByteBuffer getIndexValue()
         {
@@ -978,6 +1020,12 @@ protected Kind kind()
             return Kind.CUSTOM;
         }
 
+        @Override
+        public Expression rebind(TableMetadata newTable)
+        {
+            return new CustomExpression(table, targetIndex, value);
+        }
+
         // Filtering by custom expressions isn't supported yet, so just accept any row
         @Override
         public boolean isSatisfiedBy(TableMetadata metadata, DecoratedKey partitionKey, Row row, long nowInSec)