Rename scanner_fetch_size to scan_fetch_size

Author: brfrn169

core/src/main/java/com/scalar/db/config/DatabaseConfig.java

@@ -38,7 +38,7 @@ public class DatabaseConfig {
   private boolean crossPartitionScanFilteringEnabled;
   private boolean crossPartitionScanOrderingEnabled;
   private String systemNamespaceName;
-  private int scannerFetchSize;
+  private int scanFetchSize;
 
   public static final String PREFIX = "scalar.db.";
   public static final String CONTACT_POINTS = PREFIX + "contact_points";
@@ -57,11 +57,11 @@ public class DatabaseConfig {
   public static final String CROSS_PARTITION_SCAN_FILTERING = SCAN_PREFIX + "filtering.enabled";
   public static final String CROSS_PARTITION_SCAN_ORDERING = SCAN_PREFIX + "ordering.enabled";
   public static final String SYSTEM_NAMESPACE_NAME = PREFIX + "system_namespace_name";
-  public static final String SCANNER_FETCH_SIZE = PREFIX + "scanner_fetch_size";
+  public static final String SCAN_FETCH_SIZE = PREFIX + "scan_fetch_size";
 
   public static final int DEFAULT_METADATA_CACHE_EXPIRATION_TIME_SECS = 60;
   public static final String DEFAULT_SYSTEM_NAMESPACE_NAME = "scalardb";
-  public static final int DEFAULT_SCANNER_FETCH_SIZE = 10;
+  public static final int DEFAULT_SCAN_FETCH_SIZE = 10;
 
   public DatabaseConfig(File propertiesFile) throws IOException {
     try (FileInputStream stream = new FileInputStream(propertiesFile)) {
@@ -122,7 +122,7 @@ protected void load() {
 
     systemNamespaceName = getSystemNamespaceName(getProperties());
 
-    scannerFetchSize = getInt(getProperties(), SCANNER_FETCH_SIZE, DEFAULT_SCANNER_FETCH_SIZE);
+    scanFetchSize = getInt(getProperties(), SCAN_FETCH_SIZE, DEFAULT_SCAN_FETCH_SIZE);
   }
 
   public List<String> getContactPoints() {
@@ -177,8 +177,8 @@ public String getSystemNamespaceName() {
     return systemNamespaceName;
   }
 
-  public int getScannerFetchSize() {
-    return scannerFetchSize;
+  public int getScanFetchSize() {
+    return scanFetchSize;
   }
 
   public static String getTransactionManager(Properties properties) {

core/src/main/java/com/scalar/db/storage/cassandra/Cassandra.java

@@ -56,7 +56,7 @@ public Cassandra(DatabaseConfig config) {
 
     handlers =
         StatementHandlerManager.builder()
-            .select(new SelectStatementHandler(session, config.getScannerFetchSize()))
+            .select(new SelectStatementHandler(session, config.getScanFetchSize()))
             .insert(new InsertStatementHandler(session))
             .update(new UpdateStatementHandler(session))
             .delete(new DeleteStatementHandler(session))

core/src/main/java/com/scalar/db/storage/cosmos/Cosmos.java

@@ -63,7 +63,7 @@ public Cosmos(DatabaseConfig databaseConfig) {
     operationChecker = new CosmosOperationChecker(databaseConfig, metadataManager);
 
     selectStatementHandler =
-        new SelectStatementHandler(client, metadataManager, databaseConfig.getScannerFetchSize());
+        new SelectStatementHandler(client, metadataManager, databaseConfig.getScanFetchSize());
     putStatementHandler = new PutStatementHandler(client, metadataManager);
     deleteStatementHandler = new DeleteStatementHandler(client, metadataManager);
     batchHandler = new BatchHandler(client, metadataManager);

core/src/main/java/com/scalar/db/storage/dynamo/Dynamo.java

@@ -81,7 +81,7 @@ public Dynamo(DatabaseConfig databaseConfig) {
             client,
             metadataManager,
             config.getNamespacePrefix(),
-            databaseConfig.getScannerFetchSize());
+            databaseConfig.getScanFetchSize());
     putStatementHandler =
         new PutStatementHandler(client, metadataManager, config.getNamespacePrefix());
     deleteStatementHandler =

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

@@ -61,10 +61,7 @@ public JdbcDatabase(DatabaseConfig databaseConfig) {
     OperationChecker operationChecker = new OperationChecker(databaseConfig, tableMetadataManager);
     jdbcService =
         new JdbcService(
-            tableMetadataManager,
-            operationChecker,
-            rdbEngine,
-            databaseConfig.getScannerFetchSize());
+            tableMetadataManager, operationChecker, rdbEngine, databaseConfig.getScanFetchSize());
   }
 
   @VisibleForTesting

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

@@ -44,20 +44,20 @@ public class JdbcService {
   private final OperationChecker operationChecker;
   private final RdbEngineStrategy rdbEngine;
   private final QueryBuilder queryBuilder;
-  private final int scannerFetchSize;
+  private final int scanFetchSize;
 
   @SuppressFBWarnings("EI_EXPOSE_REP2")
   public JdbcService(
       TableMetadataManager tableMetadataManager,
       OperationChecker operationChecker,
       RdbEngineStrategy rdbEngine,
-      int scannerFetchSize) {
+      int scanFetchSize) {
     this(
         tableMetadataManager,
         operationChecker,
         rdbEngine,
         new QueryBuilder(rdbEngine),
-        scannerFetchSize);
+        scanFetchSize);
   }
 
   @VisibleForTesting
@@ -66,12 +66,12 @@ public JdbcService(
       OperationChecker operationChecker,
       RdbEngineStrategy rdbEngine,
       QueryBuilder queryBuilder,
-      int scannerFetchSize) {
+      int scanFetchSize) {
     this.tableMetadataManager = Objects.requireNonNull(tableMetadataManager);
     this.operationChecker = Objects.requireNonNull(operationChecker);
     this.rdbEngine = Objects.requireNonNull(rdbEngine);
     this.queryBuilder = Objects.requireNonNull(queryBuilder);
-    this.scannerFetchSize = scannerFetchSize;
+    this.scanFetchSize = scanFetchSize;
   }
 
   public Optional<Result> get(Get get, Connection connection)
@@ -121,7 +121,7 @@ public Scanner getScanner(
     SelectQuery selectQuery = buildSelectQuery(scan, tableMetadata);
     PreparedStatement preparedStatement = connection.prepareStatement(selectQuery.sql());
     selectQuery.bind(preparedStatement);
-    preparedStatement.setFetchSize(scannerFetchSize);
+    preparedStatement.setFetchSize(scanFetchSize);
     ResultSet resultSet = preparedStatement.executeQuery();
     return new ScannerImpl(
         new ResultInterpreter(scan.getProjections(), tableMetadata, rdbEngine),

core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionManager.java

@@ -72,10 +72,7 @@ public JdbcTransactionManager(DatabaseConfig databaseConfig) {
     OperationChecker operationChecker = new OperationChecker(databaseConfig, tableMetadataManager);
     jdbcService =
         new JdbcService(
-            tableMetadataManager,
-            operationChecker,
-            rdbEngine,
-            databaseConfig.getScannerFetchSize());
+            tableMetadataManager, operationChecker, rdbEngine, databaseConfig.getScanFetchSize());
   }
 
   @VisibleForTesting

core/src/test/java/com/scalar/db/config/DatabaseConfigTest.java

@@ -41,7 +41,7 @@ public void constructor_PropertiesWithoutPortGiven_ShouldLoadProperly() {
     assertThat(config.isCrossPartitionScanEnabled()).isFalse();
     assertThat(config.isCrossPartitionScanFilteringEnabled()).isFalse();
     assertThat(config.isCrossPartitionScanOrderingEnabled()).isFalse();
-    assertThat(config.getScannerFetchSize()).isEqualTo(10);
+    assertThat(config.getScanFetchSize()).isEqualTo(10);
   }
 
   @Test
@@ -70,7 +70,7 @@ public void constructor_PropertiesWithoutUsernameGiven_ShouldLoadProperly() {
     assertThat(config.isCrossPartitionScanEnabled()).isFalse();
     assertThat(config.isCrossPartitionScanFilteringEnabled()).isFalse();
     assertThat(config.isCrossPartitionScanOrderingEnabled()).isFalse();
-    assertThat(config.getScannerFetchSize()).isEqualTo(10);
+    assertThat(config.getScanFetchSize()).isEqualTo(10);
   }
 
   @Test
@@ -99,7 +99,7 @@ public void constructor_PropertiesWithoutPasswordGiven_ShouldLoadProperly() {
     assertThat(config.isCrossPartitionScanEnabled()).isFalse();
     assertThat(config.isCrossPartitionScanFilteringEnabled()).isFalse();
     assertThat(config.isCrossPartitionScanOrderingEnabled()).isFalse();
-    assertThat(config.getScannerFetchSize()).isEqualTo(10);
+    assertThat(config.getScanFetchSize()).isEqualTo(10);
   }
 
   @Test
@@ -130,7 +130,7 @@ public void constructor_PropertiesWithPortGiven_ShouldLoadProperly() {
     assertThat(config.isCrossPartitionScanEnabled()).isFalse();
     assertThat(config.isCrossPartitionScanFilteringEnabled()).isFalse();
     assertThat(config.isCrossPartitionScanOrderingEnabled()).isFalse();
-    assertThat(config.getScannerFetchSize()).isEqualTo(10);
+    assertThat(config.getScanFetchSize()).isEqualTo(10);
   }
 
   @Test
@@ -408,15 +408,15 @@ public void constructor_PropertiesWithCrossPartitionScanSettingsGiven_ShouldLoad
   }
 
   @Test
-  public void constructor_PropertiesWithScannerFetchSizeGiven_ShouldLoadProperly() {
+  public void constructor_PropertiesWithScanFetchSizeGiven_ShouldLoadProperly() {
     // Arrange
     Properties props = new Properties();
-    props.setProperty(DatabaseConfig.SCANNER_FETCH_SIZE, "1000");
+    props.setProperty(DatabaseConfig.SCAN_FETCH_SIZE, "1000");
 
     // Act
     DatabaseConfig config = new DatabaseConfig(props);
 
     // Assert
-    assertThat(config.getScannerFetchSize()).isEqualTo(1000);
+    assertThat(config.getScanFetchSize()).isEqualTo(1000);
   }
 }

core/src/test/java/com/scalar/db/storage/jdbc/JdbcServiceTest.java

@@ -48,7 +48,7 @@
 
 public class JdbcServiceTest {
 
-  private static final int SCANNER_FETCH_SIZE = 10;
+  private static final int SCAN_FETCH_SIZE = 10;
   private static final String NAMESPACE = "ns";
   private static final String TABLE = "tbl";
 
@@ -82,7 +82,7 @@ public void setUp() throws Exception {
     MockitoAnnotations.openMocks(this).close();
     jdbcService =
         new JdbcService(
-            tableMetadataManager, operationChecker, rdbEngine, queryBuilder, SCANNER_FETCH_SIZE);
+            tableMetadataManager, operationChecker, rdbEngine, queryBuilder, SCAN_FETCH_SIZE);
 
     // Arrange
     when(tableMetadataManager.getTableMetadata(any(Operation.class)))
@@ -138,7 +138,7 @@ public void whenGetScannerExecuted_withScan_shouldCallQueryBuilder() throws Exce
     // Assert
     verify(operationChecker).check(any(Scan.class));
     verify(queryBuilder).select(any());
-    verify(preparedStatement).setFetchSize(SCANNER_FETCH_SIZE);
+    verify(preparedStatement).setFetchSize(SCAN_FETCH_SIZE);
 
     assertThat(scanner).isNotNull();
     assertThat(scanner).isInstanceOf(ScannerImpl.class);
@@ -166,7 +166,7 @@ public void whenGetScannerExecuted_withScanAll_shouldCallQueryBuilder() throws E
     // Assert
     verify(operationChecker).check(any(ScanAll.class));
     verify(queryBuilder).select(any());
-    verify(preparedStatement).setFetchSize(SCANNER_FETCH_SIZE);
+    verify(preparedStatement).setFetchSize(SCAN_FETCH_SIZE);
 
     assertThat(scanner).isNotNull();
     assertThat(scanner).isInstanceOf(ScannerImpl.class);
@@ -205,7 +205,7 @@ public void whenGetScannerExecuted_withCrossPartitionScan_shouldCallQueryBuilder
     verify(queryBuilder.select(any())).where(anySet());
     verify(queryBuilder.select(any())).orderBy(anyList());
     verify(queryBuilder.select(any())).limit(anyInt());
-    verify(preparedStatement).setFetchSize(SCANNER_FETCH_SIZE);
+    verify(preparedStatement).setFetchSize(SCAN_FETCH_SIZE);
 
     assertThat(scanner).isNotNull();
     assertThat(scanner).isInstanceOf(ScannerImpl.class);