Skip to content

Timechart refactoring #490

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

Open
51-code wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Timechart refactoring #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e7634f
Refactor TimechartStep
51-code Jan 29, 2025
99461c5
Refactor TimechartTransformation
51-code Jan 29, 2025
3204bf9
Refactor timechartTransformation to be immutable with span and divByI…
51-code Feb 24, 2025
88d27ac
Remove DefaultSpan, SpanParameter can be initialised with default values
51-code Feb 24, 2025
5214612
Unit tests for SpanParameter and TimeRange
51-code Feb 25, 2025
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
17 changes: 8 additions & 9 deletions src/main/java/com/teragrep/pth10/ast/DPLParserConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
*/
package com.teragrep.pth10.ast;

import com.teragrep.pth10.ast.commands.transformstatement.timechart.span.TimeRange;
import com.teragrep.pth10.ast.time.RelativeTimeParser;
import com.teragrep.pth10.ast.time.RelativeTimestamp;
import org.slf4j.Logger;
Expand All @@ -66,8 +67,6 @@ public class DPLParserConfig {

private Map<String, Object> config = new LinkedHashMap<>();

TimeRange timeRange = TimeRange.ONE_MONTH;

/**
* Get named value from config map
*
Expand Down Expand Up @@ -162,7 +161,7 @@ public void setLatest(String latest) {
* @return enum range values 10s,...,1M
*/
public TimeRange getTimeRange() {
TimeRange rv = TimeRange.ONE_DAY;
TimeRange timeRange = new TimeRange("1 days");
long r = 0;
// Earliest set, latest not
if (config.get("earliest") != null && config.get("latest") == null) {
Expand All @@ -181,21 +180,21 @@ else if (config.get("earliest") != null && config.get("latest") != null) {
r = abs(r);
LOGGER.info("Calculated range=<{}>", r);
if (r <= 15 * 60) {
rv = TimeRange.TEN_SECONDS;
timeRange = new TimeRange("10 seconds");
}
else if (r <= 60 * 60) {
rv = TimeRange.ONE_MINUTE;
timeRange = new TimeRange("1 minutes");
}
else if (r <= 4 * 60 * 60) {
rv = TimeRange.FIVE_MINUTES;
timeRange = new TimeRange("5 minutes");
}
else if (r <= 24 * 60 * 60) {
rv = TimeRange.THIRTY_MINUTES;
timeRange = new TimeRange("30 minutes");
}
else if (r > 30 * 24 * 60 * 60) {
// Default max value is 1 day
rv = TimeRange.ONE_DAY;
timeRange = new TimeRange("1 days");
}
return rv;
return timeRange;
}
}
Loading