generated from amazon-archives/__template_Custom
-
Notifications
You must be signed in to change notification settings - Fork 179
Enable Table Function and PromQL function #1719
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
vamsimanohar
merged 2 commits into
opensearch-project:main
from
vamsimanohar:enable-table-function
Jun 15, 2023
+598
−15
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
117 changes: 117 additions & 0 deletions
117
...opensearch/sql/prometheus/functions/response/DefaultQueryRangeFunctionResponseHandle.java
This file contains hidden or 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,117 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.opensearch.sql.prometheus.functions.response; | ||
|
|
||
| import static org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants.VALUE; | ||
|
|
||
| import java.time.Instant; | ||
| import java.util.ArrayList; | ||
| import java.util.Iterator; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.List; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.json.JSONArray; | ||
| import org.json.JSONObject; | ||
| import org.opensearch.sql.data.model.ExprDoubleValue; | ||
| import org.opensearch.sql.data.model.ExprStringValue; | ||
| import org.opensearch.sql.data.model.ExprTimestampValue; | ||
| import org.opensearch.sql.data.model.ExprTupleValue; | ||
| import org.opensearch.sql.data.model.ExprValue; | ||
| import org.opensearch.sql.data.type.ExprCoreType; | ||
| import org.opensearch.sql.executor.ExecutionEngine; | ||
| import org.opensearch.sql.prometheus.data.constants.PrometheusFieldConstants; | ||
|
|
||
| /** | ||
| * Default implementation of QueryRangeFunctionResponseHandle. | ||
| */ | ||
| public class DefaultQueryRangeFunctionResponseHandle implements QueryRangeFunctionResponseHandle { | ||
|
|
||
| private final JSONObject responseObject; | ||
| private Iterator<ExprValue> responseIterator; | ||
| private ExecutionEngine.Schema schema; | ||
|
|
||
| /** | ||
| * Constructor. | ||
| * | ||
| * @param responseObject Prometheus responseObject. | ||
| */ | ||
| public DefaultQueryRangeFunctionResponseHandle(JSONObject responseObject) { | ||
| this.responseObject = responseObject; | ||
| constructIteratorAndSchema(); | ||
| } | ||
|
|
||
| private void constructIteratorAndSchema() { | ||
| List<ExprValue> result = new ArrayList<>(); | ||
| List<ExecutionEngine.Schema.Column> columnList = new ArrayList<>(); | ||
| if ("matrix".equals(responseObject.getString("resultType"))) { | ||
| JSONArray itemArray = responseObject.getJSONArray("result"); | ||
| for (int i = 0; i < itemArray.length(); i++) { | ||
| JSONObject item = itemArray.getJSONObject(i); | ||
| JSONObject metric = item.getJSONObject("metric"); | ||
| JSONArray values = item.getJSONArray("values"); | ||
| if (i == 0) { | ||
| columnList = getColumnList(metric); | ||
| } | ||
| for (int j = 0; j < values.length(); j++) { | ||
| LinkedHashMap<String, ExprValue> linkedHashMap = | ||
| extractRow(metric, values.getJSONArray(j), columnList); | ||
| result.add(new ExprTupleValue(linkedHashMap)); | ||
| } | ||
| } | ||
| } else { | ||
| throw new RuntimeException(String.format("Unexpected Result Type: %s during Prometheus " | ||
| + "Response Parsing. 'matrix' resultType is expected", | ||
| responseObject.getString("resultType"))); | ||
| } | ||
| this.schema = new ExecutionEngine.Schema(columnList); | ||
| this.responseIterator = result.iterator(); | ||
| } | ||
|
|
||
| @NotNull | ||
| private static LinkedHashMap<String, ExprValue> extractRow(JSONObject metric, | ||
| JSONArray values, List<ExecutionEngine.Schema.Column> columnList) { | ||
| LinkedHashMap<String, ExprValue> linkedHashMap = new LinkedHashMap<>(); | ||
| for (ExecutionEngine.Schema.Column column : columnList) { | ||
| if (PrometheusFieldConstants.TIMESTAMP.equals(column.getName())) { | ||
| linkedHashMap.put(PrometheusFieldConstants.TIMESTAMP, | ||
| new ExprTimestampValue(Instant.ofEpochMilli((long) (values.getDouble(0) * 1000)))); | ||
| } else if (column.getName().equals(VALUE)) { | ||
| linkedHashMap.put(VALUE, new ExprDoubleValue(values.getDouble(1))); | ||
| } else { | ||
| linkedHashMap.put(column.getName(), | ||
| new ExprStringValue(metric.getString(column.getName()))); | ||
| } | ||
| } | ||
| return linkedHashMap; | ||
| } | ||
|
|
||
|
|
||
| private List<ExecutionEngine.Schema.Column> getColumnList(JSONObject metric) { | ||
| List<ExecutionEngine.Schema.Column> columnList = new ArrayList<>(); | ||
| columnList.add(new ExecutionEngine.Schema.Column(PrometheusFieldConstants.TIMESTAMP, | ||
| PrometheusFieldConstants.TIMESTAMP, ExprCoreType.TIMESTAMP)); | ||
| columnList.add(new ExecutionEngine.Schema.Column(VALUE, VALUE, ExprCoreType.DOUBLE)); | ||
| for (String key : metric.keySet()) { | ||
| columnList.add(new ExecutionEngine.Schema.Column(key, key, ExprCoreType.STRING)); | ||
| } | ||
| return columnList; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasNext() { | ||
| return responseIterator.hasNext(); | ||
| } | ||
|
|
||
| @Override | ||
| public ExprValue next() { | ||
| return responseIterator.next(); | ||
| } | ||
|
|
||
| @Override | ||
| public ExecutionEngine.Schema schema() { | ||
| return schema; | ||
| } | ||
| } |
31 changes: 31 additions & 0 deletions
31
...va/org/opensearch/sql/prometheus/functions/response/QueryRangeFunctionResponseHandle.java
This file contains hidden or 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,31 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.opensearch.sql.prometheus.functions.response; | ||
|
|
||
| import org.opensearch.sql.data.model.ExprValue; | ||
| import org.opensearch.sql.executor.ExecutionEngine; | ||
|
|
||
| /** | ||
| * Handle Prometheus response. | ||
| */ | ||
| public interface QueryRangeFunctionResponseHandle { | ||
|
|
||
| /** | ||
| * Return true if Prometheus response has more result. | ||
| */ | ||
| boolean hasNext(); | ||
|
|
||
| /** | ||
| * Return Prometheus response as {@link ExprValue}. Attention, the method must been called when | ||
| * hasNext return true. | ||
| */ | ||
| ExprValue next(); | ||
|
|
||
| /** | ||
| * Return ExecutionEngine.Schema of the Prometheus response. | ||
| */ | ||
| ExecutionEngine.Schema schema(); | ||
| } |
38 changes: 38 additions & 0 deletions
38
...java/org/opensearch/sql/prometheus/functions/scan/QueryRangeFunctionTableScanBuilder.java
This file contains hidden or 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,38 @@ | ||
| /* | ||
| * | ||
| * * Copyright OpenSearch Contributors | ||
| * * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| */ | ||
|
|
||
| package org.opensearch.sql.prometheus.functions.scan; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import org.opensearch.sql.planner.logical.LogicalProject; | ||
| import org.opensearch.sql.prometheus.client.PrometheusClient; | ||
| import org.opensearch.sql.prometheus.request.PrometheusQueryRequest; | ||
| import org.opensearch.sql.storage.TableScanOperator; | ||
| import org.opensearch.sql.storage.read.TableScanBuilder; | ||
|
|
||
| /** | ||
| * TableScanBuilder for query_range table function of prometheus connector. | ||
| * we can merge this when we refactor for existing | ||
| * ppl queries based on prometheus connector. | ||
| */ | ||
| @AllArgsConstructor | ||
| public class QueryRangeFunctionTableScanBuilder extends TableScanBuilder { | ||
|
|
||
| private final PrometheusClient prometheusClient; | ||
|
|
||
| private final PrometheusQueryRequest prometheusQueryRequest; | ||
|
|
||
| @Override | ||
| public TableScanOperator build() { | ||
| return new QueryRangeFunctionTableScanOperator(prometheusClient, prometheusQueryRequest); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean pushDownProject(LogicalProject project) { | ||
| return true; | ||
| } | ||
| } |
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.
When
argNamecould benull? Are you protected from NPE when it is used?