raw record initial changes

Author: inv-jishnu

data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataimport/log/SingleFileImportLogger.java

@@ -74,7 +74,6 @@ public SingleFileImportLogger(ImportLoggerConfig config, LogWriterFactory logWri
    */
   @Override
   public void onTaskComplete(ImportTaskResult taskResult) {
-    if (!config.isLogSuccessRecordsEnabled() && !config.isLogRawSourceRecordsEnabled()) return;
     try {
       writeImportTaskResultDetailToLogs(taskResult);
     } catch (Exception e) {
@@ -199,9 +198,7 @@ private void writeImportTaskResultDetailToLogs(ImportTaskResult importTaskResult
           && target.getStatus().equals(ImportTargetResultStatus.SAVED)) {
 
         writeToLogWriter(successLogWriter, OBJECT_MAPPER.valueToTree(target));
-      }
-      if (config.isLogRawSourceRecordsEnabled()
-          && !target.getStatus().equals(ImportTargetResultStatus.SAVED)) {
+      } else if (!target.getStatus().equals(ImportTargetResultStatus.SAVED)) {
         writeToLogWriter(failureLogWriter, OBJECT_MAPPER.valueToTree(target));
       }
     }

data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataimport/log/SplitByDataChunkImportLogger.java

@@ -73,7 +73,6 @@ public SplitByDataChunkImportLogger(
    */
   @Override
   public void onTaskComplete(ImportTaskResult taskResult) {
-    if (!config.isLogSuccessRecordsEnabled() && !config.isLogRawSourceRecordsEnabled()) return;
     try {
       writeImportTaskResultDetailToLogs(taskResult);
     } catch (IOException e) {
@@ -94,8 +93,7 @@ private void writeImportTaskResultDetailToLogs(ImportTaskResult importTaskResult
       ImportTargetResultStatus status = target.getStatus();
       if (status.equals(ImportTargetResultStatus.SAVED) && config.isLogSuccessRecordsEnabled()) {
         writeLog(target, LogFileType.SUCCESS, importTaskResult.getDataChunkId());
-      } else if (!status.equals(ImportTargetResultStatus.SAVED)
-          && config.isLogRawSourceRecordsEnabled()) {
+      } else if (!status.equals(ImportTargetResultStatus.SAVED)) {
         writeLog(target, LogFileType.FAILURE, importTaskResult.getDataChunkId());
       }
     }

data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataimport/task/ImportTask.java

@@ -183,6 +183,7 @@ private ImportTargetResult importIntoSingleTable(
           .tableName(table)
           .status(ImportTargetResultStatus.VALIDATION_FAILED)
           .errors(Collections.singletonList(DataLoaderError.TABLE_METADATA_MISSING.buildMessage()))
+          .importedRecord(importOptions.isLogRawRecord() ? mutableSourceRecord : null)
           .build();
     }
 
@@ -209,6 +210,7 @@ private ImportTargetResult importIntoSingleTable(
           .tableName(table)
           .status(ImportTargetResultStatus.VALIDATION_FAILED)
           .errors(validationResult.getErrorMessages())
+          .importedRecord(importOptions.isLogRawRecord() ? mutableSourceRecord : null)
           .build();
     }
 
@@ -223,6 +225,7 @@ private ImportTargetResult importIntoSingleTable(
           .errors(
               Collections.singletonList(
                   DataLoaderError.COULD_NOT_FIND_PARTITION_KEY.buildMessage()))
+          .importedRecord(importOptions.isLogRawRecord() ? mutableSourceRecord : null)
           .build();
     }
     Optional<Key> optionalClusteringKey = Optional.empty();
@@ -238,6 +241,7 @@ private ImportTargetResult importIntoSingleTable(
             .errors(
                 Collections.singletonList(
                     DataLoaderError.COULD_NOT_FIND_CLUSTERING_KEY.buildMessage()))
+            .importedRecord(importOptions.isLogRawRecord() ? mutableSourceRecord : null)
             .build();
       }
     }
@@ -254,6 +258,7 @@ private ImportTargetResult importIntoSingleTable(
           .tableName(table)
           .status(ImportTargetResultStatus.RETRIEVAL_FAILED)
           .errors(Collections.singletonList(e.getMessage()))
+          .importedRecord(importOptions.isLogRawRecord() ? mutableSourceRecord : null)
           .build();
     }
     ImportTaskAction importAction =
@@ -273,6 +278,7 @@ && shouldRevalidateMissingColumns(importOptions, checkForMissingColumns)) {
             .errors(
                 Collections.singletonList(
                     DataLoaderError.UPSERT_INSERT_MISSING_COLUMNS.buildMessage()))
+            .importedRecord(importOptions.isLogRawRecord() ? mutableSourceRecord : null)
             .build();
       }
     }
@@ -281,7 +287,7 @@ && shouldRevalidateMissingColumns(importOptions, checkForMissingColumns)) {
       return ImportTargetResult.builder()
           .namespace(namespace)
           .tableName(table)
-          .importedRecord(mutableSourceRecord)
+          .importedRecord(importOptions.isLogRawRecord() ? mutableSourceRecord : null)
           .importAction(importAction)
           .status(ImportTargetResultStatus.DATA_ALREADY_EXISTS)
           .errors(Collections.singletonList(DataLoaderError.DATA_ALREADY_EXISTS.buildMessage()))
@@ -292,7 +298,7 @@ && shouldRevalidateMissingColumns(importOptions, checkForMissingColumns)) {
       return ImportTargetResult.builder()
           .namespace(namespace)
           .tableName(table)
-          .importedRecord(mutableSourceRecord)
+          .importedRecord(importOptions.isLogRawRecord() ? mutableSourceRecord : null)
           .importAction(importAction)
           .status(ImportTargetResultStatus.DATA_NOT_FOUND)
           .errors(Collections.singletonList(DataLoaderError.DATA_NOT_FOUND.buildMessage()))
@@ -314,7 +320,7 @@ && shouldRevalidateMissingColumns(importOptions, checkForMissingColumns)) {
       return ImportTargetResult.builder()
           .namespace(namespace)
           .tableName(table)
-          .importedRecord(mutableSourceRecord)
+          .importedRecord(importOptions.isLogRawRecord() ? mutableSourceRecord : null)
           .status(ImportTargetResultStatus.VALIDATION_FAILED)
           .errors(Collections.singletonList(e.getMessage()))
           .build();
@@ -333,13 +339,14 @@ && shouldRevalidateMissingColumns(importOptions, checkForMissingColumns)) {
           .namespace(namespace)
           .tableName(table)
           .importAction(importAction)
-          .importedRecord(mutableSourceRecord)
+          .importedRecord(importOptions.isLogRawRecord() ? mutableSourceRecord : null)
           .status(ImportTargetResultStatus.SAVED)
           .build();
 
     } catch (ScalarDbDaoException e) {
       return ImportTargetResult.builder()
           .namespace(namespace)
+          .importedRecord(importOptions.isLogRawRecord() ? mutableSourceRecord : null)
           .tableName(table)
           .importAction(importAction)
           .status(ImportTargetResultStatus.SAVE_FAILED)