jiangxt2 commented on code in PR #12767:
URL: https://github.com/apache/gravitino/pull/12767#discussion_r4057230228
##########
catalogs/catalog-jdbc-doris/src/main/java/org/apache/gravitino/catalog/doris/converter/DorisColumnDefaultValueConverter.java:
##########
@@ -90,13 +120,46 @@ public Expression toGravitino(
: Literals.timestampLiteral(
LocalDateTime.parse(columnDefaultValue, DATE_TIME_FORMATTER));
case JdbcTypeConverter.VARCHAR:
- return Literals.of(columnDefaultValue,
Types.VarCharType.of(columnType.getColumnSize()));
+ return Literals.of(
+ unescapeDorisLiteral(columnDefaultValue),
+ Types.VarCharType.of(columnType.getColumnSize()));
case CHAR:
- return Literals.of(columnDefaultValue,
Types.FixedCharType.of(columnType.getColumnSize()));
+ return Literals.of(
+ unescapeDorisLiteral(columnDefaultValue),
+ Types.FixedCharType.of(columnType.getColumnSize()));
case JdbcTypeConverter.TEXT:
- return Literals.stringLiteral(columnDefaultValue);
+ return
Literals.stringLiteral(unescapeDorisLiteral(columnDefaultValue));
default:
return UnparsedExpression.of(columnDefaultValue);
}
}
+
+ private static String quoteDorisLiteral(String value, boolean
doubleEscapeBackslashes) {
+ String escapedBackslash = doubleEscapeBackslashes ? "\\\\\\\\" : "\\\\";
+ String escaped = value.replace("\\", escapedBackslash).replace("\"",
"\\\"");
+ return "\"" + escaped + "\"";
+ }
+
+ private static String unescapeDorisLiteral(String value) {
+ StringBuilder result = new StringBuilder(value.length());
+ for (int i = 0; i < value.length(); i++) {
+ char current = value.charAt(i);
+ if (current == '\\' && i + 1 < value.length()) {
+ char next = value.charAt(i + 1);
+ if (next == '\\' || next == '\'' || next == '"') {
+ result.append(next);
+ i++;
+ continue;
+ }
+ } else if ((current == '\'' || current == '"')
Review Comment:
Thanks for the review. This update adds version-aware serialization for
Doris ADD COLUMN defaults and preserves repeated quotes when reading JDBC
metadata. It also adds round-trip coverage for quoted and backslash-containing
defaults across Doris 1.2.x, 3.0.6.2, and 4.0.6.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
