Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
DataX
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
risk-feature
DataX
Commits
84611f1f
Commit
84611f1f
authored
Jul 20, 2020
by
丁强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
textfilewriter修复数据换行bug--换行符替换为空格
parent
f9885979
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
20 deletions
+21
-20
UnstructuredStorageWriterUtil.java
...ructuredstorage/writer/UnstructuredStorageWriterUtil.java
+21
-20
No files found.
plugin-unstructured-storage-util/src/main/java/com/alibaba/datax/plugin/unstructuredstorage/writer/UnstructuredStorageWriterUtil.java
View file @
84611f1f
...
@@ -41,7 +41,7 @@ public class UnstructuredStorageWriterUtil {
...
@@ -41,7 +41,7 @@ public class UnstructuredStorageWriterUtil {
/**
/**
* check parameter: writeMode, encoding, compress, filedDelimiter
* check parameter: writeMode, encoding, compress, filedDelimiter
*
*
/
*/
public
static
void
validateParameter
(
Configuration
writerConfiguration
)
{
public
static
void
validateParameter
(
Configuration
writerConfiguration
)
{
// writeMode check
// writeMode check
String
writeMode
=
writerConfiguration
.
getNecessaryValue
(
String
writeMode
=
writerConfiguration
.
getNecessaryValue
(
...
@@ -124,7 +124,7 @@ public class UnstructuredStorageWriterUtil {
...
@@ -124,7 +124,7 @@ public class UnstructuredStorageWriterUtil {
}
}
public
static
List
<
Configuration
>
split
(
Configuration
writerSliceConfig
,
public
static
List
<
Configuration
>
split
(
Configuration
writerSliceConfig
,
Set
<
String
>
originAllFileExists
,
int
mandatoryNumber
)
{
Set
<
String
>
originAllFileExists
,
int
mandatoryNumber
)
{
LOG
.
info
(
"begin do split..."
);
LOG
.
info
(
"begin do split..."
);
Set
<
String
>
allFileExists
=
new
HashSet
<
String
>();
Set
<
String
>
allFileExists
=
new
HashSet
<
String
>();
allFileExists
.
addAll
(
originAllFileExists
);
allFileExists
.
addAll
(
originAllFileExists
);
...
@@ -153,19 +153,19 @@ public class UnstructuredStorageWriterUtil {
...
@@ -153,19 +153,19 @@ public class UnstructuredStorageWriterUtil {
}
}
public
static
String
buildFilePath
(
String
path
,
String
fileName
,
public
static
String
buildFilePath
(
String
path
,
String
fileName
,
String
suffix
)
{
String
suffix
)
{
boolean
isEndWithSeparator
=
false
;
boolean
isEndWithSeparator
=
false
;
switch
(
IOUtils
.
DIR_SEPARATOR
)
{
switch
(
IOUtils
.
DIR_SEPARATOR
)
{
case
IOUtils
.
DIR_SEPARATOR_UNIX
:
case
IOUtils
.
DIR_SEPARATOR_UNIX
:
isEndWithSeparator
=
path
.
endsWith
(
String
isEndWithSeparator
=
path
.
endsWith
(
String
.
valueOf
(
IOUtils
.
DIR_SEPARATOR
));
.
valueOf
(
IOUtils
.
DIR_SEPARATOR
));
break
;
break
;
case
IOUtils
.
DIR_SEPARATOR_WINDOWS
:
case
IOUtils
.
DIR_SEPARATOR_WINDOWS
:
isEndWithSeparator
=
path
.
endsWith
(
String
isEndWithSeparator
=
path
.
endsWith
(
String
.
valueOf
(
IOUtils
.
DIR_SEPARATOR_WINDOWS
));
.
valueOf
(
IOUtils
.
DIR_SEPARATOR_WINDOWS
));
break
;
break
;
default
:
default
:
break
;
break
;
}
}
if
(!
isEndWithSeparator
)
{
if
(!
isEndWithSeparator
)
{
path
=
path
+
IOUtils
.
DIR_SEPARATOR
;
path
=
path
+
IOUtils
.
DIR_SEPARATOR
;
...
@@ -179,8 +179,8 @@ public class UnstructuredStorageWriterUtil {
...
@@ -179,8 +179,8 @@ public class UnstructuredStorageWriterUtil {
}
}
public
static
void
writeToStream
(
RecordReceiver
lineReceiver
,
public
static
void
writeToStream
(
RecordReceiver
lineReceiver
,
OutputStream
outputStream
,
Configuration
config
,
String
context
,
OutputStream
outputStream
,
Configuration
config
,
String
context
,
TaskPluginCollector
taskPluginCollector
)
{
TaskPluginCollector
taskPluginCollector
)
{
String
encoding
=
config
.
getString
(
Key
.
ENCODING
,
String
encoding
=
config
.
getString
(
Key
.
ENCODING
,
Constant
.
DEFAULT_ENCODING
);
Constant
.
DEFAULT_ENCODING
);
// handle blank encoding
// handle blank encoding
...
@@ -239,8 +239,8 @@ public class UnstructuredStorageWriterUtil {
...
@@ -239,8 +239,8 @@ public class UnstructuredStorageWriterUtil {
}
}
private
static
void
doWriteToStream
(
RecordReceiver
lineReceiver
,
private
static
void
doWriteToStream
(
RecordReceiver
lineReceiver
,
BufferedWriter
writer
,
String
contex
,
Configuration
config
,
BufferedWriter
writer
,
String
contex
,
Configuration
config
,
TaskPluginCollector
taskPluginCollector
)
throws
IOException
{
TaskPluginCollector
taskPluginCollector
)
throws
IOException
{
String
nullFormat
=
config
.
getString
(
Key
.
NULL_FORMAT
);
String
nullFormat
=
config
.
getString
(
Key
.
NULL_FORMAT
);
...
@@ -291,10 +291,10 @@ public class UnstructuredStorageWriterUtil {
...
@@ -291,10 +291,10 @@ public class UnstructuredStorageWriterUtil {
/**
/**
* 异常表示脏数据
* 异常表示脏数据
*
*
/
*/
public
static
void
transportOneRecord
(
Record
record
,
String
nullFormat
,
public
static
void
transportOneRecord
(
Record
record
,
String
nullFormat
,
DateFormat
dateParse
,
TaskPluginCollector
taskPluginCollector
,
DateFormat
dateParse
,
TaskPluginCollector
taskPluginCollector
,
UnstructuredWriter
unstructuredWriter
)
{
UnstructuredWriter
unstructuredWriter
)
{
// warn: default is null
// warn: default is null
if
(
null
==
nullFormat
)
{
if
(
null
==
nullFormat
)
{
nullFormat
=
"null"
;
nullFormat
=
"null"
;
...
@@ -332,6 +332,7 @@ public class UnstructuredStorageWriterUtil {
...
@@ -332,6 +332,7 @@ public class UnstructuredStorageWriterUtil {
unstructuredWriter
.
writeOneRecord
(
splitedRows
);
unstructuredWriter
.
writeOneRecord
(
splitedRows
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
// warn: dirty data
// warn: dirty data
LOG
.
info
(
"transportOneRecord 发生异常:"
,
e
);
taskPluginCollector
.
collectDirtyRecord
(
record
,
e
);
taskPluginCollector
.
collectDirtyRecord
(
record
,
e
);
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment