Skip to content

Fix encoding of negative fractional TIME values #1772

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

Fix encoding of negative fractional TIME values #1772

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
18 changes: 6 additions & 12 deletions vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/datatype/DataTypeCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,17 +387,17 @@ private static void binaryEncodeTime(LocalTime value, ByteBuf buffer) {
}

private static void binaryEncodeTime(Duration value, ByteBuf buffer) {
long secondsOfDuration = value.getSeconds();
int nanosOfDuration = value.getNano();
if (secondsOfDuration == 0 && nanosOfDuration == 0) {
if (value.isZero()) {
buffer.writeByte(0);
return;
}
byte isNegative = 0;
if (secondsOfDuration < 0) {
if (value.isNegative()) {
isNegative = 1;
secondsOfDuration = -secondsOfDuration;
value = value.negated();
}
long secondsOfDuration = value.getSeconds();
int nanosOfDuration = value.getNano();

int days = (int) (secondsOfDuration / 86400);
int secondsOfADay = (int) (secondsOfDuration % 86400);
Expand All @@ -415,13 +415,7 @@ private static void binaryEncodeTime(Duration value, ByteBuf buffer) {
return;
}

int microSecond;
if (isNegative == 1 && nanosOfDuration > 0) {
second = second - 1;
microSecond = (1000_000_000 - nanosOfDuration) / 1000;
} else {
microSecond = nanosOfDuration / 1000;
}
int microSecond = nanosOfDuration / 1000;

buffer.writeByte(12);
buffer.writeByte(isNegative);
Expand Down
5 changes: 5 additions & 0 deletions ...x-mysql-client/src/test/java/io/vertx/tests/mysqlclient/data/DateTimeBinaryCodecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ public void testEncodeFractionalSecondsPart(TestContext ctx) {
testEncodeTime(ctx, Duration.ofHours(11).plusMinutes(12).plusNanos(123456000), Duration.ofHours(11).plusMinutes(12).plusNanos(123456000));
}

@Test
public void testEncodeNegativeFractionalSecondsPart(TestContext ctx) {
testEncodeTime(ctx, Duration.ofSeconds(-59).minusMillis(500), Duration.ofSeconds(-59).minusMillis(500));
}

@Test
public void testEncodeTimeFromLocalTimeWithFractionalSecondsPart(TestContext ctx) {
testEncodeTime(ctx, LocalTime.of(11, 12, 0, 123456000), Duration.ofHours(11).plusMinutes(12).plusNanos(123456000), LocalTime.of(11, 12, 0, 123456000));
Expand Down