mayankshriv commented on a change in pull request #6361: URL: https://github.com/apache/incubator-pinot/pull/6361#discussion_r558484411
########## File path: pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixInstanceDataManager.java ########## @@ -326,6 +339,11 @@ public SegmentMetadata getSegmentMetadata(String tableNameWithType, String segme } } + @Override + public Set<String> getColumnNamesByTable(String tableNameWithType) { + return _tableColumnNamesMap.computeIfAbsent(tableNameWithType, k -> new HashSet<>()); Review comment: Use `Collections.EmptySet`, instead of creating a new one. ########## File path: pinot-common/src/main/java/org/apache/pinot/common/metrics/BrokerMeter.java ########## @@ -87,6 +87,7 @@ GROUP_BY_SIZE("queries", false), TOTAL_SERVER_RESPONSE_SIZE("queries", false), + QUERY_COLUMN_NAME_MISMATCH("queries", false), Review comment: In other places (DataTable), you have used INVALID_COLUMN, so may be `INVALID_COLUMN_NAME_IN_QUERY`? ########## File path: pinot-core/src/main/java/org/apache/pinot/core/query/executor/ServerQueryExecutorV1Impl.java ########## @@ -259,6 +260,18 @@ private DataTable processQuery(List<IndexSegment> indexSegments, QueryContext qu ExecutorService executorService, @Nullable StreamObserver<Server.ServerResponse> responseObserver, long endTimeMs, boolean enableStreaming) throws Exception { + + // Validate whether column names in the query are valid + Set<String> columnNamesFromSchema = _instanceDataManager.getColumnNamesByTable(queryContext.getTableName()); + Set<String> columnNamesFromQuery = queryContext.getColumns(); + if (!columnNamesFromSchema.isEmpty() && !columnNamesFromSchema.containsAll(columnNamesFromQuery)) { + columnNamesFromQuery.removeAll(columnNamesFromSchema); Review comment: How about aliasing? Will it work for `select foo as bar from table`? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org