Skip to content

Commit

Permalink
Fix soft-merge conflict of #6952 and #6975 (#6987)
Browse files Browse the repository at this point in the history
  • Loading branch information
snazy committed Jun 5, 2023
1 parent dcd08e6 commit dfc3c6b
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static java.util.concurrent.TimeUnit.MICROSECONDS;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.projectnessie.model.CommitMeta.fromMessage;
import static org.projectnessie.versioned.VersionStore.KeyRestrictions.NO_KEY_RESTRICTIONS;

import java.util.ArrayList;
import java.util.Collections;
Expand Down Expand Up @@ -117,7 +118,7 @@ public ContentKey randomKey() {
@Benchmark
public void getKeys(BenchmarkParam param, Blackhole bh) throws Exception {
PaginationIterator<KeyEntry> iter =
param.versionStore.getKeys(param.ref.getNamedRef(), null, false, null, null, null, null);
param.versionStore.getKeys(param.ref.getNamedRef(), null, false, NO_KEY_RESTRICTIONS);
while (iter.hasNext()) {
bh.consume(iter.next());
}
Expand Down

0 comments on commit dfc3c6b

Please sign in to comment.