Skip to content

Commit a440e25

Browse files
committed
Fix based on feedback
1 parent 9a4fdd6 commit a440e25

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,9 +425,7 @@ private TableMetadata mergeSourceTableMetadata(
425425
builder.addSecondaryIndex(secondaryIndex);
426426
}
427427
for (String secondaryIndex : rightSourceTableMetadata.getSecondaryIndexNames()) {
428-
if (!primaryKeyColumns.contains(secondaryIndex)) {
429-
builder.addSecondaryIndex(secondaryIndex);
430-
}
428+
builder.addSecondaryIndex(secondaryIndex);
431429
}
432430

433431
return builder.build();

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@ public void getTableMetadata_VirtualTableExists_ShouldReturnMergedTableMetadata(
412412
.addColumn("col1", DataType.BOOLEAN)
413413
.addColumn("col2", DataType.DOUBLE)
414414
.addColumn("col3", DataType.BLOB)
415+
.addSecondaryIndex("ck1")
415416
.addSecondaryIndex("col1")
416417
.addSecondaryIndex("col2")
417418
.build();
@@ -429,6 +430,7 @@ public void getTableMetadata_VirtualTableExists_ShouldReturnMergedTableMetadata(
429430
.addColumn("col4", DataType.FLOAT)
430431
.addColumn("col5", DataType.DATE)
431432
.addColumn("col6", DataType.TIMESTAMP)
433+
.addSecondaryIndex("ck2")
432434
.addSecondaryIndex("col4")
433435
.build();
434436

@@ -463,7 +465,8 @@ public void getTableMetadata_VirtualTableExists_ShouldReturnMergedTableMetadata(
463465
assertThat(result.getColumnDataType("col4")).isEqualTo(DataType.FLOAT);
464466
assertThat(result.getColumnDataType("col5")).isEqualTo(DataType.DATE);
465467
assertThat(result.getColumnDataType("col6")).isEqualTo(DataType.TIMESTAMP);
466-
assertThat(result.getSecondaryIndexNames()).containsExactlyInAnyOrder("col1", "col2", "col4");
468+
assertThat(result.getSecondaryIndexNames())
469+
.containsExactlyInAnyOrder("ck1", "ck2", "col1", "col2", "col4");
467470
}
468471

469472
@Test

0 commit comments

Comments
 (0)