Skip to content

Commit 92e5729

Browse files
committed
Rename isConsistentVirtualTableRead() to isConsistentVirtualTableReadGuaranteed()
1 parent 18121d2 commit 92e5729

File tree

12 files changed

+37
-36
lines changed

12 files changed

+37
-36
lines changed

core/src/main/java/com/scalar/db/api/StorageInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public interface StorageInfo {
2727
*
2828
* @return true if the storage guarantees consistent reads for virtual tables, false otherwise
2929
*/
30-
boolean isConsistentVirtualTableRead();
30+
boolean isConsistentVirtualTableReadGuaranteed();
3131

3232
/**
3333
* The mutation atomicity unit of the storage.

core/src/main/java/com/scalar/db/common/StorageInfoImpl.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ public class StorageInfoImpl implements StorageInfo {
1111
private final String storageName;
1212
private final MutationAtomicityUnit mutationAtomicityUnit;
1313
private final int maxAtomicMutationsCount;
14-
private final boolean consistentVirtualTableRead;
14+
private final boolean consistentVirtualTableReadGuaranteed;
1515

1616
public StorageInfoImpl(
1717
String storageName,
1818
MutationAtomicityUnit mutationAtomicityUnit,
1919
int maxAtomicMutationsCount,
20-
boolean consistentVirtualTableRead) {
20+
boolean consistentVirtualTableReadGuaranteed) {
2121
this.storageName = storageName;
2222
this.mutationAtomicityUnit = mutationAtomicityUnit;
2323
this.maxAtomicMutationsCount = maxAtomicMutationsCount;
24-
this.consistentVirtualTableRead = consistentVirtualTableRead;
24+
this.consistentVirtualTableReadGuaranteed = consistentVirtualTableReadGuaranteed;
2525
}
2626

2727
@Override
@@ -40,8 +40,8 @@ public int getMaxAtomicMutationsCount() {
4040
}
4141

4242
@Override
43-
public boolean isConsistentVirtualTableRead() {
44-
return consistentVirtualTableRead;
43+
public boolean isConsistentVirtualTableReadGuaranteed() {
44+
return consistentVirtualTableReadGuaranteed;
4545
}
4646

4747
@Override
@@ -56,7 +56,8 @@ public boolean equals(Object o) {
5656
return getMaxAtomicMutationsCount() == that.getMaxAtomicMutationsCount()
5757
&& Objects.equals(getStorageName(), that.getStorageName())
5858
&& getMutationAtomicityUnit() == that.getMutationAtomicityUnit()
59-
&& isConsistentVirtualTableRead() == that.isConsistentVirtualTableRead();
59+
&& isConsistentVirtualTableReadGuaranteed()
60+
== that.isConsistentVirtualTableReadGuaranteed();
6061
}
6162

6263
@Override
@@ -65,7 +66,7 @@ public int hashCode() {
6566
getStorageName(),
6667
getMutationAtomicityUnit(),
6768
getMaxAtomicMutationsCount(),
68-
isConsistentVirtualTableRead());
69+
isConsistentVirtualTableReadGuaranteed());
6970
}
7071

7172
@Override
@@ -74,7 +75,7 @@ public String toString() {
7475
.add("storageName", storageName)
7576
.add("mutationAtomicityUnit", mutationAtomicityUnit)
7677
.add("maxAtomicMutationsCount", maxAtomicMutationsCount)
77-
.add("consistentVirtualTableRead", consistentVirtualTableRead)
78+
.add("consistentVirtualTableReadGuaranteed", consistentVirtualTableReadGuaranteed)
7879
.toString();
7980
}
8081
}

core/src/main/java/com/scalar/db/storage/jdbc/JdbcAdmin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,11 +1006,11 @@ public void upgrade(Map<String, String> options) throws ExecutionException {
10061006

10071007
@Override
10081008
public StorageInfo getStorageInfo(String namespace) throws ExecutionException {
1009-
boolean consistentVirtualTableRead;
1009+
boolean consistentVirtualTableReadGuaranteed;
10101010
try (Connection connection = dataSource.getConnection()) {
10111011
int isolationLevel = connection.getTransactionIsolation();
1012-
consistentVirtualTableRead =
1013-
isolationLevel >= rdbEngine.getMinimumIsolationLevelForConsistencyReads();
1012+
consistentVirtualTableReadGuaranteed =
1013+
isolationLevel >= rdbEngine.getMinimumIsolationLevelForConsistentVirtualTableReads();
10141014
} catch (SQLException e) {
10151015
throw new ExecutionException("Getting the transaction isolation level failed", e);
10161016
}
@@ -1020,7 +1020,7 @@ public StorageInfo getStorageInfo(String namespace) throws ExecutionException {
10201020
StorageInfo.MutationAtomicityUnit.STORAGE,
10211021
// No limit on the number of mutations
10221022
Integer.MAX_VALUE,
1023-
consistentVirtualTableRead);
1023+
consistentVirtualTableReadGuaranteed);
10241024
}
10251025

10261026
@Override

core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineDb2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ public String getTableNamesInNamespaceSql() {
591591
}
592592

593593
@Override
594-
public int getMinimumIsolationLevelForConsistencyReads() {
594+
public int getMinimumIsolationLevelForConsistentVirtualTableReads() {
595595
// In Db2, REPEATABLE READ and SERIALIZABLE isolation levels guarantee consistent reads
596596
return Connection.TRANSACTION_REPEATABLE_READ;
597597
}

core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineMysql.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ public String getTableNamesInNamespaceSql() {
511511
}
512512

513513
@Override
514-
public int getMinimumIsolationLevelForConsistencyReads() {
514+
public int getMinimumIsolationLevelForConsistentVirtualTableReads() {
515515
// In MySQL, REPEATABLE READ and SERIALIZABLE isolation levels guarantee consistent reads
516516
return Connection.TRANSACTION_REPEATABLE_READ;
517517
}

core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineOracle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ public String getTableNamesInNamespaceSql() {
543543
}
544544

545545
@Override
546-
public int getMinimumIsolationLevelForConsistencyReads() {
546+
public int getMinimumIsolationLevelForConsistentVirtualTableReads() {
547547
// In Oracle, only the SERIALIZABLE isolation level guarantees consistent reads
548548
return Connection.TRANSACTION_SERIALIZABLE;
549549
}

core/src/main/java/com/scalar/db/storage/jdbc/RdbEnginePostgresql.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ public String getTableNamesInNamespaceSql() {
403403
}
404404

405405
@Override
406-
public int getMinimumIsolationLevelForConsistencyReads() {
406+
public int getMinimumIsolationLevelForConsistentVirtualTableReads() {
407407
// In PostgreSQL, REPEATABLE READ and SERIALIZABLE isolation levels guarantee consistent reads
408408
return Connection.TRANSACTION_REPEATABLE_READ;
409409
}

core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ public String getTableNamesInNamespaceSql() {
439439
}
440440

441441
@Override
442-
public int getMinimumIsolationLevelForConsistencyReads() {
442+
public int getMinimumIsolationLevelForConsistentVirtualTableReads() {
443443
// In SQL Server, REPEATABLE READ or higher isolation level guarantees consistent reads
444444
return Connection.TRANSACTION_REPEATABLE_READ;
445445
}

core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlite.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ public String getTableNamesInNamespaceSql() {
391391
}
392392

393393
@Override
394-
public int getMinimumIsolationLevelForConsistencyReads() {
394+
public int getMinimumIsolationLevelForConsistentVirtualTableReads() {
395395
// In SQLite, READ COMMITTED and higher isolation levels guarantee consistent reads
396396
return Connection.TRANSACTION_READ_COMMITTED;
397397
}

core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,5 +326,5 @@ default void throwIfConjunctionsColumnNotSupported(
326326

327327
String getTableNamesInNamespaceSql();
328328

329-
int getMinimumIsolationLevelForConsistencyReads();
329+
int getMinimumIsolationLevelForConsistentVirtualTableReads();
330330
}

0 commit comments

Comments
 (0)