Skip to content

[Spark load][Bug] Fix column terminator for spark load #4491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morningman merged 4 commits into from
Sep 2, 2020
Merged

[Spark load][Bug] Fix column terminator for spark load #4491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9799e3
save
Aug 31, 2020
bb769d0
save code
Aug 31, 2020
706364c
execute once
Sep 1, 2020
027fe9a
save code
Sep 1, 2020
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
14 changes: 12 additions & 2 deletions fe/fe-core/src/test/java/org/apache/doris/analysis/ColumnSeparatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

package org.apache.doris.analysis;

import org.apache.doris.common.AnalysisException;

import org.junit.Assert;
import org.junit.Test;

import org.apache.doris.common.AnalysisException;

public class ColumnSeparatorTest {
@Test
public void testNormal() throws AnalysisException {
Expand All @@ -42,6 +42,16 @@ public void testNormal() throws AnalysisException {
separator.analyze();
Assert.assertEquals("'\\x0001'", separator.toSql());
Assert.assertEquals("\0\1", separator.getColumnSeparator());

separator = new ColumnSeparator("|");
separator.analyze();
Assert.assertEquals("'|'", separator.toSql());
Assert.assertEquals("|", separator.getColumnSeparator());

separator = new ColumnSeparator("\\|");
separator.analyze();
Assert.assertEquals("'\\|'", separator.toSql());
Assert.assertEquals("\\|", separator.getColumnSeparator());
}

@Test(expected = AnalysisException.class)
Expand Down
9 changes: 4 additions & 5 deletions fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/dpp/SparkDpp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@

package org.apache.doris.load.loadv2.dpp;

import org.apache.commons.lang3.tuple.Pair;
import scala.Tuple2;

import org.apache.doris.common.SparkDppException;
import org.apache.doris.load.loadv2.etl.EtlJobConfig;

import com.google.common.base.Strings;
import com.google.gson.Gson;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileStatus;
Expand Down Expand Up @@ -55,6 +56,7 @@
import org.apache.spark.sql.types.StructType;
import org.apache.spark.storage.StorageLevel;
import org.apache.spark.util.LongAccumulator;
import org.apache.spark.util.SerializableConfiguration;

import java.io.IOException;
import java.math.BigInteger;
Expand All @@ -71,9 +73,6 @@
import java.util.Queue;
import java.util.Set;

import org.apache.spark.util.SerializableConfiguration;
import scala.Tuple2;

// This class is a Spark-based data preprocessing program,
// which will make use of the distributed compute framework of spark to
// do ETL job/sort/preaggregate jobs in spark job
Expand Down
12 changes: 10 additions & 2 deletions fe/spark-dpp/src/main/java/org/apache/doris/load/loadv2/etl/EtlJobConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@

package org.apache.doris.load.loadv2.etl;

import com.google.common.collect.Lists;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.gson.ExclusionStrategy;
import com.google.gson.FieldAttributes;
import com.google.gson.Gson;
Expand Down Expand Up @@ -502,13 +503,20 @@ public EtlFileGroup(SourceType sourceType, List<String> filePaths, List<String>
this.filePaths = filePaths;
this.fileFieldNames = fileFieldNames;
this.columnsFromPath = columnsFromPath;
this.columnSeparator = columnSeparator;
this.lineDelimiter = lineDelimiter;
this.isNegative = isNegative;
this.fileFormat = fileFormat;
this.columnMappings = columnMappings;
this.where = where;
this.partitions = partitions;

// Convert some special characters in column separator
char sep = Strings.isNullOrEmpty(columnSeparator) ? '\t' : columnSeparator.charAt(0);
if (".$|()[]{}^?*+\\".indexOf(sep) != -1) {
this.columnSeparator = new String(new char[]{'\\', sep});
} else {
this.columnSeparator = Character.toString(sep);
}
}

// for data from table
Expand Down