natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.0' into trunk

This commit is contained in:
Brandon Williams 2022-03-23 09:22:47 -05:00
parent 0040fea379 4f5feac0df
commit a64e218d0f
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -113,6 +113,7 @@
* GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651)
* Update JNA library to 5.9.0 and snappy-java to version 1.1.8.4 (CASSANDRA-17040)
Merged from 4.0:
* Fix timestamp tz parsing (CASSANDRA-17467)
* Suppress CVE-2021-44521 from driver (CASSANDRA-17459)
* Upgrade jackson to 2.13.2 (CASSANDRA-17460)
* Make sstableloader honour native port option (CASSANDRA-17210)

5
src/java/org/apache/cassandra/serializers/TimestampSerializer.java
View File

@ -55,9 +55,10 @@ public class TimestampSerializer extends TypeSerializer<Date>
final String[] offsetFormats = new String[]
{
" z",
"X",
" zzzz",
"XXX"
" X",
"X",
"XXX",
};
for (String dateTimeFormat: dateTimeFormats)

4
test/unit/org/apache/cassandra/serializers/TimestampSerializerTest.java
View File

@ -129,7 +129,11 @@ public class TimestampSerializerTest
final long cstOffset = 6 * ONE_HOUR;
validateStringTimestamp("1970-01-01 00:00:00 Central Standard Time", cstOffset);
validateStringTimestamp("1970-01-01 00:00:00 CST", cstOffset);
validateStringTimestamp("1970-01-01 00:00:00 -0600", cstOffset);
validateStringTimestamp("1970-01-01 00:00:00-0600", cstOffset);
validateStringTimestamp("1970-01-01T00:00:00 GMT-06:00", cstOffset);
validateStringTimestamp("1970-01-01T00:00:00 -0600", cstOffset);
validateStringTimestamp("1970-01-01T00:00:00-0600", cstOffset);
}
@Test