Spotless + Charles' Feedback

engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/PreserveColumnLayer.java

@@ -77,10 +77,10 @@ public LogOutput append(LogOutput logOutput) {
 
     @Override
     public boolean flattenedResult() {
-        // a preserve layer is only flattened if the inner is flattened
-        // the "flattenedResult" means that we are flattening the table as part of select.  For a pre-existing column, we
-        // could not preserve a layer while flattening, but if we are preserving a newly generated column; it is valid for
-        // the result to have been flattened as part of select.
+        // preserve layer is only flattened if the inner is flattened
+        // the "flattenedResult" means that we are flattening the table as part of select. For a pre-existing column, we
+        // could not preserve a layer while flattening, but if we are preserving a newly generated column; it is valid
+        // for the result to have been flattened as part of select.
         return inner.flattenedResult();
     }
 

engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectAndViewAnalyzer.java

@@ -174,20 +174,22 @@ public static SelectAndViewAnalyzerWrapper create(
 
             if (realColumn != null && shouldPreserve(sc)) {
                 boolean sourceIsNew = resultColumns.contains(realColumn.getSourceName());
-                if (!sourceIsNew && numberOfInternallyFlattenedColumns > 0) {
-                    // we must preserve this column, but have already created an analyzer for the internally flattened
-                    // column, therefore must start over without permitting internal flattening
-                    return create(sourceTable, mode, columnSources, originalRowSet, parentMcs, publishTheseSources,
-                            useShiftedColumns, false, selectColumns);
+                if (!sourceIsNew) {
+                    if (numberOfInternallyFlattenedColumns > 0) {
+                        // we must preserve this column, but have already created an analyzer for the internally
+                        // flattened
+                        // column, therefore must start over without permitting internal flattening
+                        return create(sourceTable, mode, columnSources, originalRowSet, parentMcs, publishTheseSources,
+                                useShiftedColumns, false, selectColumns);
+                    } else {
+                        // we can not flatten future columns because we are preserving a column that may not be flat
+                        flattenedResult = false;
+                    }
                 }
 
                 analyzer = analyzer.createLayerForPreserve(
                         sc.getName(), sc, sc.getDataView(), distinctDeps, mcsBuilder);
 
-                if (!sourceIsNew) {
-                    // we can not flatten future columns because we are preserving a column that may not be flat
-                    flattenedResult = false;
-                }
                 continue;
             }