You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by w4...@apache.org on 2026/03/09 02:48:55 UTC
(doris) 02/04: fixup
This is an automated email from the ASF dual-hosted git repository.
w41ter pushed a commit to branch branch-4.0-cherry-pr60738
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 411660c876e3ef098a4a48063be49b1e1ebe18c5
Author: w41ter <ma...@selectdb.com>
AuthorDate: Fri Feb 13 08:58:45 2026 +0000
fixup
---
.../doris/journal/bdbje/BDBEnvironmentTest.java | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/fe/fe-core/src/test/java/org/apache/doris/journal/bdbje/BDBEnvironmentTest.java b/fe/fe-core/src/test/java/org/apache/doris/journal/bdbje/BDBEnvironmentTest.java
index d3836e145a2..b93766b3c9d 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/journal/bdbje/BDBEnvironmentTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/journal/bdbje/BDBEnvironmentTest.java
@@ -153,7 +153,7 @@ public class BDBEnvironmentTest {
Assertions.assertEquals(OperationStatus.SUCCESS, db.put(null, key, value));
DatabaseEntry readValue = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS, db.get(null, key, readValue, LockMode.READ_COMMITTED));
+ Assertions.assertEquals(OperationStatus.SUCCESS, db.get(null, key, readValue, LockMode.DEFAULT));
Assertions.assertEquals(new String(value.getData()), new String(readValue.getData()));
// Remove database
@@ -174,7 +174,7 @@ public class BDBEnvironmentTest {
Database epochDb = bdbEnvironment.getEpochDB();
Assertions.assertEquals(OperationStatus.SUCCESS, epochDb.put(null, key, value));
DatabaseEntry readValue2 = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS, epochDb.get(null, key, readValue2, LockMode.READ_COMMITTED));
+ Assertions.assertEquals(OperationStatus.SUCCESS, epochDb.get(null, key, readValue2, LockMode.DEFAULT));
Assertions.assertEquals(new String(value.getData()), new String(readValue2.getData()));
new MockUp<Env>() {
@@ -244,7 +244,7 @@ public class BDBEnvironmentTest {
Assertions.assertEquals(OperationStatus.SUCCESS, db.put(null, key, value));
DatabaseEntry readValue = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS, db.get(null, key, readValue, LockMode.READ_COMMITTED));
+ Assertions.assertEquals(OperationStatus.SUCCESS, db.get(null, key, readValue, LockMode.DEFAULT));
Assertions.assertEquals(new String(value.getData()), new String(readValue.getData()));
bdbEnvironment.close();
@@ -254,7 +254,7 @@ public class BDBEnvironmentTest {
Database db2 = bdbEnvironment2.openDatabase(dbName);
DatabaseEntry readValue2 = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS, db2.get(null, key, readValue2, LockMode.READ_COMMITTED));
+ Assertions.assertEquals(OperationStatus.SUCCESS, db2.get(null, key, readValue2, LockMode.DEFAULT));
Assertions.assertEquals(new String(value.getData()), new String(readValue2.getData()));
bdbEnvironment2.close();
}
@@ -278,7 +278,7 @@ public class BDBEnvironmentTest {
Assertions.assertEquals(OperationStatus.SUCCESS, db.put(null, key, value));
DatabaseEntry readValue = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS, db.get(null, key, readValue, LockMode.READ_COMMITTED));
+ Assertions.assertEquals(OperationStatus.SUCCESS, db.get(null, key, readValue, LockMode.DEFAULT));
Assertions.assertEquals(new String(value.getData()), new String(readValue.getData()));
bdbEnvironment.close();
@@ -286,7 +286,7 @@ public class BDBEnvironmentTest {
bdbEnvironment.openReplicatedEnvironment(homeFile);
Database db2 = bdbEnvironment.openDatabase(dbName);
DatabaseEntry readValue2 = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS, db2.get(null, key, readValue2, LockMode.READ_COMMITTED));
+ Assertions.assertEquals(OperationStatus.SUCCESS, db2.get(null, key, readValue2, LockMode.DEFAULT));
Assertions.assertEquals(new String(value.getData()), new String(readValue2.getData()));
bdbEnvironment.close();
}
@@ -324,9 +324,9 @@ public class BDBEnvironmentTest {
Database db11AfterTruncate = bdbEnvironment.openDatabase("11");
Assertions.assertEquals(7, db11AfterTruncate.count());
Assertions.assertEquals(OperationStatus.NOTFOUND,
- db11AfterTruncate.get(null, longToEntry(18), new DatabaseEntry(), LockMode.READ_COMMITTED));
+ db11AfterTruncate.get(null, longToEntry(18), new DatabaseEntry(), LockMode.DEFAULT));
Assertions.assertEquals(OperationStatus.SUCCESS,
- db11AfterTruncate.get(null, longToEntry(17), new DatabaseEntry(), LockMode.READ_COMMITTED));
+ db11AfterTruncate.get(null, longToEntry(17), new DatabaseEntry(), LockMode.DEFAULT));
bdbEnvironment.close();
}
@@ -405,14 +405,14 @@ public class BDBEnvironmentTest {
Assertions.assertEquals(1, followerEnvironment.getDatabaseNames().size());
Database followerDb = followerEnvironment.openDatabase(dbName);
DatabaseEntry readValue = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS, followerDb.get(null, key, readValue, LockMode.READ_COMMITTED));
+ Assertions.assertEquals(OperationStatus.SUCCESS, followerDb.get(null, key, readValue, LockMode.DEFAULT));
Assertions.assertEquals(new String(value.getData()), new String(readValue.getData()));
}
Assertions.assertEquals(1, observerEnvironment.getDatabaseNames().size());
Database observerDb = observerEnvironment.openDatabase(dbName);
DatabaseEntry readValue = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS, observerDb.get(null, key, readValue, LockMode.READ_COMMITTED));
+ Assertions.assertEquals(OperationStatus.SUCCESS, observerDb.get(null, key, readValue, LockMode.DEFAULT));
Assertions.assertEquals(new String(value.getData()), new String(readValue.getData()));
observerEnvironment.close();
@@ -519,7 +519,7 @@ public class BDBEnvironmentTest {
Assertions.assertEquals(1, entryPair.first.getDatabaseNames().size());
Database followerDb = entryPair.first.openDatabase(beginDbName);
DatabaseEntry readValue = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS, followerDb.get(null, key, readValue, LockMode.READ_COMMITTED));
+ Assertions.assertEquals(OperationStatus.SUCCESS, followerDb.get(null, key, readValue, LockMode.DEFAULT));
Assertions.assertEquals(new String(value.getData()), new String(readValue.getData()));
followerDb.close();
}
@@ -688,7 +688,7 @@ public class BDBEnvironmentTest {
Assertions.assertEquals(1, entryPair.first.getDatabaseNames().size());
Database followerDb = entryPair.first.openDatabase(beginDbName);
DatabaseEntry readValue = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS, followerDb.get(null, key, readValue, LockMode.READ_COMMITTED));
+ Assertions.assertEquals(OperationStatus.SUCCESS, followerDb.get(null, key, readValue, LockMode.DEFAULT));
Assertions.assertEquals(new String(value.getData()), new String(readValue.getData()));
}
@@ -737,6 +737,6 @@ public class BDBEnvironmentTest {
key = new DatabaseEntry(new byte[]{1, 2, 3});
DatabaseEntry readValue = new DatabaseEntry();
- Assertions.assertEquals(OperationStatus.SUCCESS, masterDb.get(null, key, readValue, LockMode.READ_COMMITTED));
+ Assertions.assertEquals(OperationStatus.SUCCESS, masterDb.get(null, key, readValue, LockMode.DEFAULT));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org