Skip to content
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

Convert "FindOperationTest" to not use ValidatingBridge #677

Merged
merged 19 commits into from
Nov 28, 2023
+734 −1,291
Merged

Convert "FindOperationTest" to not use ValidatingBridge #677

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8526747
Convert 2nd test method of FindOperationTest; not passing yet
tatu-at-datastax Nov 22, 2023
541eada
Fix the converted test
tatu-at-datastax Nov 22, 2023
b8315c1
Convert more: 4 done
tatu-at-datastax Nov 22, 2023
2359203
Converted 5th test
tatu-at-datastax Nov 22, 2023
1bdf5cb
Convert 2 more test methods
tatu-at-datastax Nov 23, 2023
bff4046
Now 10/27 test methods converted
tatu-at-datastax Nov 23, 2023
85a343f
Passing 12 tests now
tatu-at-datastax Nov 23, 2023
16fd98a
Add 2 more converted tests, but these ones fail and are left @Disabled
tatu-at-datastax Nov 23, 2023
128b5b4
Merge branch 'main' into tatu/v2-3003-convert-insert-oper-test
tatu-at-datastax Nov 27, 2023
9850e12
Uncomment failing test (to show fail in IT)
tatu-at-datastax Nov 27, 2023
df3ffc7
Convert one more method
tatu-at-datastax Nov 27, 2023
8200ca1
One more converted method
tatu-at-datastax Nov 27, 2023
34af386
One more conversion
tatu-at-datastax Nov 27, 2023
974acbb
One more conversio
tatu-at-datastax Nov 27, 2023
df30ee3
One more conversion
tatu-at-datastax Nov 27, 2023
67ab0fe
Remove duplicate tests, conver one
tatu-at-datastax Nov 27, 2023
bb53a34
Convert last test methods: now 17/20 enabled
tatu-at-datastax Nov 27, 2023
8f969fc
Minor cleanup
tatu-at-datastax Nov 27, 2023
28abf97
Change use of `java.util.Date` into `java.time.Instant` for converted…
tatu-at-datastax Nov 28, 2023
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
2 changes: 2 additions & 0 deletions src/main/java/io/stargate/sgv2/jsonapi/service/shredding/model/DocValueHasher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ public DocValueHash getHash(Object value) {
return numberValue((BigDecimal) value).hash();
} else if (value instanceof Boolean) {
return booleanValue((Boolean) value).hash();
} else if (value instanceof Date) {
tatu-at-datastax marked this conversation as resolved.
Show resolved Hide resolved
return timestampValue((Date) value).hash();
} else if (value instanceof Instant) {
return timestampValue(new Date(((Instant) value).toEpochMilli())).hash();
} else if (value instanceof List) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/stargate/sgv2/jsonapi/service/operation/model/impl/CountOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class CountOperationTest extends OperationTestBase {
@Nested
class Execute {
private final ColumnDefinitions COUNT_RESULT_COLUMNS =
buildColumnDefs(Arrays.asList(TestColumn.ofLong("count")));
buildColumnDefs(TestColumn.ofLong("count"));

@Test
public void countWithNoFilter() {
Expand Down
Loading