nizhikov commented on code in PR #9907:
URL: https://github.com/apache/ignite/pull/9907#discussion_r875743177
##########
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/consistency/AbstractFullSetReadRepairTest.java:
##########
@@ -40,80 +42,78 @@ public abstract class AbstractFullSetReadRepairTest extends
AbstractReadRepairTe
/**
*
*/
- protected static final Consumer<ReadRepairData> GET_CHECK_AND_FIX = (data)
-> {
- IgniteCache<Integer, Integer> cache = data.cache;
+ protected static final Consumer<ReadRepairData> GET_CHECK_AND_REPAIR =
(data) -> {
+ IgniteCache<Integer, Object> cache = data.cache;
+
Set<Integer> keys = data.data.keySet();
boolean raw = data.raw;
boolean async = data.async;
+ boolean binary = data.binary;
ReadRepairStrategy strategy = data.strategy;
assert keys.size() == 1;
for (Map.Entry<Integer, InconsistentMapping> entry :
data.data.entrySet()) { // Once.
Integer key = entry.getKey();
- Integer fixed = entry.getValue().fixed;
+ Object repaired = entry.getValue().repaired;
- Integer res;
+ Object res;
- if (raw) {
- CacheEntry<Integer, Integer> rawEntry = async ?
- cache.withReadRepair(strategy).getEntryAsync(key).get() :
- cache.withReadRepair(strategy).getEntry(key);
+ if (binary) {
+ Object obj = get(cache.withKeepBinary(), key, raw, async,
strategy);
- res = rawEntry != null ? rawEntry.getValue() : null;
+ res = unwrapBinaryIfNeeded(binary, obj);
}
else
- res = async ?
- cache.withReadRepair(strategy).getAsync(key).get() :
- cache.withReadRepair(strategy).get(key);
+ res = get(cache, key, raw, async, strategy);
- assertEquals(fixed, res);
+ assertEquals(repaired, res);
}
};
/**
*
*/
- protected static final Consumer<ReadRepairData> GETALL_CHECK_AND_FIX =
(data) -> {
- IgniteCache<Integer, Integer> cache = data.cache;
+ protected static final Consumer<ReadRepairData> GETALL_CHECK_AND_REPAIR =
(data) -> {
+ IgniteCache<Integer, Object> cache = data.cache;
+
Set<Integer> keys = data.data.keySet();
boolean raw = data.raw;
boolean async = data.async;
+ boolean binary = data.binary;
ReadRepairStrategy strategy = data.strategy;
assert !keys.isEmpty();
- if (raw) {
- Collection<CacheEntry<Integer, Integer>> res =
- async ?
- cache.withReadRepair(strategy).getEntriesAsync(keys).get()
:
- cache.withReadRepair(strategy).getEntries(keys);
+ Map<Integer, Object> res;
+
+ if (binary) {
+ Map<Integer, Object> objs = getAll(cache.withKeepBinary(), keys,
raw, async, strategy);
+
+ res = new HashMap<>();
- for (CacheEntry<Integer, Integer> entry : res) {
- Integer fixed = data.data.get(entry.getKey()).fixed;
+ for (Map.Entry<Integer, Object> entry : objs.entrySet()) {
+ Object obj = entry.getValue();
- assertEquals(fixed, entry.getValue());
+ res.put(entry.getKey(), unwrapBinaryIfNeeded(binary, obj));
}
}
- else {
- Map<Integer, Integer> res =
- async ?
- cache.withReadRepair(strategy).getAllAsync(keys).get() :
- cache.withReadRepair(strategy).getAll(keys);
+ else
+ res = getAll(cache, keys, raw, async, strategy);
- for (Map.Entry<Integer, Integer> entry : res.entrySet()) {
- Integer fixed = data.data.get(entry.getKey()).fixed;
+ for (Map.Entry<Integer, Object> entry : res.entrySet()) {
+ Object repaired = data.data.get(entry.getKey()).repaired;
- assertEquals(fixed, entry.getValue());
- }
+ assertEquals(repaired, entry.getValue());
}
};
/**
*
*/
protected static final Consumer<ReadRepairData> GET_NULL = (data) -> {
- IgniteCache<Integer, Integer> cache = data.cache;
+ IgniteCache<Integer, Object> cache = data.binary ?
data.cache.withKeepBinary() : data.cache;
Review Comment:
Let's inline `raw`, `async`, `strategy`, `keys`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
