diff --git a/java/rocksjni/testable_event_listener.cc b/java/rocksjni/testable_event_listener.cc index 71188bc3c6cd..483ade160561 100644 --- a/java/rocksjni/testable_event_listener.cc +++ b/java/rocksjni/testable_event_listener.cc @@ -201,7 +201,7 @@ void Java_org_rocksdb_test_TestableEventListener_invokeAllCallbacks( FileOperationInfo(FileOperationType::kRead, file_path, start_timestamp, finish_timestamp, status); op_info.offset = UINT64_MAX; - op_info.length = SIZE_MAX; + op_info.length = 4096; el->OnFileReadFinish(op_info); el->OnFileWriteFinish(op_info); diff --git a/java/src/test/java/org/rocksdb/EventListenerTest.java b/java/src/test/java/org/rocksdb/EventListenerTest.java index 84be232f972d..da41ae087a95 100644 --- a/java/src/test/java/org/rocksdb/EventListenerTest.java +++ b/java/src/test/java/org/rocksdb/EventListenerTest.java @@ -13,12 +13,14 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.assertj.core.api.AbstractObjectAssert; import org.assertj.core.api.ObjectAssert; +import org.junit.Assume; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.rocksdb.AbstractEventListener.EnabledEventCallback; import org.rocksdb.test.TestableEventListener; +import org.rocksdb.util.Environment; public class EventListenerTest { @ClassRule @@ -264,7 +266,7 @@ public void testAllCallbacksInvocation() { final MemTableInfo memTableInfoTestData = new MemTableInfo( "columnFamilyName", TEST_LONG_VAL, TEST_LONG_VAL, TEST_LONG_VAL, TEST_LONG_VAL); final FileOperationInfo fileOperationInfoTestData = new FileOperationInfo("/file/path", - TEST_LONG_VAL, TEST_LONG_VAL, 1_600_699_420_000_000_000L, 5_000_000_000L, statusTestData); + TEST_LONG_VAL, 4096, 1_600_699_420_000_000_000L, 5_000_000_000L, statusTestData); final WriteStallInfo writeStallInfoTestData = new WriteStallInfo("columnFamilyName", (byte) 0x0, (byte) 0x1); final ExternalFileIngestionInfo externalFileIngestionInfoTestData = diff --git a/java/src/test/java/org/rocksdb/MultiGetManyKeysTest.java b/java/src/test/java/org/rocksdb/MultiGetManyKeysTest.java index e66eef6229a7..67b72497e0ec 100644 --- a/java/src/test/java/org/rocksdb/MultiGetManyKeysTest.java +++ b/java/src/test/java/org/rocksdb/MultiGetManyKeysTest.java @@ -7,11 +7,15 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.*; + +import org.junit.Assume; +import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.rocksdb.util.Environment; @RunWith(Parameterized.class) public class MultiGetManyKeysTest { @@ -28,6 +32,11 @@ public MultiGetManyKeysTest(final Integer numKeys) { this.numKeys = numKeys; } + @BeforeClass + public static void beforeAllTest() { + Assume.assumeFalse("We are not running this test on OpenBSD dues to memory constraints", Environment.isOpenBSD()); + } + /** * Test for multiGet problem */ diff --git a/java/src/test/java/org/rocksdb/PerfContextTest.java b/java/src/test/java/org/rocksdb/PerfContextTest.java index 3145b59e4390..0cd7b5bfe1c9 100644 --- a/java/src/test/java/org/rocksdb/PerfContextTest.java +++ b/java/src/test/java/org/rocksdb/PerfContextTest.java @@ -17,6 +17,7 @@ import java.util.List; import org.junit.*; import org.junit.rules.TemporaryFolder; +import org.rocksdb.util.Environment; public class PerfContextTest { @ClassRule @@ -80,6 +81,7 @@ public void testAllGetters() throws RocksDBException, IntrospectionException, @Test public void testGetBlockReadCpuTime() throws RocksDBException { + Assume.assumeFalse("We are not running this test on OpenBSD or Windows", Environment.isOpenBSD() || Environment.isWindows()); db.setPerfLevel(PerfLevel.ENABLE_TIME_AND_CPU_TIME_EXCEPT_FOR_MUTEX); db.put("key".getBytes(), "value".getBytes()); db.compactRange();