Skip to content
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

feat: convert the influxql result using influxdb format #758

Merged
merged 6 commits into from
Mar 26, 2023

Conversation

Rachelint
Copy link
Contributor

Which issue does this PR close?

Closes #

Rationale for this change

Now, we return the influxql result using our inner format rather than influxdb format, we should modify it to the latter.

What changes are included in this PR?

Convert the influxql result to influxdb format.

Are there any user-facing changes?

Get the influxdb compatible result when using influxql to query data.

How does this change test

Test by ut.

@Rachelint Rachelint marked this pull request as ready for review March 23, 2023 18:41
@Rachelint Rachelint force-pushed the convert-influxql-query-output branch from a42c132 to 2d9282e Compare March 24, 2023 01:18
@Rachelint Rachelint force-pushed the convert-influxql-query-output branch from 2d9282e to 5d40736 Compare March 24, 2023 01:21
@jiacai2050 jiacai2050 self-requested a review March 24, 2023 02:35
@Rachelint Rachelint force-pushed the convert-influxql-query-output branch from 5d40736 to 87d874e Compare March 24, 2023 02:46
@Rachelint Rachelint force-pushed the convert-influxql-query-output branch from 87d874e to 6386b6f Compare March 24, 2023 02:54
@codecov-commenter
Copy link

codecov-commenter commented Mar 24, 2023

Codecov Report

Merging #758 (3d8190f) into main (a5cd313) will increase coverage by 0.26%.
The diff coverage is 89.52%.

❗ Current head 3d8190f differs from pull request most recent head d8047c5. Consider uploading reports for the commit d8047c5 to get more accurate results

@@            Coverage Diff             @@
##             main     #758      +/-   ##
==========================================
+ Coverage   68.18%   68.45%   +0.26%     
==========================================
  Files         296      296              
  Lines       46057    46645     +588     
==========================================
+ Hits        31405    31930     +525     
- Misses      14652    14715      +63     
Impacted Files Coverage Δ
analytic_engine/src/instance/mod.rs 83.33% <ø> (ø)
server/src/handlers/error.rs 0.00% <ø> (ø)
server/src/handlers/query.rs 0.00% <0.00%> (ø)
sql/src/influxql/planner.rs 55.43% <ø> (ø)
tools/src/bin/sst-convert.rs 1.20% <0.00%> (ø)
server/src/handlers/influxdb.rs 77.39% <83.81%> (+10.36%) ⬆️
analytic_engine/src/instance/write.rs 89.24% <92.23%> (+2.29%) ⬆️
analytic_engine/src/instance/flush_compaction.rs 92.68% <95.00%> (+0.04%) ⬆️
common_types/src/row/mod.rs 77.61% <96.66%> (+2.01%) ⬆️
analytic_engine/src/instance/read.rs 78.15% <97.26%> (+3.15%) ⬆️
... and 10 more

... and 8 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

server/src/handlers/influxdb.rs Outdated Show resolved Hide resolved
server/src/handlers/influxdb.rs Outdated Show resolved Hide resolved
server/src/handlers/influxdb.rs Show resolved Hide resolved
server/src/handlers/influxdb.rs Outdated Show resolved Hide resolved
server/src/handlers/influxdb.rs Show resolved Hide resolved
server/src/handlers/influxdb.rs Show resolved Hide resolved
@Rachelint Rachelint force-pushed the convert-influxql-query-output branch from 3947216 to 0829230 Compare March 24, 2023 07:17
@Rachelint Rachelint force-pushed the convert-influxql-query-output branch from 0829230 to 3b6c41b Compare March 24, 2023 07:40
@jiacai2050 jiacai2050 added this pull request to the merge queue Mar 26, 2023
Merged via the queue into apache:main with commit 50471c0 Mar 26, 2023
chunshao90 pushed a commit to chunshao90/ceresdb that referenced this pull request May 15, 2023
* draft.

* add tests.

* fix integration test.

* address CR.

* eliminate the useless else clause.

* refactor convert failure handling

---------

Co-authored-by: jiacai2050 <dev@liujiacai.net>
@Rachelint Rachelint deleted the convert-influxql-query-output branch May 27, 2023 12:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants