FrankChen021 commented on code in PR #19537:
URL: https://github.com/apache/druid/pull/19537#discussion_r3587153418
##########
server/src/main/java/org/apache/druid/client/selector/ServerSelector.java:
##########
@@ -190,16 +192,123 @@ public List<DruidServerMetadata>
getAllServers(CloneQueryMode cloneQueryMode)
}
@Nullable
- public <T> QueryableDruidServer pick(@Nullable Query<T> query,
CloneQueryMode cloneQueryMode)
+ public <T> QueryableDruidServer pick(@Nullable final Query<T> query, final
CloneQueryMode cloneQueryMode)
+ {
+ return pick(query, cloneQueryMode, getQueryableHistoricalTiers(query));
+ }
+
+ @Nullable
+ public <T> QueryableDruidServer pick(
+ @Nullable final Query<T> query,
+ final CloneQueryMode cloneQueryMode,
+ @Nullable final Set<String> queryableHistoricalTiers
+ )
{
synchronized (this) {
- if (!historicalServers.isEmpty()) {
- return historicalTierStrategy.pick(query,
filter.getQueryableServers(historicalServers, cloneQueryMode), segment.get());
+ if (queryableHistoricalTiers != null &&
queryableHistoricalTiers.isEmpty()) {
+ return null;
+ }
+ if (!historicalServers.isEmpty() || queryableHistoricalTiers != null) {
+ final Int2ObjectRBTreeMap<Set<QueryableDruidServer>>
queryableHistoricalServers =
+ getQueryableHistoricalServers(
+ filter.getQueryableServers(historicalServers, cloneQueryMode),
+ queryableHistoricalTiers
+ );
+ return historicalTierStrategy.pick(query, queryableHistoricalServers,
segment.get());
}
return realtimeTierStrategy.pick(query, realtimeServers, segment.get());
}
}
+ public <T> boolean hasQueryableServer(@Nullable final Query<T> query, final
CloneQueryMode cloneQueryMode)
+ {
+ return hasQueryableServer(getQueryableHistoricalTiers(query),
cloneQueryMode);
+ }
+
+ public boolean hasQueryableServer(
+ @Nullable final Set<String> queryableHistoricalTiers,
+ final CloneQueryMode cloneQueryMode
+ )
+ {
+ synchronized (this) {
+ if (queryableHistoricalTiers != null) {
+ return !queryableHistoricalTiers.isEmpty()
+ && !historicalServers.isEmpty()
+ && hasQueryableHistoricalServer(
+ filter.getQueryableServers(historicalServers,
cloneQueryMode),
+ queryableHistoricalTiers
+ );
+ }
+ if (!historicalServers.isEmpty()) {
+ return hasServers(filter.getQueryableServers(historicalServers,
cloneQueryMode));
+ }
+ return hasServers(realtimeServers);
+ }
+ }
+
+ @Nullable
+ private static <T> Set<String> getQueryableHistoricalTiers(@Nullable final
Query<T> query)
+ {
+ if (query == null) {
+ return null;
+ }
+
+ final QueryContext queryContext = query.context();
+ return queryContext == null ? null :
queryContext.getQueryableHistoricalTiers();
+ }
+
+ private Int2ObjectRBTreeMap<Set<QueryableDruidServer>>
getQueryableHistoricalServers(
+ final Int2ObjectRBTreeMap<Set<QueryableDruidServer>> queryableServers,
+ @Nullable final Set<String> queryableHistoricalTiers
+ )
+ {
+ if (queryableHistoricalTiers == null) {
+ return queryableServers;
+ }
+
+ final Int2ObjectRBTreeMap<Set<QueryableDruidServer>> filteredServers =
+ new Int2ObjectRBTreeMap<>(historicalTierStrategy.getComparator());
+ for (final Int2ObjectMap.Entry<Set<QueryableDruidServer>> entry :
queryableServers.int2ObjectEntrySet()) {
+ final Set<QueryableDruidServer> priorityServers = new HashSet<>();
+ for (final QueryableDruidServer server : entry.getValue()) {
+ if (queryableHistoricalTiers.contains(server.getServer().getTier())) {
Review Comment:
[P1] Resolve virtual tier aliases before filtering servers
This compares requested tiers directly with each server's physical tier, but
the PR description says `queryableHistoricalTiers` supports virtual tiers from
`historicalTierAliases`. Alias keys are never physical tiers: Coordinator
expansion loads segments only onto their mapped tiers. Therefore, with
`historicalTierAliases={"hot":["hot_1","hot_2"]}`, querying
`queryableHistoricalTiers=["hot"]` matches no server and silently returns empty
or partial results. The Broker's coordinator-config view should expand aliases
before `hasQueryableHistoricalServer` and `getQueryableHistoricalServers`
perform these checks, with coverage for virtual and mixed virtual/physical tier
sets.
--
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]
