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

Jump to bottom

Fix deprecation warnings in tests #1712

Merged
merged 1 commit into from Jun 3, 2022
Merged

Fix deprecation warnings in tests #1712

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...a/com/apple/foundationdb/record/provider/foundationdb/FDBRecordStoreCountRecordsTest.java
View file
Open in desktop
Expand Up @@ -45,6 +45,7 @@
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;

import javax.annotation.Nonnull;
import java.util.HashMap;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
Expand Down Expand Up @@ -260,10 +261,16 @@ private void recountAndClearRecords(boolean useIndex) throws Exception {
// Need to allow immediate rebuild of new count index.
final FDBRecordStoreBase.UserVersionChecker alwaysEnabled = new FDBRecordStoreBase.UserVersionChecker() {
@Override
public CompletableFuture<Integer> checkUserVersion(int oldUserVersion, int oldMetaDataVersion, RecordMetaDataProvider metaData) {
public CompletableFuture<Integer> checkUserVersion(@Nonnull final RecordMetaDataProto.DataStoreInfo storeHeader, final RecordMetaDataProvider metaData) {
return CompletableFuture.completedFuture(1);
}

@Deprecated
@Override
public CompletableFuture<Integer> checkUserVersion(int oldUserVersion, int oldMetaDataVersion, RecordMetaDataProvider metaData) {
throw new RecordCoreException("deprecated checkUserVersion called");
}

@Override
public IndexState needRebuildIndex(Index index, long recordCount, boolean indexOnNewRecordTypes) {
return IndexState.READABLE;
Expand Down
33 changes: 29 additions & 4 deletions ...est/java/com/apple/foundationdb/record/provider/foundationdb/FDBRecordStoreIndexTest.java
View file
Open in desktop
Expand Up @@ -37,6 +37,7 @@
import com.apple.foundationdb.record.RecordIndexUniquenessViolation;
import com.apple.foundationdb.record.RecordMetaData;
import com.apple.foundationdb.record.RecordMetaDataBuilder;
import com.apple.foundationdb.record.RecordMetaDataProto;
import com.apple.foundationdb.record.RecordMetaDataProvider;
import com.apple.foundationdb.record.RecordStoreState;
import com.apple.foundationdb.record.ScanProperties;
Expand Down Expand Up @@ -1936,9 +1937,15 @@ public void noMaintenanceFilteredIndexOnCheckVersion() throws Exception {
context.getTimer().reset();

FDBRecordStoreBase.UserVersionChecker userVersionChecker = new FDBRecordStoreBase.UserVersionChecker() {
@Override
public CompletableFuture<Integer> checkUserVersion(@Nonnull final RecordMetaDataProto.DataStoreInfo storeHeader, final RecordMetaDataProvider metaData) {
return CompletableFuture.completedFuture(1);
}

@Deprecated
@Override
public CompletableFuture<Integer> checkUserVersion(int oldUserVersion, int oldMetaDataVersion, RecordMetaDataProvider metaData) {
return CompletableFuture.completedFuture(Integer.valueOf(1));
throw new RecordCoreException("deprecated checkUserVersion called");
}

@Override
Expand Down Expand Up @@ -1981,9 +1988,15 @@ public void testChangeIndexDefinition(boolean withCount,
final String newIndexFieldName) throws Exception {

final FDBRecordStoreBase.UserVersionChecker alwaysDisabled = new FDBRecordStoreBase.UserVersionChecker() {
@Override
public CompletableFuture<Integer> checkUserVersion(@Nonnull final RecordMetaDataProto.DataStoreInfo storeHeader, final RecordMetaDataProvider metaData) {
return CompletableFuture.completedFuture(1);
}

@Deprecated
@Override
public CompletableFuture<Integer> checkUserVersion(int oldUserVersion, int oldMetaDataVersion, RecordMetaDataProvider metaData) {
return CompletableFuture.completedFuture(Integer.valueOf(1));
throw new RecordCoreException("deprecated checkUserVersion called");
}

@Override
Expand All @@ -1993,9 +2006,15 @@ public IndexState needRebuildIndex(Index index, long recordCount, boolean indexO
};

final FDBRecordStoreBase.UserVersionChecker alwaysEnabled = new FDBRecordStoreBase.UserVersionChecker() {
@Override
public CompletableFuture<Integer> checkUserVersion(@Nonnull final RecordMetaDataProto.DataStoreInfo storeHeader, final RecordMetaDataProvider metaData) {
return CompletableFuture.completedFuture(1);
}

@Deprecated
@Override
public CompletableFuture<Integer> checkUserVersion(int oldUserVersion, int oldMetaDataVersion, RecordMetaDataProvider metaData) {
return CompletableFuture.completedFuture(Integer.valueOf(1));
throw new RecordCoreException("deprecated checkUserVersion called");
}

@Override
Expand Down Expand Up @@ -2129,9 +2148,15 @@ public void testChangeIndexDefinitionNotReadable() throws Exception {
@Test
public void testSelectiveIndexDisable() throws Exception {
final FDBRecordStoreBase.UserVersionChecker selectiveEnable = new FDBRecordStoreBase.UserVersionChecker() {
@Override
public CompletableFuture<Integer> checkUserVersion(@Nonnull final RecordMetaDataProto.DataStoreInfo storeHeader, final RecordMetaDataProvider metaData) {
return CompletableFuture.completedFuture(1);
}

@Deprecated
@Override
public CompletableFuture<Integer> checkUserVersion(int oldUserVersion, int oldMetaDataVersion, RecordMetaDataProvider metaData) {
return CompletableFuture.completedFuture(Integer.valueOf(1));
throw new RecordCoreException("deprecated checkUserVersion called");
}

@Override
Expand Down
9 changes: 8 additions & 1 deletion ...t/java/com/apple/foundationdb/record/provider/foundationdb/FDBRecordStoreOpeningTest.java
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@
import com.apple.foundationdb.record.RecordMetaData;
import com.apple.foundationdb.record.RecordMetaDataBuilder;
import com.apple.foundationdb.record.RecordMetaDataOptionsProto;
import com.apple.foundationdb.record.RecordMetaDataProto;
import com.apple.foundationdb.record.RecordMetaDataProvider;
import com.apple.foundationdb.record.TestHelpers;
import com.apple.foundationdb.record.TestNoIndexesProto;
Expand Down Expand Up @@ -726,9 +727,15 @@ public SizeBasedUserVersionChecker(IndexState stateToReturn) {
this.size = new AtomicLong(-1L);
}

@Override
public CompletableFuture<Integer> checkUserVersion(@Nonnull final RecordMetaDataProto.DataStoreInfo storeHeader, final RecordMetaDataProvider metaData) {
return CompletableFuture.completedFuture(storeHeader.getUserVersion());
}

@Deprecated
@Override
public CompletableFuture<Integer> checkUserVersion(final int oldUserVersion, final int oldMetaDataVersion, final RecordMetaDataProvider metaData) {
return CompletableFuture.completedFuture(oldUserVersion);
throw new RecordCoreException("deprecated checkUserVersion called");
}

@Override
Expand Down
9 changes: 8 additions & 1 deletion ...a/com/apple/foundationdb/record/provider/foundationdb/FDBRecordStoreSplitRecordsTest.java
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@
import com.apple.foundationdb.record.RecordCursorIterator;
import com.apple.foundationdb.record.RecordMetaData;
import com.apple.foundationdb.record.RecordMetaDataBuilder;
import com.apple.foundationdb.record.RecordMetaDataProto;
import com.apple.foundationdb.record.RecordMetaDataProvider;
import com.apple.foundationdb.record.ScanProperties;
import com.apple.foundationdb.record.TestHelpers;
Expand Down Expand Up @@ -316,10 +317,16 @@ public void clearOmitUnsplitRecordSuffixOverlapping() {
// We want to test that a conflict comes from the clearing itself.
final FDBRecordStoreBase.UserVersionChecker dontBuild = new FDBRecordStoreBase.UserVersionChecker() {
@Override
public CompletableFuture<Integer> checkUserVersion(int oldUserVersion, int oldMetaDataVersion, RecordMetaDataProvider metaData) {
public CompletableFuture<Integer> checkUserVersion(@Nonnull final RecordMetaDataProto.DataStoreInfo storeHeader, final RecordMetaDataProvider metaData) {
return CompletableFuture.completedFuture(0);
}

@Deprecated
@Override
public CompletableFuture<Integer> checkUserVersion(int oldUserVersion, int oldMetaDataVersion, RecordMetaDataProvider metaData) {
throw new RecordCoreException("deprecated checkUserVersion called");
}

@Override
public IndexState needRebuildIndex(Index index, long recordCount, boolean indexOnNewRecordTypes) {
return IndexState.DISABLED;
Expand Down
11 changes: 9 additions & 2 deletions ...src/test/java/com/apple/foundationdb/record/provider/foundationdb/FDBRecordStoreTest.java
View file
Open in desktop
Expand Up @@ -866,15 +866,22 @@ public RecordMetaData getRecordMetaData() {
}

@Override
public CompletableFuture<Integer> checkUserVersion(int oldUserVersion, int oldMetaDataVersion, RecordMetaDataProvider metaData) {
if (oldUserVersion < 0) {
public CompletableFuture<Integer> checkUserVersion(@Nonnull final RecordMetaDataProto.DataStoreInfo storeHeader, final RecordMetaDataProvider metaData) {
if (storeHeader.getFormatVersion() == 0) {
return CompletableFuture.completedFuture(defaultVersion);
}
int oldUserVersion = storeHeader.getUserVersion();
if (oldUserVersion == 101) {
needOld = true;
}
return CompletableFuture.completedFuture(oldUserVersion);
}

@Deprecated
@Override
public CompletableFuture<Integer> checkUserVersion(int oldUserVersion, int oldMetaDataVersion, RecordMetaDataProvider metaData) {
throw new RecordCoreException("deprecated checkUserVersion called");
}
}

@Test
Expand Down