Enable querying policy-enabled table in MSQ, and use RestrictedDataSource as a base in DataSourceAnalysis. #17666
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| /* | ||
| * 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.msq.querykit; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.fasterxml.jackson.annotation.JsonTypeName; | ||
| import com.google.common.base.Preconditions; | ||
| import org.apache.druid.java.util.common.IAE; | ||
| import org.apache.druid.query.DataSource; | ||
| import org.apache.druid.query.Query; | ||
| import org.apache.druid.query.planning.DataSourceAnalysis; | ||
| import org.apache.druid.query.policy.Policy; | ||
| import org.apache.druid.segment.RestrictedSegment; | ||
| import org.apache.druid.segment.SegmentReference; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.Set; | ||
| import java.util.function.Function; | ||
|
|
||
| /** | ||
| * Represents an input number, i.e., a positional index into | ||
| * {@link org.apache.druid.msq.kernel.StageDefinition#getInputSpecs()}, with policy restriction. | ||
| * <p> | ||
| * Used by | ||
| * <ul> | ||
| * <li>{@link DataSourcePlan}, to note which inputs correspond to which datasources in the query being planned. | ||
| * <li>{@link BroadcastJoinSegmentMapFnProcessor} to associate broadcast inputs with the correct datasources in a | ||
| * join tree. | ||
| */ | ||
| @JsonTypeName("restrictedInputNumber") | ||
| public class RestrictedInputNumberDataSource implements DataSource | ||
|
There was a problem hiding this comment. should this be There was a problem hiding this comment. it's a preference, but i kinda feel |
||
| { | ||
| private final int inputNumber; | ||
| private final Policy policy; | ||
|
There was a problem hiding this comment. This should be a list of policy no ? There was a problem hiding this comment. We agreed on a single policy approach for datasource, full discussion here: #17564 (comment) |
||
|
|
||
| @JsonCreator | ||
| public RestrictedInputNumberDataSource( | ||
| @JsonProperty("inputNumber") int inputNumber, | ||
| @JsonProperty("policy") Policy policy | ||
| ) | ||
| { | ||
| this.inputNumber = inputNumber; | ||
| this.policy = Preconditions.checkNotNull(policy, "Policy can't be null"); | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public int getInputNumber() | ||
| { | ||
| return inputNumber; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public Policy getPolicy() | ||
| { | ||
| return policy; | ||
| } | ||
|
|
||
| @Override | ||
| public Set<String> getTableNames() | ||
| { | ||
| return Collections.emptySet(); | ||
| } | ||
|
|
||
| @Override | ||
| public List<DataSource> getChildren() | ||
| { | ||
| return Collections.emptyList(); | ||
| } | ||
|
|
||
| @Override | ||
| public DataSource withChildren(final List<DataSource> children) | ||
| { | ||
| if (!children.isEmpty()) { | ||
| throw new IAE("Cannot accept children"); | ||
| } | ||
|
|
||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isCacheable(boolean isBroker) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isGlobal() | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isConcrete() | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public Function<SegmentReference, SegmentReference> createSegmentMapFunction(Query query) | ||
| { | ||
| return baseSegment -> new RestrictedSegment(baseSegment, policy); | ||
| } | ||
|
|
||
| @Override | ||
| public DataSource withUpdatedDataSource(DataSource newSource) | ||
| { | ||
| return newSource; | ||
| } | ||
|
|
||
| @Override | ||
| public byte[] getCacheKey() | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public DataSourceAnalysis getAnalysis() | ||
| { | ||
| return new DataSourceAnalysis(this, null, null, Collections.emptyList()); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) | ||
| { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| RestrictedInputNumberDataSource that = (RestrictedInputNumberDataSource) o; | ||
| return inputNumber == that.inputNumber && policy.equals(that.policy); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() | ||
| { | ||
| return Objects.hash(inputNumber, policy); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() | ||
| { | ||
| return "RestrictedInputNumberDataSource{" + | ||
| "inputNumber=" + inputNumber + | ||
| ", policy=" + policy + "}"; | ||
|
|
||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this isn't equivalent, previously it would always add the taskId to the worker, now it only adds if the worker isn't there, is that ok?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah this looks weird.