Conversation
Codecov Report
@@ Coverage Diff @@
## master #286 +/- ##
============================================
- Coverage 89.71% 88.85% -0.86%
Complexity 473 473
============================================
Files 149 149
Lines 5913 5987 +74
Branches 283 289 +6
============================================
+ Hits 5305 5320 +15
- Misses 524 581 +57
- Partials 84 86 +2
Continue to review full report at Codecov.
|
bednar
requested changes
Dec 10, 2021
Contributor
bednar
left a comment
bednar
left a comment
There was a problem hiding this comment.
Thanks for your PR 👍. There are a few requirements that must be be satisfy before we accept the PR:
- Add note to the following APIs how to use query parameters in
Queryobject:com.influxdb.client.scala.QueryScalaApicom.influxdb.client.kotlin.QueryKotlinApi
- Add possibility to use
Queryobject incom.influxdb.client.reactive.QueryReactiveApi
and also:
Comment on lines
+1
to
+70
| package example; | ||
|
|
||
| import java.time.Instant; | ||
| import java.time.Period; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import com.influxdb.client.InfluxDBClient; | ||
| import com.influxdb.client.InfluxDBClientFactory; | ||
| import com.influxdb.client.QueryApi; | ||
| import com.influxdb.client.WriteApi; | ||
| import com.influxdb.client.domain.WritePrecision; | ||
| import com.influxdb.client.write.Point; | ||
| import com.influxdb.query.FluxTable; | ||
|
|
||
| public class ParameterizedQuery { | ||
|
|
||
| public static void main(String[] args) { | ||
|
|
||
| String url = System.getenv("INFLUX_URL"); | ||
| String token = System.getenv("INFLUX_TOKEN"); | ||
| String org = System.getenv("INFLUX_ORG"); | ||
| String bucket = System.getenv("INFLUX_BUCKET"); | ||
|
|
||
| InfluxDBClient client = InfluxDBClientFactory.create(url, | ||
| token.toCharArray(), | ||
| org, bucket); | ||
|
|
||
| WriteApi writeApi = client.makeWriteApi(); | ||
|
|
||
| Instant yesterday = Instant.now().minus(Period.ofDays(1)); | ||
|
|
||
| Point p = Point.measurement("temperature") | ||
| .addTag("location", "north") | ||
| .addField("value", 60.0) | ||
| .time(yesterday, WritePrecision.NS); | ||
|
|
||
| writeApi.writePoint(p); | ||
|
|
||
| writeApi.close(); | ||
|
|
||
| // | ||
| // Query range start parameter using Instant | ||
| // | ||
| QueryApi queryApi = client.getQueryApi(); | ||
| Map<String, Object> params = new HashMap<>(); | ||
| params.put("bucketParam", bucket); | ||
| params.put("startParam", yesterday.toString()); | ||
|
|
||
| String parametrizedQuery = "from(bucket: params.bucketParam) |> range(start: time(v: params.startParam))"; | ||
| List<FluxTable> query = queryApi.query(parametrizedQuery, org, params); | ||
| query.forEach(fluxTable -> fluxTable.getRecords() | ||
| .forEach(r -> System.out.println(r.getTime() + ": " + r.getValueByKey("_value")))); | ||
|
|
||
| // | ||
| // Query range start parameter using duration | ||
| // | ||
| params = new HashMap<>(); | ||
| params.put("bucketParam", bucket); | ||
| params.put("startParam", "-1d10s"); | ||
| parametrizedQuery = "from(bucket: params.bucketParam) |> range(start: duration(v: params.startParam))"; | ||
| query = queryApi.query(parametrizedQuery, org, params); | ||
| query.forEach(fluxTable -> fluxTable.getRecords() | ||
| .forEach(r -> System.out.println(r.getTime() + ": " + r.getValueByKey("_value")))); | ||
|
|
||
| client.close(); | ||
|
|
||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Add link to this example into examples/README.md.
Comment on lines
+600
to
+606
| <M> void query(@Nonnull final String query, | ||
| @Nonnull final String org, | ||
| @Nonnull final Class<M> measurementType, | ||
| @Nonnull final BiConsumer<Cancellable, M> onNext, | ||
| @Nonnull final Consumer<? super Throwable> onError, | ||
| @Nonnull final Runnable onComplete, | ||
| @Nullable final Map<String, Object> params); |
Comment on lines
+174
to
+210
| @Override | ||
|
|
||
| @Override |
| query.forEach(fluxTable -> fluxTable.getRecords() | ||
| .forEach(r -> System.out.println(r.getTime() + ": " + r.getValueByKey("_value")))); | ||
|
|
||
| client.close(); |
Contributor
There was a problem hiding this comment.
Use try-catch instead of close().
Comment on lines
+369
to
+372
| String url = System.getenv("INFLUX_URL"); | ||
| String token = System.getenv("INFLUX_TOKEN"); | ||
| String org = System.getenv("INFLUX_ORG"); | ||
| String bucket = System.getenv("INFLUX_BUCKET"); |
Contributor
There was a problem hiding this comment.
Use default credentials: "http://localhost:8086", "my-token", ...
Comment on lines
+42
to
+45
| String url = System.getenv("INFLUX_URL"); | ||
| String token = System.getenv("INFLUX_TOKEN"); | ||
| String org = System.getenv("INFLUX_ORG"); | ||
| String bucket = System.getenv("INFLUX_BUCKET"); |
Contributor
There was a problem hiding this comment.
Use default credentials: "http://localhost:8086", "my-token", ...
bednar
requested changes
Dec 13, 2021
Contributor
bednar
left a comment
bednar
left a comment
There was a problem hiding this comment.
Add possibility to use Query object in com.influxdb.client.reactive.QueryReactiveApi.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Proposed Changes
This PR implements support for Parameterized Queries for InfluxDB Cloud.
https://docs.influxdata.com/influxdb/cloud/query-data/parameterized-queries
Checklist
mvn testcompletes successfully