Skip to content

support unescape some invisible char in separator #5524

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 1 commit into from
Mar 21, 2021
Merged

support unescape some invisible char in separator #5524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 46 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/analysis/Separator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,55 @@ public static String convertSeparator(String originStr) throws AnalysisException
}
return writer.toString();
} else {
return originStr;
return unescape(originStr);
}
}

// unescape some invisible string literal to char, such as "/t" to char '/t'
private static String unescape(String orig) {
StringBuffer sb = new StringBuffer();
boolean hadSlash = false;
for (int i = 0; i < orig.length(); i++) {
char ch = orig.charAt(i);
if (hadSlash) {
hadSlash = false;
switch (ch) {
case '\\':
sb.append('\\');
break;
case '\'':
sb.append('\'');
break;
case '\"':
sb.append('"');
break;
case 'r':
sb.append('\r');
break;
case 't':
sb.append('\t');
break;
case 'n':
sb.append('\n');
break;
default :
sb.append('\\').append(ch);
break;
}
continue;
} else if (ch == '\\') {
if (i == orig.length() - 1) {
sb.append(ch);
} else {
hadSlash = true;
}
continue;
}
sb.append(ch);
}
return sb.toString();
}

public String toSql() {
StringBuilder sb = new StringBuilder();
sb.append("'").append(oriSeparator).append("'");
Expand Down
12 changes: 12 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/analysis/SeparatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ public void testNormal() throws AnalysisException {
Assert.assertEquals("'\t'", separator.toSql());
Assert.assertEquals("\t", separator.getSeparator());

// \\t
separator = new Separator("\\t");
separator.analyze();
Assert.assertEquals("'\\t'", separator.toSql());
Assert.assertEquals("\t", separator.getSeparator());

// \\\\t
separator = new Separator("\\\\t");
separator.analyze();
Assert.assertEquals("'\\\\t'", separator.toSql());
Assert.assertEquals("\\t", separator.getSeparator());

// \x01
separator = new Separator("\\x01");
separator.analyze();
Expand Down