Skip to content

fix: Fix support for InfluxDB 1.8.x in InfluxQLQueryAPI #459

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.

Sign up for GitHub

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
merged 3 commits into from
Oct 26, 2022
Merged

fix: Fix support for InfluxDB 1.8.x in InfluxQLQueryAPI #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bfbe4b
fix: Fix support for InfluxDB 1.x in InfluxQLQueryAPI (#458)
btasker Oct 25, 2022
10dd562
chore: Update changelog
btasker Oct 25, 2022
f748c64
chore: add test
btasker Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
1. [#439](https://github.com/influxdata/influxdb-client-java/pull/439): Add `FluxRecord.getRow()` which stores response data in a list
1. [#457](https://github.com/influxdata/influxdb-client-java/pull/457): Add possibility to use `AuthorizationPostRequest` and `AuthorizationUpdateRequest` in `AuthorizationApi`

### Bug Fixes
1. [#459](https://github.com/influxdata/influxdb-client-java/pull/459): Fix support for InfluxDB 1.8.x in InfluxQLQueryAPI

### Dependencies

1. [#446](https://github.com/influxdata/influxdb-client-java/pull/446): Remove `gson-fire`
Expand Down
7 changes: 4 additions & 3 deletions client/src/generated/java/com/influxdb/client/service/InfluxQLQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ public interface InfluxQLQueryService {
* @param zapTraceSpan OpenTracing span context (optional)
* @return response in csv format
*/
@Headers({"Accept:application/csv", "Content-Type:application/vnd.influxql"})
@Headers({"Accept:application/csv", "Content-Type:application/x-www-form-urlencoded"})
@FormUrlEncoded
@POST("query")
Call<ResponseBody> query(
@Body String query,
@Field("q") String query,
@Nonnull @Query("db") String db,
@Query("rp") String retentionPolicy,
@Query("epoch") String epoch,
@Header("Zap-Trace-Span") String zapTraceSpan
);
}
}
23 changes: 23 additions & 0 deletions client/src/test/java/com/influxdb/client/ITInfluxQLQueryApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,29 @@ void testSelectAll() {
});
}

@Test
void testInfluxDB18() {
// create database
String db = "testing_database";
influxDBQuery("CREATE DATABASE " + db, db);

// connect to InfluxDB 1.8
influxDBClient.close();
influxDBClient = InfluxDBClientFactory.createV1(getInfluxDbUrl(), "username", "password".toCharArray(),
db, "autogen");
influxQLQueryApi = influxDBClient.getInfluxQLQueryApi();

// test query to InfluxDB 1.8
InfluxQLQueryResult result = influxQLQueryApi.query(new InfluxQLQuery("SHOW DATABASES", db));
assertSingleSeriesRecords(result)
.map(record -> record.getValueByKey("name"))
.contains(db);


// drop database
influxDBQuery("DROP DATABASE " + db, db);
}

private ListAssert<InfluxQLQueryResult.Series.Record> assertSingleSeriesRecords(InfluxQLQueryResult result) {
return Assertions.assertThat(result)
.extracting(InfluxQLQueryResult::getResults, list(InfluxQLQueryResult.Result.class))
Expand Down