Skip to content

Fix UI Query Distribution chart showing zero queries inaccurately #788

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −12
Open

Fix UI Query Distribution chart showing zero queries inaccurately #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion gateway-ha/src/main/java/io/trino/gateway/ha/router/HaQueryHistoryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import io.trino.gateway.ha.persistence.dao.QueryHistoryDao;
import org.jdbi.v3.core.Jdbi;

import java.math.BigDecimal;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
Expand Down Expand Up @@ -144,7 +145,7 @@ public List<DistributionResponse.LineChart> findDistribution(Long ts)
List<DistributionResponse.LineChart> resList = new ArrayList<>();
for (Map<String, Object> model : results) {
DistributionResponse.LineChart lineChart = new DistributionResponse.LineChart();
long minute = (long) Float.parseFloat(model.get("minute").toString());
long minute = new BigDecimal(model.get("minute").toString()).longValue();
Instant instant = Instant.ofEpochSecond(minute * 60L);
LocalDateTime dateTime = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
Expand Down
24 changes: 13 additions & 11 deletions gateway-ha/src/test/java/io/trino/gateway/ha/router/BaseTestQueryHistoryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.testcontainers.containers.JdbcDatabaseContainer;

import java.math.BigDecimal;
import java.util.List;
import java.util.Optional;

Expand Down Expand Up @@ -117,16 +118,17 @@ void testFindDistribution()
@Test
void testTimestampParsing()
{
long result = 30338640;

// postgres: minute -> {Double@9333} 3.033864E7
String postgresTimestamp = "3.033864E7";
long parsedLongTimestamp = (long) Float.parseFloat(postgresTimestamp);
assertThat(parsedLongTimestamp).isEqualTo(result);

// mysql: minute -> {BigDecimal@9775} "30338640"
String mysqlTimestamp = "30338640";
long parsedLongTimestamp2 = (long) Float.parseFloat(mysqlTimestamp);
assertThat(parsedLongTimestamp2).isEqualTo(result);
// This ensures odd-minute values remain precision when converted from different formats.
long expectedMinuteBucket = 30338641;

// postgres: minute -> {Double@9333} 3.0338641E7
String postgresTimestamp = "3.0338641E7";
long parsedPostgresMinute = new BigDecimal(postgresTimestamp).longValue();
assertThat(parsedPostgresMinute).isEqualTo(expectedMinuteBucket);

// mysql: minute -> {BigDecimal@9775} "30338641"
String mysqlTimestamp = "30338641";
long parsedMysqlMinute = new BigDecimal(mysqlTimestamp).longValue();
assertThat(parsedMysqlMinute).isEqualTo(expectedMinuteBucket);
}
}