Initial commit

Author: inv-jishnu

data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataimport/ImportCommand.java

@@ -40,6 +40,8 @@
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.ParameterException;
@@ -48,13 +50,16 @@
 @CommandLine.Command(name = "import", description = "Import data into a ScalarDB table")
 public class ImportCommand extends ImportCommandOptions implements Callable<Integer> {
 
+    private static final Logger logger = LoggerFactory.getLogger(ImportCommand.class);
+
   /** Spec injected by PicoCli */
   @Spec CommandSpec spec;
 
   @Override
   public Integer call() throws Exception {
     validateDeprecatedOptions();
     applyDeprecatedOptions();
+    warnAboutIgnoredDeprecatedOptions();
     validateImportTarget(controlFilePath, namespace, tableName);
     validateLogDirectory(logDirectory);
     validatePositiveValue(
@@ -279,6 +284,28 @@ private Optional<ControlFile> parseControlFileFromPath(String controlFilePath) {
           spec.commandLine(), DataLoaderError.INVALID_CONTROL_FILE.buildMessage(controlFilePath));
     }
   }
+    /** Warns about deprecated options that are no longer used and have been completely ignored. */
+    private void warnAboutIgnoredDeprecatedOptions() {
+        CommandLine.ParseResult parseResult = spec.commandLine().getParseResult();
+        boolean hasRawRecordOption =
+                parseResult.hasMatchedOption(DEPRECATED_LOG_RAW_RECORDS_OPTION)
+                        || parseResult.hasMatchedOption(DEPRECATED_LOG_RAW_RECORDS_OPTION_SHORT);
+
+        if (hasRawRecordOption) {
+            // Use picocli's ANSI support for colored warning output
+            CommandLine.Help.Ansi ansi = CommandLine.Help.Ansi.AUTO;
+            String warning =
+                    ansi.string(
+                            "@|bold,yellow The "
+                                    + DEPRECATED_LOG_RAW_RECORDS_OPTION
+                                    + " option is deprecated and no longer has any effect. "
+                                    + "This option is no longer required because failure records are "
+                                    + "always logged by default.|@");
+
+            logger.warn(warning);
+        }
+    }
+
 
   /**
    * Validates that deprecated and new options are not both specified.

data-loader/cli/src/main/java/com/scalar/db/dataloader/cli/command/dataimport/ImportCommandOptions.java

@@ -16,6 +16,8 @@ public class ImportCommandOptions {
   public static final String ENABLE_LOG_SUCCESS_RECORDS_OPTION = "--enable-log-success";
   public static final String ENABLE_LOG_SUCCESS_RECORDS_OPTION_SHORT = "-ls";
   public static final String DEPRECATED_LOG_SUCCESS_RECORDS_OPTION = "--log-success";
+  public static final String DEPRECATED_LOG_RAW_RECORDS_OPTION_SHORT = "-lr";
+  public static final String DEPRECATED_LOG_RAW_RECORDS_OPTION = "--log-raw-record";
 
   @CommandLine.Option(
       names = {"--mode", "-m"},
@@ -123,6 +125,11 @@ public class ImportCommandOptions {
       defaultValue = "false")
   protected boolean ignoreNullValues;
 
+  /**
+   * @deprecated As of release 3.6.2. This option is no longer required because failure records are
+   *     always logged by default. It will be removed in release 4.0.0.
+   */
+  @Deprecated
   @CommandLine.Option(
       names = {"--log-raw-record", "-lr"},
       description = "Include the original source record in the log file output (default: false)",

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

@@ -94,8 +94,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());
       }
     }