Skip to content

Timestamp support #565

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
xerial merged 21 commits into from
May 17, 2021
Merged

Timestamp support #565

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9b47f2a
Add add support for Timestamp type
frsyuki Aug 10, 2017
8a9d84e
Add timestamp tests
xerial May 11, 2021
ad6fb2d
Remove unpackTimestampMillis
xerial May 11, 2021
1bb5af7
Code cleanup
xerial May 11, 2021
b4c1448
Fix timestamp pack overflow
xerial May 11, 2021
5c97c46
Add timestamp value support
xerial May 12, 2021
4beb154
Support timestamp in unpackValue
xerial May 12, 2021
a566e76
Add type cast
xerial May 12, 2021
d8bb62d
Use AirSpec for integration with ScalaCheck
xerial May 12, 2021
28c7843
Fix ValueFactoryTest
xerial May 12, 2021
c20c76d
Use AirSpec for property tests
xerial May 12, 2021
1e4c7a3
Migrate to AirSpec
xerial May 12, 2021
2be647b
Migrate to AirSpec
xerial May 12, 2021
111fe8e
Fix test
xerial May 12, 2021
7d67105
Use plain AirSpec
xerial May 12, 2021
6c0f303
Remove scalatest
xerial May 12, 2021
81a71cd
Remove xerial-core dependency
xerial May 12, 2021
5e83c4a
Remove unnecessary dependencies
xerial May 12, 2021
f7d1d5a
Variable.writeTo roundtrip tests
xerial May 12, 2021
4030459
Use consistent code style
xerial May 12, 2021
02e6b86
Fix comments
xerial May 12, 2021
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
Prev Previous commit
Next Next commit
Remove unpackTimestampMillis
  • Loading branch information
@xerial
xerial committed May 11, 2021
commit ad6fb2de9433c585cd6c9e998a19b08503c68726
35 changes: 3 additions & 32 deletions msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,7 @@ public Instant unpackTimestamp()
}
switch (ext.getLength()) {
case 4: {
int u32 = readInt();
long u32 = readInt() & 0xffffffffL;
return Instant.ofEpochSecond(u32);
}
case 8: {
Expand All @@ -1289,38 +1289,9 @@ public Instant unpackTimestamp()
return Instant.ofEpochSecond(sec, nsec);
}
case 12: {
int nsec = readInt();
long sec = readLong();
return Instant.ofEpochSecond(sec, nsec);
}
default:
throw new MessageFormatException(String.format("Timestamp extension type (%d) expects 4, 8, or 12 bytes of payload but got %d bytes",
EXT_TIMESTAMP, ext.getLength()));
}
}

public long unpackTimestampMillis()
throws IOException
{
ExtensionTypeHeader ext = unpackExtensionTypeHeader();
if (ext.getType() != EXT_TIMESTAMP) {
throw unexpectedExtension("Timestamp", EXT_TIMESTAMP, ext.getType());
}
switch (ext.getLength()) {
case 4: {
int u32 = readInt();
return (u32 & 0xffffffffL) * 1000L;
}
case 8: {
long data64 = readLong();
int nsec = (int) (data64 >>> 34);
long sec = data64 & 0x00000003ffffffffL;
return sec * 1000L + nsec / 1000L;
}
case 12: {
int nsec = readInt();
long nsecU32 = readInt() & 0xffffffffL;
long sec = readLong();
return sec * 1000L + nsec / 1000L;
return Instant.ofEpochSecond(sec, nsecU32);
}
default:
throw new MessageFormatException(String.format("Timestamp extension type (%d) expects 4, 8, or 12 bytes of payload but got %d bytes",
Expand Down