Skip to content

Investigate mixup test #3680

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
belliottsmith merged 1 commit into from
Nov 21, 2024
Merged

Investigate mixup test #3680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion modules/accord
Open in desktop
Submodule accord updated 5 files
+1 −1 accord-core/src/main/java/accord/coordinate/CoordinateEphemeralRead.java
+6 −5 accord-core/src/main/java/accord/primitives/Keys.java
+4 −0 accord-core/src/main/java/accord/primitives/RoutingKeys.java
+5 −5 accord-core/src/main/java/accord/utils/SortedArrays.java
+57 −0 accord-core/src/test/java/accord/KeysTest.java
11 changes: 8 additions & 3 deletions src/java/org/apache/cassandra/service/accord/AccordSafeCommandStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@

package org.apache.cassandra.service.accord;

import java.util.AbstractCollection;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
Expand All @@ -46,6 +48,8 @@
import accord.local.cfk.CommandsForKey;
import accord.primitives.AbstractKeys;
import accord.primitives.AbstractRanges;
import accord.primitives.AbstractUnseekableKeys;
import accord.primitives.Participants;
import accord.primitives.Ranges;
import accord.primitives.Routable;
import accord.primitives.Routables;
Expand Down Expand Up @@ -119,13 +123,13 @@ public PreLoadContext canExecute(PreLoadContext context)
return context;

List<RoutingKey> unavailable = null;
Unseekables<?> keys = context.keys();
AbstractUnseekableKeys keys = (AbstractUnseekableKeys) context.keys();
if (keys.size() == 0)
return context;

for (int i = 0 ; i < keys.size() ; ++i)
{
RoutingKey key = (RoutingKey) keys.get(i);
RoutingKey key = keys.get(i);
if (keyHistory == TIMESTAMPS)
{
if (null != timestampsForKeyInternal(key))
Expand Down Expand Up @@ -161,7 +165,8 @@ public PreLoadContext canExecute(PreLoadContext context)
if (unavailable.size() == keys.size())
return null;

return PreLoadContext.contextFor(context.primaryTxnId(), context.additionalTxnId(), keys.without(RoutingKeys.ofSortedUnique(unavailable)), keyHistory);
Participants<RoutingKey> available = keys.without(RoutingKeys.ofSortedUnique(unavailable));
return PreLoadContext.contextFor(context.primaryTxnId(), context.additionalTxnId(), available, keyHistory);
}
}

Expand Down