Skip to content

feat: extend flux-dsl#373

Merged
bednar merged 4 commits intoinfluxdata:masterfrom
Andy2003:feature/extend-flux-dsl
Jul 8, 2022
Merged

feat: extend flux-dsl#373
bednar merged 4 commits intoinfluxdata:masterfrom
Andy2003:feature/extend-flux-dsl

Conversation

@Andy2003
Copy link
Copy Markdown
Contributor

@Andy2003 Andy2003 commented Jul 5, 2022

Proposed Changes

  • Add ability to define imports for each flux function
  • Add ability use multiple flux expressions
  • Add ability to define custom functions
  • Improve join flux, so it can be nested
  • Add missing parameter variants for RangeFlux amd AggregateWindow
  • Add TruncateTimeColumnFlux
  • Add ArrayFromFlux
  • Add UnionFlux

Checklist

  • CHANGELOG.md updated
  • Rebased/mergeable
  • A test has been added if appropriate
  • mvn test completes successfully
  • Commit messages are conventional
  • Sign CLA (if not already signed)

* Add ability to define imports for each flux function
* Add ability use multiple flux expressions
* Add ability to define custom functions
* Improve join flux, so it can be nested
* Add missing parameter variants for RangeFlux amd AggregateWindow
* Add TruncateTimeColumnFlux
@Andy2003 Andy2003 force-pushed the feature/extend-flux-dsl branch from 8b4a6df to 72f0fd8 Compare July 5, 2022 09:26
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Jul 5, 2022

Codecov Report

Merging #373 (95326cf) into master (e7597e1) will increase coverage by 0.58%.
The diff coverage is 87.70%.

@@             Coverage Diff              @@
##             master     #373      +/-   ##
============================================
+ Coverage     89.02%   89.60%   +0.58%     
- Complexity      636      721      +85     
============================================
  Files           156      166      +10     
  Lines          6358     6573     +215     
  Branches        305      326      +21     
============================================
+ Hits           5660     5890     +230     
+ Misses          612      591      -21     
- Partials         86       92       +6     
Impacted Files Coverage Δ
...ava/com/influxdb/query/dsl/functions/DropFlux.java 100.00% <ø> (ø)
.../influxdb/query/dsl/functions/AggregateWindow.java 88.23% <42.85%> (-11.77%) ⬇️
...ava/com/influxdb/query/dsl/VariableAssignment.java 62.50% <62.50%> (ø)
.../main/java/com/influxdb/query/dsl/Expressions.java 68.00% <68.00%> (ø)
.../query/dsl/functions/AbstractFunctionCallFlux.java 70.00% <70.00%> (ø)
...luxdb/query/dsl/functions/FreestyleExpression.java 80.00% <80.00%> (ø)
...uxdb/query/dsl/functions/AbstractFunctionFlux.java 91.83% <91.83%> (ø)
.../dsl/functions/properties/FunctionsParameters.java 87.27% <93.33%> (+1.70%) ⬆️
...dsl/src/main/java/com/influxdb/query/dsl/Flux.java 98.07% <96.29%> (+1.92%) ⬆️
.../query/dsl/functions/AbstractFluxWithUpstream.java 100.00% <100.00%> (+7.69%) ⬆️
... and 12 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e7597e1...95326cf. Read the comment docs.

Copy link
Copy Markdown
Contributor

@bednar bednar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @Andy2003, thanks for your PR 👍

Can you satisfy following requirements:

  1. Add new functions into flux-dsl/README.md:
    • InterpolateLinearFlux
    • TruncateTimeColumnFlux
  2. Add description how to use the imports into flux-dsl/README.md
  3. Add description how to use the AbstractFunctionFlux into flux-dsl/README.md

and also:

Comment thread flux-dsl/src/main/java/com/influxdb/query/dsl/Flux.java Outdated
Comment thread flux-dsl/src/main/java/com/influxdb/query/dsl/Flux.java Outdated
Comment thread flux-dsl/src/main/java/com/influxdb/query/dsl/HasImports.java
Comment thread flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RangeFlux.java Outdated
Comment thread flux-dsl/src/main/java/com/influxdb/query/dsl/functions/RangeFlux.java Outdated
* Add ability to define imports for each flux function [FluxDSL]
* Add ability use multiple flux expressions [FluxDSL]
* Add ability to define custom functions [FluxDSL]
* Improve join flux, so it can be nested [FluxDSL]
* Add missing parameter variants for RangeFlux amd AggregateWindow [FluxDSL]
* Add TruncateTimeColumnFlux [FluxDSL]
* Add ArrayFromFlux [FluxDSL]
* Add UnionFlux [FluxDSL]
@Andy2003 Andy2003 requested a review from bednar July 5, 2022 20:46
Comment thread flux-dsl/README.md Outdated
Copy link
Copy Markdown
Contributor

@bednar bednar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGMT 🚀

Thanks again for your PR 👍. From my POV is ready to merge into master. Do you want to continue in work or it is done?

@Andy2003
Copy link
Copy Markdown
Contributor Author

Andy2003 commented Jul 8, 2022

Do you want to continue in work or it is done?

No it's all done, please merge!

@bednar bednar merged commit 5eeb524 into influxdata:master Jul 8, 2022
@bednar bednar added this to the 6.4.0 milestone Jul 8, 2022
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