Skip to content

use Number instead of long for response context #8342

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
gianm merged 4 commits into from
Aug 21, 2019
Merged

use Number instead of long for response context #8342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4293106
use Number instead of long for response context to be forgiving of js…
clintropolis Aug 19, 2019
76bcc39
test that encounters issue without fix
clintropolis Aug 20, 2019
932d72e
now with more test
clintropolis Aug 20, 2019
bf616cd
is ints
clintropolis Aug 20, 2019
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
4 changes: 2 additions & 2 deletions processing/src/main/java/org/apache/druid/query/context/ResponseContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public enum Key implements BaseKey
*/
NUM_SCANNED_ROWS(
"count",
(oldValue, newValue) -> (long) oldValue + (long) newValue
(oldValue, newValue) -> ((Number) oldValue).longValue() + ((Number) newValue).longValue()
),
/**
* The total CPU time for threads related to Sequence processing of the query.
Expand All @@ -159,7 +159,7 @@ public enum Key implements BaseKey
*/
CPU_CONSUMED_NANOS(
"cpuConsumed",
(oldValue, newValue) -> (long) oldValue + (long) newValue
(oldValue, newValue) -> ((Number) oldValue).longValue() + ((Number) newValue).longValue()
),
/**
* Indicates if a {@link ResponseContext} was truncated during serialization.
Expand Down
13 changes: 12 additions & 1 deletion processing/src/test/java/org/apache/druid/query/context/ResponseContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,22 @@ public void deserializeTest() throws IOException
{
final DefaultObjectMapper mapper = new DefaultObjectMapper();
final ResponseContext ctx = ResponseContext.deserialize(
mapper.writeValueAsString(ImmutableMap.of("ETag", "string-value", "count", 100)),
mapper.writeValueAsString(
ImmutableMap.of(
"ETag", "string-value",
"count", 100L,
"cpuConsumed", 100000L
)
),
mapper
);
Assert.assertEquals("string-value", ctx.get(ResponseContext.Key.ETAG));
Assert.assertEquals(100, ctx.get(ResponseContext.Key.NUM_SCANNED_ROWS));
Assert.assertEquals(100000, ctx.get(ResponseContext.Key.CPU_CONSUMED_NANOS));
ctx.add(ResponseContext.Key.NUM_SCANNED_ROWS, 10L);
Assert.assertEquals(110L, ctx.get(ResponseContext.Key.NUM_SCANNED_ROWS));
Copy link
Copy Markdown
Contributor

@ccaominh ccaominh Aug 20, 2019

Choose a reason for hiding this comment

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

Is it possible to add a similar assert for CPU_CONSUMED_NANOS?

Copy link
Copy Markdown
Member Author

@clintropolis clintropolis Aug 20, 2019

Choose a reason for hiding this comment

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

the code is equivalent making a test sort of redundant, but yes anything is possible.

Copy link
Copy Markdown
Contributor

@gianm gianm Aug 21, 2019

Choose a reason for hiding this comment

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

It's still useful as a regression test, IMO.

ctx.add(ResponseContext.Key.CPU_CONSUMED_NANOS, 100);
Assert.assertEquals(100100L, ctx.get(ResponseContext.Key.CPU_CONSUMED_NANOS));
}

@Test(expected = IllegalStateException.class)
Expand Down