Skip to content

[hotfix-#1195]change the code position to support oracle nchar、nvarch… #1196

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
FlechazoW merged 3 commits into from
Aug 30, 2022
+10 −37
Merged

[hotfix-#1195]change the code position to support oracle nchar、nvarch… #1196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b283a2f
[hotfix-#1195]change the code position to support oracle nchar、nvarch…
momisabuilder Aug 29, 2022
5b00d60
[hotfix-#1195]change the code position to support oracle nchar、nvarch…
momisabuilder Aug 30, 2022
dcceb99
[hotfix-#1195]mvn spotless:apply
momisabuilder Aug 30, 2022
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
29 changes: 8 additions & 21 deletions ...gminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import net.sf.jsqlparser.statement.insert.Insert;
import net.sf.jsqlparser.statement.update.Update;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang3.StringEscapeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -52,8 +53,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* @author jiangbo
Expand All @@ -65,8 +64,6 @@ public class LogParser {

public static SnowflakeIdWorker idWorker = new SnowflakeIdWorker(1, 1);

public static final Pattern pattern = Pattern.compile("(\\\\u(\\w{4}))");

private final LogMinerConf config;

public LogParser(LogMinerConf config) {
Expand Down Expand Up @@ -206,26 +203,9 @@ public static String parseTime(String value) {
return value.substring(17, value.length() - 2);
}

// support nchar、nvarchar2 chinese value
if (value.startsWith("UNISTR('") && value.endsWith("')")) {
String substring = value.substring(8, value.length() - 2);
String replace = substring.replace("\\", "\\u");
return unicodeToString(replace);
}

return value;
}

public static String unicodeToString(String str) {
Matcher matcher = pattern.matcher(str);
char ch;
while (matcher.find()) {
ch = (char) Integer.parseInt(matcher.group(2), 16);
str = str.replace(matcher.group(1), String.valueOf(ch));
}
return str;
}

public static String parseString(String value) {
if (!value.endsWith("')")) {
return value;
Expand All @@ -252,6 +232,13 @@ public static String parseString(String value) {
return value.substring(15, value.length() - 2);
}

// support nchar、nvarchar2 chinese value
if (value.startsWith("UNISTR('") && value.endsWith("')")) {
String substring = value.substring(8, value.length() - 2);
String replace = substring.replace("\\", "\\u");
return StringEscapeUtils.unescapeJava(replace);
}

return value;
}

Expand Down
18 changes: 2 additions & 16 deletions chunjun-core/src/test/java/com/dtstack/chunjun/util/UnicodeToStringTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,39 +18,25 @@

package com.dtstack.chunjun.util;

import org.apache.commons.lang3.StringEscapeUtils;
import org.junit.Assert;
import org.junit.Test;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* @author liuche
* @date 2022/8/26 14:39
*/
public class UnicodeToStringTest {

public static final Pattern pattern = Pattern.compile("(\\\\u(\\w{4}))");

@Test
public void testUnicodeToString() {
String str = "UNISTR('\\5927\\6D77')";

if (str.startsWith("UNISTR('") && str.endsWith("')")) {
String substring = str.substring(8, str.length() - 2);
String replace = substring.replace("\\", "\\u");
str = unicodeToString(replace);
str = StringEscapeUtils.unescapeJava(replace);
}
Assert.assertEquals(str, "大海");
}

public static String unicodeToString(String str) {
Matcher matcher = pattern.matcher(str);
char ch;
while (matcher.find()) {
ch = (char) Integer.parseInt(matcher.group(2), 16);
str = str.replace(matcher.group(1), String.valueOf(ch));
}
return str;
}
}