imply-cheddar commented on code in PR #17331: URL: https://github.com/apache/druid/pull/17331#discussion_r1811060551
########## server/src/test/java/org/apache/druid/query/ConglomerateBackedQueryToolChestWarehouse.java: ########## @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.query; + +public class ConglomerateBackedQueryToolChestWarehouse implements QueryToolChestWarehouse Review Comment: Don't think you need this, can just update the `DefaultQueryRunnerFactoryConglomerate` to depend on the same map that the `MapQueryToolChestWarehouse` and then get rid of this class. ########## processing/src/main/java/org/apache/druid/query/QueryRunnerFactoryConglomerate.java: ########## @@ -19,9 +19,22 @@ package org.apache.druid.query; +import org.apache.druid.error.DruidException; + /** */ -public interface QueryRunnerFactoryConglomerate +public interface QueryRunnerFactoryConglomerate extends QueryToolChestWarehouse { <T, QueryType extends Query<T>> QueryRunnerFactory<T, QueryType> findFactory(QueryType query); + + @Override + default <T, QueryType extends Query<T>> QueryToolChest<T, QueryType> getToolChest(QueryType query) + { + QueryRunnerFactory<T, QueryType> factory = findFactory(query); + if (factory == null) { + throw DruidException + .defensive("QueryRunnerFactory for QueryType [%s] is not registered!", query.getClass().getName()); + } + return factory.getToolchest(); + } Review Comment: Originally, the Warehouse and the Conglomerate were separated because the conglomerate was only needed on "leaf nodes". When we introduced the idea of sub-queries, it made it true that brokers also need the conglomerate, which takes away the reason for having the objects separated. I don't think this needs to have a default implementation, but instead we should just make the conglomerate be the only thing depended on. The Warehouse should be deprecated, but continue to exist for a bit (one release) just to enable any extensions that depend on it to be updated to depend on the conglomerate instead. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
