Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import static java.nio.file.StandardOpenOption.APPEND;
import static java.nio.file.StandardOpenOption.CREATE;

import com.scalar.db.api.DistributedTransactionAdmin;
import com.scalar.db.api.DistributedTransactionManager;
import com.scalar.db.api.TableMetadata;
import com.scalar.db.dataloader.cli.exception.DirectoryValidationException;
Expand All @@ -28,7 +29,6 @@
import com.scalar.db.dataloader.core.tablemetadata.TableMetadataService;
import com.scalar.db.dataloader.core.util.KeyUtils;
import com.scalar.db.io.Key;
import com.scalar.db.service.StorageFactory;
import com.scalar.db.service.TransactionFactory;
import java.io.BufferedWriter;
import java.nio.charset.Charset;
Expand Down Expand Up @@ -69,17 +69,17 @@ public Integer call() throws Exception {
maxThreads = Runtime.getRuntime().availableProcessors();
}

StorageFactory storageFactory = StorageFactory.create(scalarDbPropertiesFilePath);
TransactionFactory transactionFactory = TransactionFactory.create(scalarDbPropertiesFilePath);
TableMetadataService metaDataService =
new TableMetadataService(storageFactory.getStorageAdmin());
TableMetadata tableMetadata;
try (DistributedTransactionAdmin admin = transactionFactory.getTransactionAdmin()) {
TableMetadataService metaDataService = new TableMetadataService(admin);
tableMetadata = metaDataService.getTableMetadata(namespace, table);
}
ScalarDbDao scalarDbDao = new ScalarDbDao();

ExportManager exportManager =
createExportManager(transactionFactory, scalarDbDao, outputFormat);

TableMetadata tableMetadata = metaDataService.getTableMetadata(namespace, table);

Key partitionKey =
partitionKeyValue != null ? getKeysFromList(partitionKeyValue, tableMetadata) : null;
Key scanStartKey =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import static com.scalar.db.dataloader.cli.util.CommandLineInputUtils.validatePositiveValue;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.scalar.db.api.DistributedStorageAdmin;
import com.scalar.db.api.DistributedTransactionAdmin;
import com.scalar.db.api.TableMetadata;
import com.scalar.db.dataloader.core.DataLoaderError;
import com.scalar.db.dataloader.core.FileFormat;
Expand Down Expand Up @@ -112,9 +112,9 @@ private Map<String, TableMetadata> createTableMetadataMap(
ControlFile controlFile, String namespace, String tableName)
throws IOException, TableMetadataException {
File configFile = new File(configFilePath);
StorageFactory storageFactory = StorageFactory.create(configFile);
try (DistributedStorageAdmin storageAdmin = storageFactory.getStorageAdmin()) {
TableMetadataService tableMetadataService = new TableMetadataService(storageAdmin);
TransactionFactory transactionFactory = TransactionFactory.create(configFile);
try (DistributedTransactionAdmin transactionAdmin = transactionFactory.getTransactionAdmin()) {
TableMetadataService tableMetadataService = new TableMetadataService(transactionAdmin);
Map<String, TableMetadata> tableMetadataMap = new HashMap<>();
if (controlFile != null) {
for (ControlFileTable table : controlFile.getTables()) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.scalar.db.dataloader.core.tablemetadata;

import com.scalar.db.api.DistributedStorageAdmin;
import com.scalar.db.api.DistributedTransactionAdmin;
import com.scalar.db.api.TableMetadata;
import com.scalar.db.dataloader.core.DataLoaderError;
import com.scalar.db.dataloader.core.util.TableMetadataUtil;
Expand All @@ -18,7 +18,7 @@
@RequiredArgsConstructor
public class TableMetadataService {

private final DistributedStorageAdmin storageAdmin;
private final DistributedTransactionAdmin transactionAdmin;

/**
* Retrieves the {@link TableMetadata} for a specific namespace and table name.
Expand All @@ -32,7 +32,7 @@ public class TableMetadataService {
public TableMetadata getTableMetadata(String namespace, String tableName)
throws TableMetadataException {
try {
TableMetadata tableMetadata = storageAdmin.getTableMetadata(namespace, tableName);
TableMetadata tableMetadata = transactionAdmin.getTableMetadata(namespace, tableName);
if (tableMetadata == null) {
throw new TableMetadataException(
DataLoaderError.MISSING_NAMESPACE_OR_TABLE.buildMessage(namespace, tableName));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import static org.assertj.core.api.Assertions.assertThatThrownBy;

import com.scalar.db.api.DistributedStorageAdmin;
import com.scalar.db.api.DistributedTransactionAdmin;
import com.scalar.db.api.TableMetadata;
import com.scalar.db.dataloader.core.DataLoaderError;
import com.scalar.db.dataloader.core.UnitTestUtils;
Expand All @@ -17,15 +17,15 @@

class TableMetadataServiceTest {

DistributedStorageAdmin storageAdmin;
DistributedTransactionAdmin transactionAdmin;
TableMetadataService tableMetadataService;

@BeforeEach
void setup() throws ExecutionException {
storageAdmin = Mockito.mock(DistributedStorageAdmin.class);
Mockito.when(storageAdmin.getTableMetadata("namespace", "table"))
transactionAdmin = Mockito.mock(DistributedTransactionAdmin.class);
Mockito.when(transactionAdmin.getTableMetadata("namespace", "table"))
.thenReturn(UnitTestUtils.createTestTableMetadata());
tableMetadataService = new TableMetadataService(storageAdmin);
tableMetadataService = new TableMetadataService(transactionAdmin);
}

@Test
Expand Down