Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
753618b
Util classes for data loader
inv-jishnu Dec 4, 2024
8d39d02
Fix spotbug issue
inv-jishnu Dec 4, 2024
bf94c49
Removed error message and added core error
inv-jishnu Dec 6, 2024
47be388
Applied spotless
inv-jishnu Dec 6, 2024
913eb1c
Fixed unit test failures
inv-jishnu Dec 6, 2024
1f204b8
Merge branch 'master' into feat/data-loader/utils
ypeckstadt Dec 11, 2024
6cfa83a
Basic data import enum and exception
inv-jishnu Dec 11, 2024
d381b2b
Removed exception class for now
inv-jishnu Dec 11, 2024
67f2474
Added DECIMAL_FORMAT
inv-jishnu Dec 12, 2024
14e3593
Path util class updated
inv-jishnu Dec 12, 2024
a096d51
Feedback changes
inv-jishnu Dec 13, 2024
dbf1940
Merge branch 'master' into feat/data-loader/utils
ypeckstadt Dec 13, 2024
cd8add9
Merge branch 'master' into feat/data-loader/utils
ypeckstadt Dec 16, 2024
52890c8
Changes
inv-jishnu Dec 16, 2024
5114639
Merge branch 'master' into feat/data-loader/import-data-1
inv-jishnu Dec 17, 2024
4f9cd75
Merge branch 'feat/data-loader/utils' into feat/data-loader/scaladb-dao
inv-jishnu Dec 17, 2024
1997eb8
Added ScalarDB Dao
inv-jishnu Dec 17, 2024
91e6310
Merge branch 'master' into feat/data-loader/scaladb-dao
inv-jishnu Dec 17, 2024
8a7338b
Remove unnecessary files
inv-jishnu Dec 17, 2024
2b52eeb
Initial commit [skip ci]
inv-jishnu Dec 17, 2024
e206073
Changes
inv-jishnu Dec 17, 2024
26d3144
Changes
inv-jishnu Dec 18, 2024
b86487d
spotbugs exclude
inv-jishnu Dec 18, 2024
818a2b4
spotbugs exclude -2
inv-jishnu Dec 18, 2024
90c4105
Added a file [skip ci]
inv-jishnu Dec 18, 2024
3d5d3e0
Added unit test files [skip ci]
inv-jishnu Dec 18, 2024
6495202
Spotbug fixes
inv-jishnu Dec 19, 2024
90abd9e
Removed use of List.of to fix CI error
inv-jishnu Dec 19, 2024
ba2b3dd
Merged changes from master after resolving conflict
inv-jishnu Dec 19, 2024
b1b811b
Merge branch 'master' into feat/data-loader/metadata-service
inv-jishnu Dec 19, 2024
30db988
Applied spotless
inv-jishnu Dec 19, 2024
e9bb004
Added export options validator
inv-jishnu Dec 19, 2024
03324e1
Minor change in test
inv-jishnu Dec 19, 2024
d6aaf85
Applied spotless on CoreError
inv-jishnu Dec 19, 2024
4439dea
Make constructor private and improve javadocs
ypeckstadt Dec 19, 2024
ccb1ace
Improve javadocs
ypeckstadt Dec 20, 2024
a374f1a
Add private constructor to TableMetadataUtil
ypeckstadt Dec 20, 2024
a65c9b5
Apply spotless fix
ypeckstadt Dec 20, 2024
b3279ba
Fix the validation for partition and clustering keys
ypeckstadt Dec 23, 2024
78a8170
Fix spotless format
ypeckstadt Dec 23, 2024
acedabe
Partial feedback changes
inv-jishnu Dec 24, 2024
bf31a01
Data chunk and task result enums and dtos
inv-jishnu Dec 24, 2024
57cd330
Spotless applied
inv-jishnu Dec 24, 2024
7a39564
Changes
inv-jishnu Dec 26, 2024
a95a858
Resolved conflicts and merged latest changes from main
inv-jishnu Dec 26, 2024
093cb1d
Merge branch 'feat/data-loader/scaladb-dao' into feat/data-loader/imp…
inv-jishnu Dec 31, 2024
bfebd95
Merge branch 'feat/data-loader/metadata-service' into feat/data-loade…
inv-jishnu Dec 31, 2024
fd1c186
Control file files
inv-jishnu Dec 31, 2024
e2cc6ac
Added task files and dtos
inv-jishnu Jan 2, 2025
8c75b79
Fix unit test failure
inv-jishnu Jan 2, 2025
98618aa
Fix spot bugs failure
inv-jishnu Jan 2, 2025
c05286d
Merge branch 'feat/data-loader/scaladb-dao' into feat/data-loader/exp…
inv-jishnu Jan 2, 2025
0d3f79e
Export tasks added
inv-jishnu Jan 2, 2025
2365460
Merge branch 'feat/data-loader/metadata-service' into feat/data-loade…
inv-jishnu Jan 2, 2025
95022a9
Initial commit [skip ci]
inv-jishnu Jan 2, 2025
be4583c
Added transaction batch dtos
inv-jishnu Jan 3, 2025
89fea78
Added changes
inv-jishnu Jan 6, 2025
29a8c25
Fix spot less issue
inv-jishnu Jan 6, 2025
45adc95
Merge branch 'master' into feat/data-loader/export-tasks
inv-jishnu Jan 6, 2025
5568a7b
Merge branch 'feat/data-loader/import-utils-dtos' into feat/data-load…
inv-jishnu Jan 6, 2025
67dcb06
Merge branch 'master' into feat/data-loader/scaladb-dao
ypeckstadt Jan 7, 2025
2b58dcb
Initial commit
inv-jishnu Jan 8, 2025
cebb543
Merge branch 'master' into feat/data-loader/control-file
ypeckstadt Jan 8, 2025
3abd13b
Initial commit
inv-jishnu Jan 9, 2025
8ecb39c
Changes -1
inv-jishnu Jan 9, 2025
c7ba6c8
Description added
inv-jishnu Jan 10, 2025
a566ef2
Code updated to support java 8
inv-jishnu Jan 13, 2025
f6c54ec
Updated test code to remove warning
inv-jishnu Jan 13, 2025
b92758c
Merged latest changes from main after resolving conflicts
inv-jishnu Jan 13, 2025
9f0411b
Merge branch 'feat/data-loader/import-process' into feat/data-loader/…
inv-jishnu Jan 13, 2025
ee252d2
Added import manager
inv-jishnu Jan 14, 2025
95183e9
Merge branch 'feat/data-loader/import-process' into feat/data-loader/…
inv-jishnu Jan 14, 2025
10409a8
Change code to be compatible with java 8
inv-jishnu Jan 14, 2025
0180a37
Change code to be compatible with java 8 -2
inv-jishnu Jan 14, 2025
90c4830
Changes added
inv-jishnu Jan 16, 2025
39c43de
Removed scalardb manager file
inv-jishnu Jan 16, 2025
3fe30a3
Merge branch 'master' into feat/data-loader/scaladb-dao
inv-jishnu Jan 20, 2025
4df4acd
Removed wildcard import
inv-jishnu Jan 20, 2025
53cd523
Merge branch 'master' into feat/data-loader/scaladb-dao
inv-jishnu Jan 23, 2025
f4f253e
Changes
inv-jishnu Jan 28, 2025
6d43bdc
Merge branch 'master' into feat/data-loader/scaladb-dao
inv-jishnu Jan 28, 2025
9c4ae23
Resolved conflicts and merge latest changes from master
inv-jishnu Jan 28, 2025
c9d01cb
Added default case in switch to resolve sportbugs warning
inv-jishnu Jan 28, 2025
50be8fd
Merge branch 'master' into feat/data-loader/import-process
inv-jishnu Jan 28, 2025
9224c7b
Merge branch 'master' into feat/data-loader/import-task
inv-jishnu Jan 28, 2025
5e61fd1
Merge branch 'master' into feat/data-loader/control-file
inv-jishnu Jan 28, 2025
b83215e
Merge branch 'master' into feat/data-loader/import-log
inv-jishnu Jan 28, 2025
f024670
Merge branch 'feat/data-loader/scaladb-dao' into feat/data-loader/con…
inv-jishnu Jan 29, 2025
d453e6c
Change wildcard imports
inv-jishnu Jan 30, 2025
39ecefe
Merge changes from master after resolving conflicts
inv-jishnu Jan 31, 2025
0984d51
Resolved conflicts and merged latest changes from main
inv-jishnu Feb 3, 2025
aadf3e1
Resolved conflicts and merged latest changes from master
inv-jishnu Feb 3, 2025
6998b68
Changes
inv-jishnu Feb 3, 2025
3c79ab6
Merged changes from master after resolving conflicts
inv-jishnu Feb 3, 2025
3ff03d9
Merge branch 'master' into feat/data-loader/export-tasks
inv-jishnu Feb 4, 2025
f3fb8d8
Merge branch 'master' into feat/data-loader/control-file
inv-jishnu Feb 4, 2025
6dd2ce2
Resolved conflicts and merged changes from branch feat/data-loader/co…
inv-jishnu Feb 4, 2025
1996865
Reverted new line removal
inv-jishnu Feb 4, 2025
8a1e6b9
Merge branch 'feat/data-loader/import-task' into feat/data-loader/imp…
inv-jishnu Feb 4, 2025
d643152
Merge branch 'feat/data-loader/import-process' into feat/data-loader/…
inv-jishnu Feb 4, 2025
3187847
Changes to util function calls
inv-jishnu Feb 4, 2025
e8674f5
Merge branch 'feat/data-loader/import-process' into feat/data-loader/…
inv-jishnu Feb 4, 2025
da2e241
Merge export tasks branch after resolving conflicts
inv-jishnu Feb 4, 2025
7d7ec91
Revert "Merge export tasks branch after resolving conflicts"
inv-jishnu Feb 4, 2025
31094b1
Resolved conflicts and merged latest changes from main
inv-jishnu Feb 7, 2025
aebcef6
Removing unwanted changes [skip ci]
inv-jishnu Feb 7, 2025
b5134b1
Changes
inv-jishnu Feb 10, 2025
285f51d
Java doc minor change [skip ci]
inv-jishnu Feb 10, 2025
01ce7d3
Merged changes from feat/data-loader/import-task after resolving conf…
inv-jishnu Feb 10, 2025
9cadea4
Constant file added
inv-jishnu Feb 10, 2025
a86b658
Changes [skip ci]
inv-jishnu Feb 11, 2025
719c72a
Merged latest changes
inv-jishnu Feb 11, 2025
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
20 changes: 20 additions & 0 deletions core/src/main/java/com/scalar/db/common/error/CoreError.java
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,26 @@ public enum CoreError implements ScalarDbError {
"Duplicated data mappings found for column '%s' in table '%s'",
"",
""),
DATA_LOADER_MISSING_CLUSTERING_KEY_COLUMN(
Category.USER_ERROR,
"0175",
"Missing required field or column mapping for clustering key %s",
"",
""),
DATA_LOADER_MISSING_PARTITION_KEY_COLUMN(
Category.USER_ERROR,
"0176",
"Missing required field or column mapping for partition key %s",
"",
""),
DATA_LOADER_MISSING_COLUMN(
Category.USER_ERROR, "0177", "Missing field or column mapping for %s", "", ""),
DATA_LOADER_MISSING_SOURCE_FIELD(
Category.USER_ERROR,
"0178",
"The data mapping source field '%s' for table '%s' is missing in the json data record",
"",
""),

//
// Errors for the concurrency error category
Expand Down
1 change: 1 addition & 0 deletions data-loader/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ subprojects {
implementation("org.apache.commons:commons-lang3:${commonsLangVersion}")
implementation("commons-io:commons-io:${commonsIoVersion}")
implementation("org.slf4j:slf4j-simple:${slf4jVersion}")
implementation("software.amazon.awssdk:s3:2.25.31")

// Mockito
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.scalar.db.dataloader.core;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

public class DataLoaderObjectMapper extends ObjectMapper {

public DataLoaderObjectMapper() {
super();
this.setSerializationInclusion(JsonInclude.Include.NON_NULL);
this.registerModule(new JavaTimeModule());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.scalar.db.dataloader.core.dataimport;

import com.scalar.db.dataloader.core.dataimport.datachunk.ImportDataChunkStatus;
import com.scalar.db.dataloader.core.dataimport.task.result.ImportTaskResult;
import com.scalar.db.dataloader.core.dataimport.transactionbatch.ImportTransactionBatchResult;
import com.scalar.db.dataloader.core.dataimport.transactionbatch.ImportTransactionBatchStatus;

public interface ImportEventListener {

void onDataChunkStarted(ImportDataChunkStatus status);

void addOrUpdateDataChunkStatus(ImportDataChunkStatus status);

void onDataChunkCompleted(ImportDataChunkStatus status);

void onAllDataChunksCompleted();

void onTransactionBatchStarted(ImportTransactionBatchStatus batchStatus);

void onTransactionBatchCompleted(ImportTransactionBatchResult batchResult);

void onTaskComplete(ImportTaskResult taskResult);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
package com.scalar.db.dataloader.core.dataimport;

import com.scalar.db.api.DistributedStorage;
import com.scalar.db.api.DistributedTransactionManager;
import com.scalar.db.api.TableMetadata;
import com.scalar.db.dataloader.core.ScalarDBMode;
import com.scalar.db.dataloader.core.dataimport.dao.ScalarDBDao;
import com.scalar.db.dataloader.core.dataimport.datachunk.ImportDataChunkStatus;
import com.scalar.db.dataloader.core.dataimport.processor.ImportProcessor;
import com.scalar.db.dataloader.core.dataimport.processor.ImportProcessorFactory;
import com.scalar.db.dataloader.core.dataimport.processor.ImportProcessorParams;
import com.scalar.db.dataloader.core.dataimport.processor.TableColumnDataTypes;
import com.scalar.db.dataloader.core.dataimport.task.result.ImportTaskResult;
import com.scalar.db.dataloader.core.dataimport.transactionbatch.ImportTransactionBatchResult;
import com.scalar.db.dataloader.core.dataimport.transactionbatch.ImportTransactionBatchStatus;
import java.io.BufferedReader;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import lombok.AllArgsConstructor;
import lombok.NonNull;

@AllArgsConstructor
public class ImportManager implements ImportEventListener {

@NonNull private final Map<String, TableMetadata> tableMetadata;
@NonNull private final BufferedReader importFileReader;
@NonNull private final ImportOptions importOptions;
private final ImportProcessorFactory importProcessorFactory;
private final List<ImportEventListener> listeners = new ArrayList<>();
private final ScalarDBMode scalarDBMode;
private final DistributedStorage distributedStorage;
private final DistributedTransactionManager distributedTransactionManager;
private final List<ImportDataChunkStatus> importDataChunkStatusList = new ArrayList<>();

/**
* * Start the import process
*
* @return list of import data chunk status objects
*/
public List<ImportDataChunkStatus> startImport() {
ImportProcessorParams params =
ImportProcessorParams.builder()
.scalarDBMode(scalarDBMode)
.importOptions(importOptions)
.tableMetadataByTableName(tableMetadata)
.dao(new ScalarDBDao())
.distributedTransactionManager(distributedTransactionManager)
.distributedStorage(distributedStorage)
.tableColumnDataTypes(getTableColumnDataTypes())
.build();
ImportProcessor processor = importProcessorFactory.createImportProcessor(params);
processor.addListener(this);
// If the data chunk size is 0, then process the entire file in a single data chunk
int dataChunkSize =
importOptions.getDataChunkSize() == 0
? Integer.MAX_VALUE
: importOptions.getDataChunkSize();
return processor.process(
dataChunkSize, importOptions.getTransactionBatchSize(), importFileReader);
}

public void addListener(ImportEventListener listener) {
listeners.add(listener);
}

public void removeListener(ImportEventListener listener) {
listeners.remove(listener);
}

@Override
public void onDataChunkStarted(ImportDataChunkStatus status) {
for (ImportEventListener listener : listeners) {
listener.onDataChunkStarted(status);
}
}

@Override
public void addOrUpdateDataChunkStatus(ImportDataChunkStatus status) {
synchronized (importDataChunkStatusList) {
for (int i = 0; i < importDataChunkStatusList.size(); i++) {
if (importDataChunkStatusList.get(i).getDataChunkId() == status.getDataChunkId()) {
// Object found, replace it with the new one
importDataChunkStatusList.set(i, status);
return;
}
}
// If object is not found, add it to the list
importDataChunkStatusList.add(status);
}
}

@Override
public void onDataChunkCompleted(ImportDataChunkStatus status) {
for (ImportEventListener listener : listeners) {
listener.onDataChunkCompleted(status);
}
}

@Override
public void onTransactionBatchStarted(ImportTransactionBatchStatus status) {
for (ImportEventListener listener : listeners) {
listener.onTransactionBatchStarted(status);
}
}

@Override
public void onTransactionBatchCompleted(ImportTransactionBatchResult batchResult) {
for (ImportEventListener listener : listeners) {
listener.onTransactionBatchCompleted(batchResult);
}
}

@Override
public void onTaskComplete(ImportTaskResult taskResult) {
for (ImportEventListener listener : listeners) {
listener.onTaskComplete(taskResult);
}
}

@Override
public void onAllDataChunksCompleted() {
for (ImportEventListener listener : listeners) {
listener.onAllDataChunksCompleted();
}
}

public List<ImportDataChunkStatus> getImportDataChunkStatusList() {
return importDataChunkStatusList;
}

public TableColumnDataTypes getTableColumnDataTypes() {
TableColumnDataTypes tableColumnDataTypes = new TableColumnDataTypes();
tableMetadata.forEach(
(name, metadata) ->
metadata
.getColumnDataTypes()
.forEach((k, v) -> tableColumnDataTypes.addColumnDataType(name, k, v)));
return tableColumnDataTypes;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.scalar.db.dataloader.core.dataimport;

import com.scalar.db.dataloader.core.FileFormat;
import com.scalar.db.dataloader.core.dataimport.controlfile.ControlFile;
import com.scalar.db.dataloader.core.dataimport.controlfile.ControlFileValidationLevel;
import com.scalar.db.dataloader.core.dataimport.log.LogMode;
import lombok.Builder;
import lombok.Data;

/** Import options to import data into one or more ScalarDB tables */
@Builder
@Data
public class ImportOptions {

@Builder.Default private final ImportMode importMode = ImportMode.UPSERT;
@Builder.Default private final boolean requireAllColumns = false;
@Builder.Default private final FileFormat fileFormat = FileFormat.JSON;
@Builder.Default private final boolean prettyPrint = false;
@Builder.Default private final boolean ignoreNullValues = false;
@Builder.Default private final LogMode logMode = LogMode.SPLIT_BY_DATA_CHUNK;

@Builder.Default
private final ControlFileValidationLevel controlFileValidationLevel =
ControlFileValidationLevel.MAPPED;

@Builder.Default private final char delimiter = ',';

@Builder.Default private final boolean logSuccessRecords = false;
@Builder.Default private final boolean logRawRecord = false;

private final int dataChunkSize;
private final int transactionBatchSize;
private final ControlFile controlFile;
private final String namespace;
private final String tableName;
private final int maxThreads;
private final String customHeaderRow;
}
Loading
Loading