FMWK-79 Support native Aerospike Key types (false by default) #660
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… with a flag (false by default)
# Conflicts: # src/main/java/org/springframework/data/aerospike/config/AerospikeDataSettings.java
…r store as it is if the type is natively supported
reugn
reviewed
Nov 23, 2023
| @@ -15,10 +16,31 @@ public static KeyAssert assertThat(Key key) { | |||
| } | |||
|
|
|||
| @SuppressWarnings("UnusedReturnValue") | |||
| public KeyAssert consistsOf(String namespace, String setName, Object userKey) { | |||
| public KeyAssert consistsOf(AerospikeDataSettings aerospikeDataSettings, String namespace, String setName, | |||
| Object expectedUserKey) { | |||
| Assertions.assertThat(actual.namespace).isEqualTo(namespace); | |||
There was a problem hiding this comment.
Replace this assertj (shouldn't be used in production code) call with something like:
if (!actual.namespace.equals(namespace)) {
throw new IllegalArgumentException("Inconsistent namespace name");
}| @@ -15,10 +16,31 @@ public static KeyAssert assertThat(Key key) { | |||
| } | |||
|
|
|||
| @SuppressWarnings("UnusedReturnValue") | |||
| public KeyAssert consistsOf(String namespace, String setName, Object userKey) { | |||
| public KeyAssert consistsOf(AerospikeDataSettings aerospikeDataSettings, String namespace, String setName, | |||
| Object expectedUserKey) { | |||
| Assertions.assertThat(actual.namespace).isEqualTo(namespace); | |||
| Assertions.assertThat(actual.setName).isEqualTo(setName); | |||
| } else { | ||
| // String type is used for unsupported Aerospike key types and previously for all key types in older | ||
| // versions of Spring Data Aerospike | ||
| Assertions.assertThat(checkIfActualUserKeyTypeIsString()).isTrue(); |
There was a problem hiding this comment.
Use
/*org.springframework.util.*/Assert.isTrue(checkIfActualUserKeyTypeIsString(), "Key type is not string");instead.
| return Optional.of(new Key(data.getNamespace(), setName, id)); | ||
|
|
||
| // Store record key as it is (if Aerospike supports it natively and configured) | ||
| if (aerospikeDataSettings.isKeepOriginalKeyTypes() && |
There was a problem hiding this comment.
Take the && operator to the new line
Comment on lines
123
to
128
| String setName; | ||
| if (data.getSetName() != null) { | ||
| setName = data.getSetName(); | ||
| } else { | ||
| setName = entity.getSetName(); | ||
| } |
There was a problem hiding this comment.
nit: can be simplified with
String setName = Optional.ofNullable(data.getSetName()).orElse(entity.getSetName());| return new Key(namespace, set, (byte[]) userKey); | ||
| } | ||
| // Could not construct a key of native supported Aerospike record key type | ||
| return null; |
There was a problem hiding this comment.
Aerospike Record Key doesn't support Double/Float
reugn
approved these changes
Nov 26, 2023
agrgr
reviewed
Nov 27, 2023
| @@ -32,6 +32,10 @@ public class AerospikeDataSettings { | |||
| int indexCacheRefreshFrequencySeconds = 3600; | |||
| @Builder.Default | |||
| long queryMaxRecords = 10_000L; | |||
| // When true, stores key types (record keys and map keys) as original type if supported. False means always store | |||
There was a problem hiding this comment.
Define how @Id fields (primary keys) and Map keys are stored: false - always as String, true - preserve original type if supported
Used this in the documentation, we can have the same comment here. What do you think?
…figuration, first part
…rt to be a list instead of string
agrgr
approved these changes
Dec 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is still a draft, investigating whether we should support (and test) the following types:
short (primitive)
Short (primitive wrapper)
byte
char