QueryTable#renameColumns: Propagate Attributes (#3537)

deephaven · Mar 16, 2023 · e1cbfa4 · e1cbfa4
1 parent 266558a
commit e1cbfa4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/BaseTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/BaseTable.java
@@ -158,7 +158,7 @@ public enum CopyAttributeOperation {
  // legacy attributes
  Flatten, Sort, UpdateView, Join, Filter,
  // new attributes
- DropColumns, View, Reverse,
+ DropColumns, RenameColumns, View, Reverse,
  /**
  * The result tables that go in a PartitionBy TableMap
  */
@@ -199,6 +199,7 @@ public enum CopyAttributeOperation {
  // into constituent tables
  tempMap.put(MERGED_TABLE_ATTRIBUTE, EnumSet.of(
  CopyAttributeOperation.DropColumns,
+ CopyAttributeOperation.RenameColumns,
  CopyAttributeOperation.View));
 
  tempMap.put(INITIALLY_EMPTY_COALESCED_SOURCE_TABLE_ATTRIBUTE, EnumSet.complementOf(EnumSet.of(
@@ -271,12 +272,14 @@ public enum CopyAttributeOperation {
 
  tempMap.put(ADD_ONLY_TABLE_ATTRIBUTE, EnumSet.of(
  CopyAttributeOperation.DropColumns,
+ CopyAttributeOperation.RenameColumns,
  CopyAttributeOperation.PartitionBy,
  CopyAttributeOperation.Coalesce));
 
 
  tempMap.put(APPEND_ONLY_TABLE_ATTRIBUTE, EnumSet.of(
  CopyAttributeOperation.DropColumns,
+ CopyAttributeOperation.RenameColumns,
  CopyAttributeOperation.FirstBy,
  CopyAttributeOperation.Flatten,
  CopyAttributeOperation.PartitionBy,
@@ -318,6 +321,7 @@ public enum CopyAttributeOperation {
  CopyAttributeOperation.View, // and Select, if added
  CopyAttributeOperation.UpdateView, // and Update, if added
  CopyAttributeOperation.DropColumns,
+ CopyAttributeOperation.RenameColumns,
  CopyAttributeOperation.Join,
  CopyAttributeOperation.WouldMatch));
 

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
@@ -1645,6 +1645,7 @@ public void onUpdate(final TableUpdate upstream) {
  }
  propagateFlatness(queryTable);
 
+ copyAttributes(queryTable, CopyAttributeOperation.RenameColumns);
  copySortableColumns(queryTable, pairs);
  maybeCopyColumnDescriptions(queryTable, pairs);