Skip to content

Fix a small bug with server metrics parsing + a few code cleanups. #2465

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
chernser merged 3 commits into from
Jun 24, 2025
Merged

Fix a small bug with server metrics parsing + a few code cleanups. #2465

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
8ef626b
Fix bug with incorrect usage of Integer where Long is expected.
avshenuk Jun 23, 2025
6a5d073
Use generic name instead of specific metric name.
avshenuk Jun 23, 2025
ea6f916
Update misleading Javadocs for client side metrics.
avshenuk Jun 23, 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
10 changes: 5 additions & 5 deletions client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/ProcessParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ public class ProcessParser {
};

public static void parseSummary(String text, OperationMetrics metrics) {
Map<String, Integer> map = parse(text == null ? "{}" : text);
Map<String, Long> map = parse(text == null ? "{}" : text);

for (ServerMetrics m : ServerMetrics.values()) {
metrics.updateMetric(m, -1);
}

for (int i = 0; i < SUMMARY_FIELDS.length; i++) {
String field = SUMMARY_FIELDS[i];
Integer value = map.get(field);
Long value = map.get(field);
if (value != null) {
metrics.updateMetric(SUMMARY_METRICS[i], value);
}
}
}


public static Map<String, Integer> parse(String json) {
public static Map<String, Long> parse(String json) {
if (json == null) {
throw new IllegalArgumentException("json is null");
}
Expand All @@ -50,7 +50,7 @@ public static Map<String, Integer> parse(String json) {
throw new IllegalArgumentException("JSON must start with '{' and end with '}'");
}

Map<String, Integer> result = new HashMap<>();
Map<String, Long> result = new HashMap<>();

String content = json.substring(1, json.length() - 1).trim();
if (content.isEmpty()) {
Expand Down Expand Up @@ -79,7 +79,7 @@ public static Map<String, Integer> parse(String json) {
}

try {
int value = Integer.parseInt(valueStr);
long value = Long.parseLong(valueStr);
result.put(key, value);
} catch (NumberFormatException e) {
// ignore error
Expand Down
4 changes: 2 additions & 2 deletions client-v2/src/main/java/com/clickhouse/client/api/internal/Gauge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ public class Gauge implements Metric {

private volatile long value;

public Gauge(long readRows) {
this.value = readRows;
public Gauge(long value) {
this.value = value;
}

public void set(long value) {
Expand Down
4 changes: 2 additions & 2 deletions client-v2/src/main/java/com/clickhouse/client/api/metrics/ClientMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
public enum ClientMetrics {

/**
* Operation duration in nanoseconds.
* Operation duration in milliseconds.
*/
OP_DURATION("client.opDuration"),

/**
* Duration of the operation serialization step in nanoseconds.
* Duration of the operation serialization step in milliseconds.
*/
OP_SERIALIZATION("client.opSerialization");

Expand Down
Loading