Skip to content

Commit 7502fe8

Browse files
committed
Merge branch 'feat/data-loader/table-metadata-replace-storage' into feat/data-loader/import-replace-storage
2 parents e8f9feb + 98e84bb commit 7502fe8

File tree

1 file changed

+7
-4
lines changed
  • data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataexport

1 file changed

+7
-4
lines changed

data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataexport/ExportCommand.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import static java.nio.file.StandardOpenOption.APPEND;
66
import static java.nio.file.StandardOpenOption.CREATE;
77

8+
import com.scalar.db.api.DistributedTransactionAdmin;
89
import com.scalar.db.api.DistributedTransactionManager;
910
import com.scalar.db.api.TableMetadata;
1011
import com.scalar.db.dataloader.cli.exception.DirectoryValidationException;
@@ -64,15 +65,17 @@ public Integer call() throws Exception {
6465
validatePositiveValue(spec.commandLine(), maxThreads, DataLoaderError.INVALID_MAX_THREADS);
6566

6667
TransactionFactory transactionFactory = TransactionFactory.create(scalarDbPropertiesFilePath);
67-
TableMetadataService metaDataService =
68-
new TableMetadataService(transactionFactory.getTransactionAdmin());
68+
TableMetadata tableMetadata;
69+
try (DistributedTransactionAdmin admin = transactionFactory.getTransactionAdmin()) {
70+
TableMetadataService metaDataService = new TableMetadataService(admin);
71+
tableMetadata = metaDataService.getTableMetadata(namespace, table);
72+
}
73+
6974
ScalarDbDao scalarDbDao = new ScalarDbDao();
7075

7176
ExportManager exportManager =
7277
createExportManager(transactionFactory, scalarDbDao, outputFormat);
7378

74-
TableMetadata tableMetadata = metaDataService.getTableMetadata(namespace, table);
75-
7679
Key partitionKey =
7780
partitionKeyValue != null ? getKeysFromList(partitionKeyValue, tableMetadata) : null;
7881
Key scanStartKey =

0 commit comments

Comments
 (0)