You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by AsterixDB Code Review <do...@asterix-gerrit.ics.uci.edu> on 2025/07/28 17:32:30 UTC

Change in asterixdb[ionic]: Adding the "None" option for the quote for reading a CSV file for ext...

From Shahrzad Shirazi <sh...@ucr.edu>:

Shahrzad Shirazi has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20146 )


Change subject: Adding the "None" option for the quote for reading a CSV file for external collections.
......................................................................

Adding the "None" option for the quote for reading a CSV file for external collections.

Change-Id: I3812d2d1306282e9f02e8b77e1f79ac6b203cabe
---
M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
M asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/CSVUtils.java
M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/stream/QuotedLineRecordReader.java
3 files changed, 18 insertions(+), 3 deletions(-)



  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/46/20146/1

diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/stream/QuotedLineRecordReader.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/stream/QuotedLineRecordReader.java
index 5fe0589..cdfca1b 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/stream/QuotedLineRecordReader.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/record/reader/stream/QuotedLineRecordReader.java
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.asterix.dataflow.data.nontagged.printers.csv.CSVUtils;
 import org.apache.asterix.external.api.AsterixInputStream;
 import org.apache.asterix.external.util.ExternalDataConstants;
 import org.apache.asterix.external.util.ExternalDataUtils;
@@ -55,7 +56,7 @@
         this.warnings = ctx.getWarningCollector();
         String quoteString = config.get(KEY_QUOTE);
         ExternalDataUtils.validateChar(quoteString, KEY_QUOTE);
-        this.quote = quoteString.charAt(0);
+        this.quote = CSVUtils.extractSingleChar(quoteString);
         this.escape = ExternalDataUtils.validateGetEscape(config, config.get(ExternalDataConstants.KEY_FORMAT));
     }
 
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
index 591829b..5436853 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataUtils.java
@@ -72,6 +72,7 @@
 import org.apache.asterix.common.library.ILibraryManager;
 import org.apache.asterix.common.metadata.DataverseName;
 import org.apache.asterix.common.metadata.Namespace;
+import org.apache.asterix.dataflow.data.nontagged.printers.csv.CSVUtils;
 import org.apache.asterix.external.api.IDataParserFactory;
 import org.apache.asterix.external.api.IExternalDataSourceFactory.DataSourceType;
 import org.apache.asterix.external.api.IInputStreamFactory;
@@ -690,10 +691,14 @@
             return defaultValue;
         }
         validateChar(value, key);
-        return value.charAt(0);
+        return CSVUtils.extractSingleChar(value);
+
     }
 
     public static void validateChar(String parameterValue, String parameterName) throws RuntimeDataException {
+        if (CSVUtils.NONE.equalsIgnoreCase(parameterValue)) {
+            return;
+        }
         if (parameterValue.length() != 1) {
             throw new RuntimeDataException(ErrorCode.INVALID_CHAR_LENGTH, parameterValue, parameterName);
         }
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/CSVUtils.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/CSVUtils.java
index 37d4dbd..e169371 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/CSVUtils.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/CSVUtils.java
@@ -118,7 +118,7 @@
         return value != null ? extractSingleChar(value) : extractSingleChar(defaultValue);
     }
 
-    private static char extractSingleChar(String input) {
+    public static char extractSingleChar(String input) {
         if (CSVUtils.NONE.equalsIgnoreCase(input)) {
             return CSVUtils.NULL_CHAR;
         } else {

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20146
To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-Project: asterixdb
Gerrit-Branch: ionic
Gerrit-Change-Id: I3812d2d1306282e9f02e8b77e1f79ac6b203cabe
Gerrit-Change-Number: 20146
Gerrit-PatchSet: 1
Gerrit-Owner: Shahrzad Shirazi <sh...@ucr.edu>
Gerrit-MessageType: newchange