Fix

Author: brfrn169

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

@@ -326,8 +326,9 @@ private boolean setConditions(
 
   private Key getKeyWithoutLastValue(Key originalKey) {
     Key.Builder keyBuilder = Key.newBuilder();
-    for (int i = 0; i < originalKey.getColumns().size() - 1; i++) {
-      keyBuilder.add(originalKey.getColumns().get(i));
+    List<Column<?>> columns = originalKey.getColumns();
+    for (int i = 0; i < columns.size() - 1; i++) {
+      keyBuilder.add(columns.get(i));
     }
     return keyBuilder.build();
   }

core/src/test/java/com/scalar/db/common/ResultImplTest.java

@@ -539,7 +539,7 @@ public void getPartitionKey_RequiredValuesGiven_ShouldReturnPartitionKey() {
 
     // Assert
     assertThat(key.isPresent()).isTrue();
-    assertThat(key.get().getColumns().size()).isEqualTo(1);
+    assertThat(key.get().size()).isEqualTo(1);
     assertThat(key.get().getColumns().get(0)).isEqualTo(TextColumn.of(ANY_NAME_1, ANY_TEXT_1));
   }
 
@@ -570,7 +570,7 @@ public void getClusteringKey_RequiredValuesGiven_ShouldReturnClusteringKey() {
 
     // Assert
     assertThat(key.isPresent()).isTrue();
-    assertThat(key.get().getColumns().size()).isEqualTo(1);
+    assertThat(key.get().size()).isEqualTo(1);
     assertThat(key.get().getColumns().get(0)).isEqualTo(TextColumn.of(ANY_NAME_2, ANY_TEXT_2));
   }
 

core/src/test/java/com/scalar/db/transaction/consensuscommit/FilteredResultTest.java

@@ -94,12 +94,12 @@ public void withoutProjections_ShouldFilterOutTransactionMetaColumns() {
 
     // Act Assert
     assertThat(filteredResult.getPartitionKey()).isPresent();
-    assertThat(filteredResult.getPartitionKey().get().getColumns().size()).isEqualTo(1);
+    assertThat(filteredResult.getPartitionKey().get().size()).isEqualTo(1);
     assertThat(filteredResult.getPartitionKey().get().getColumns().get(0))
         .isEqualTo(ACCOUNT_ID_VALUE);
 
     assertThat(filteredResult.getClusteringKey()).isPresent();
-    assertThat(filteredResult.getClusteringKey().get().getColumns().size()).isEqualTo(1);
+    assertThat(filteredResult.getClusteringKey().get().size()).isEqualTo(1);
     assertThat(filteredResult.getClusteringKey().get().getColumns().get(0))
         .isEqualTo(ACCOUNT_TYPE_VALUE);
 
@@ -164,7 +164,7 @@ public void withoutProjectionsAndIncludeMetadataEnabled_ShouldContainAllColumns(
 
     // Act Assert
     assertThat(filteredResult.getPartitionKey()).isPresent();
-    assertThat(filteredResult.getPartitionKey().get().getColumns().size()).isEqualTo(1);
+    assertThat(filteredResult.getPartitionKey().get().size()).isEqualTo(1);
     assertThat(filteredResult.getPartitionKey().get().getColumns().get(0))
         .isEqualTo(ACCOUNT_ID_VALUE);
 
@@ -316,7 +316,7 @@ public void withProjections_ShouldFilterOutUnprojectedColumnsAndTransactionMetaC
 
     // Act Assert
     assertThat(filteredResult.getPartitionKey()).isPresent();
-    assertThat(filteredResult.getPartitionKey().get().getColumns().size()).isEqualTo(1);
+    assertThat(filteredResult.getPartitionKey().get().size()).isEqualTo(1);
     assertThat(filteredResult.getPartitionKey().get().getColumns().get(0))
         .isEqualTo(ACCOUNT_ID_VALUE);
 
@@ -384,7 +384,7 @@ public void withProjectionsAndIncludeMetadataEnabled_ShouldNotIncludeNonProjecte
 
     // Act Assert
     assertThat(filteredResult.getPartitionKey()).isPresent();
-    assertThat(filteredResult.getPartitionKey().get().getColumns().size()).isEqualTo(1);
+    assertThat(filteredResult.getPartitionKey().get().size()).isEqualTo(1);
     assertThat(filteredResult.getPartitionKey().get().getColumns().get(0))
         .isEqualTo(ACCOUNT_ID_VALUE);
 
@@ -462,7 +462,7 @@ public void withProjectionsAndIncludeMetadataEnabled_ShouldNotIncludeNonProjecte
 
     // Act Assert
     assertThat(filteredResult.getPartitionKey()).isPresent();
-    assertThat(filteredResult.getPartitionKey().get().getColumns().size()).isEqualTo(1);
+    assertThat(filteredResult.getPartitionKey().get().size()).isEqualTo(1);
     assertThat(filteredResult.getPartitionKey().get().getColumns().get(0))
         .isEqualTo(ACCOUNT_ID_VALUE);
 
@@ -524,7 +524,7 @@ public void withProjectionsAndIncludeMetadataEnabled_ShouldNotIncludeNonProjecte
         .isInstanceOf(IllegalStateException.class);
 
     assertThat(filteredResult.getClusteringKey()).isPresent();
-    assertThat(filteredResult.getClusteringKey().get().getColumns().size()).isEqualTo(1);
+    assertThat(filteredResult.getClusteringKey().get().size()).isEqualTo(1);
     assertThat(filteredResult.getClusteringKey().get().getColumns().get(0))
         .isEqualTo(ACCOUNT_TYPE_VALUE);
 

core/src/test/java/com/scalar/db/util/ScalarDbUtilsTest.java

@@ -554,7 +554,7 @@ public void getPartitionKey_ShouldReturnPartitionKey() {
     Key actual = ScalarDbUtils.getPartitionKey(result, tableMetadata);
 
     // Assert
-    assertThat(actual.getColumns().size()).isEqualTo(2);
+    assertThat(actual.size()).isEqualTo(2);
     assertThat(actual.getColumns().get(0)).isInstanceOf(TextColumn.class);
     assertThat(actual.getColumns().get(0).getName()).isEqualTo("c1");
     assertThat(actual.getColumns().get(0).getTextValue()).isEqualTo("v1");
@@ -594,7 +594,7 @@ public void getClusteringKey_ShouldReturnClusteringKey() {
 
     // Assert
     assertThat(actual).isPresent();
-    assertThat(actual.get().getColumns().size()).isEqualTo(2);
+    assertThat(actual.get().size()).isEqualTo(2);
     assertThat(actual.get().getColumns().get(0)).isInstanceOf(IntColumn.class);
     assertThat(actual.get().getColumns().get(0).getName()).isEqualTo("c3");
     assertThat(actual.get().getColumns().get(0).getIntValue()).isEqualTo(3);

data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataexport/validation/ExportOptionsValidator.java

@@ -59,7 +59,7 @@ private static void validatePartitionKey(LinkedHashSet<String> partitionKeyNames
     }
 
     // Make sure that all partition key columns are provided
-    if (partitionKeyNames.size() != key.getColumns().size()) {
+    if (partitionKeyNames.size() != key.size()) {
       throw new ExportOptionsValidationException(
           DataLoaderError.INCOMPLETE_PARTITION_KEY.buildMessage(partitionKeyNames));
     }