core/src/main/java/io/questdb/griffin/SqlOptimiser.java (1)

2782-2807: Don’t bypass QueryModel’s invariants: use addBottomUpColumn instead of mutating maps/lists directly

Directly writing to aliasToColumnMap and bottomUpColumns risks leaving columnNameToAliasMap, alias indexes, wildcard lists, etc., out of sync. This can later break column resolution and rewrites. Also, keep source position when replacing ORDER BY with a literal, and avoid var for codebase consistency.

-                if (node.type == FUNCTION || node.type == OPERATION) {
-                    var qc = findQueryColumnByAst(model.getBottomUpColumns(), node);
+                if (node.type == FUNCTION || node.type == OPERATION) {
+                    QueryColumn qc = findQueryColumnByAst(model.getBottomUpColumns(), node);
                     if (qc == null) {
                         // add this function to bottom-up columns and replace this expression with index
-                        CharSequence alias = SqlUtil.createColumnAlias(
+                        CharSequence alias = SqlUtil.createColumnAlias(
                                 characterStore,
                                 node.token,
                                 Chars.indexOfLastUnquoted(node.token, '.'),
                                 model.getAliasToColumnMap(),
                                 true
                         );
-                        qc = queryColumnPool.next().of(
-                                alias,
-                                node,
-                                false
-                        );
-                        model.getAliasToColumnMap().put(alias, qc);
-                        model.getBottomUpColumns().add(qc);
+                        qc = queryColumnPool.next().of(alias, node, false);
+                        // Keep QueryModel internal structures consistent
+                        model.addBottomUpColumn(qc);
                         moved = true;
                     }
                     // on "else" branch, when order by expression matched projection
                     // we can just replace order by with projection alias without having to
                     // add an extra model
-                    orderBy.setQuick(i, nextLiteral(qc.getAlias()));
+                    orderBy.setQuick(i, nextLiteral(qc.getAlias(), node.position));
                 }