[to #462] add version constraint for rawkv tests (#463)

This commit is contained in:
iosmanthus 2022-01-04 15:27:22 +08:00 committed by GitHub
parent 5dbfe03b2c
commit 712509f771
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 0 deletions

View File

@ -582,6 +582,11 @@
<commitIdGenerationMode>full</commitIdGenerationMode>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
</plugin>
</plugins>
</build>

View File

@ -17,10 +17,21 @@
package org.tikv;
import org.tikv.common.PDClient;
import org.tikv.common.StoreVersion;
import org.tikv.common.TiConfiguration;
import org.tikv.common.TiSession;
import org.tikv.util.TestUtils;
public class BaseRawKVTest {
protected boolean tikvVersionNewerThan(String expectedVersion) {
TiConfiguration conf = createTiConfiguration();
TiSession session = TiSession.create(conf);
PDClient pdClient = session.getPDClient();
return StoreVersion.minTiKVVersion(expectedVersion, pdClient);
}
protected TiConfiguration createTiConfiguration() {
String pdAddrsStr = TestUtils.getEnv("RAWKV_PD_ADDRESSES");

View File

@ -21,11 +21,13 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.tikv.BaseRawKVTest;
public class PDClientIntegrationTest extends BaseRawKVTest {
private TiSession session;
@Before
@ -44,6 +46,7 @@ public class PDClientIntegrationTest extends BaseRawKVTest {
@Test
public void testPauseCheck() throws Exception {
Assume.assumeTrue(tikvVersionNewerThan("v5.3.0"));
try (PDClient client = session.getPDClient()) {
PDChecker checker = PDChecker.Merge;
for (int i = 0; i < 2; i++) {

View File

@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.tikv.BaseRawKVTest;
@ -37,6 +38,7 @@ import org.tikv.raw.RawKVClient;
import org.tikv.util.TestUtils;
public class RawKVIngestTest extends BaseRawKVTest {
private TiSession session;
private static final int KEY_NUMBER = 16;
@ -59,6 +61,7 @@ public class RawKVIngestTest extends BaseRawKVTest {
@Test
public void rawKVIngestTest() {
Assume.assumeTrue(tikvVersionNewerThan("v5.2.0"));
RawKVClient client = session.createRawClient();
// gen test data
@ -88,6 +91,7 @@ public class RawKVIngestTest extends BaseRawKVTest {
@Test
public void rawKVIngestTestWithTTL() throws InterruptedException {
Assume.assumeTrue(tikvVersionNewerThan("v5.2.0"));
long ttl = 10;
RawKVClient client = session.createRawClient();

View File

@ -24,6 +24,7 @@ import com.google.protobuf.ByteString;
import java.util.ArrayList;
import java.util.List;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import org.tikv.BaseRawKVTest;
@ -32,6 +33,7 @@ import org.tikv.common.TiSession;
import org.tikv.common.region.TiRegion;
public class RegionSplitTest extends BaseRawKVTest {
private TiSession session;
private static final int KEY_NUMBER = 10;
@ -53,6 +55,7 @@ public class RegionSplitTest extends BaseRawKVTest {
@Test
public void rawKVSplitTest() {
Assume.assumeTrue(tikvVersionNewerThan("v5.1.0"));
List<byte[]> splitKeys = new ArrayList<>(KEY_NUMBER);
for (int i = 0; i < KEY_NUMBER; i++) {
splitKeys.add(genRandomKey(KEY_PREFIX, KEY_LENGTH));