From f45011977f029a0bfb0f0398aba1170c9cd1a37e Mon Sep 17 00:00:00 2001 From: zipg Date: Tue, 7 Jul 2026 00:23:07 +0800 Subject: [PATCH] fix(dameng): avoid truncating exported DDL --- .../com/dbx/agent/dameng/DamengAgent.java | 49 +++++++++++---- .../agent/dameng/DamengAgentMetadataTest.java | 60 ++++++++++++++++++- 2 files changed, 93 insertions(+), 16 deletions(-) diff --git a/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java b/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java index 5121a630cb..c31f91480b 100644 --- a/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java +++ b/agents/drivers/dameng/src/main/java/com/dbx/agent/dameng/DamengAgent.java @@ -19,6 +19,7 @@ import com.dbx.agent.QueryResult; import com.dbx.agent.TableInfo; import com.dbx.agent.TriggerInfo; import java.io.PrintStream; +import java.io.Reader; import java.sql.Blob; import java.sql.Clob; import java.sql.Connection; @@ -593,7 +594,7 @@ public final class DamengAgent extends BaseDatabaseAgent { stmt.setString(2, name); stmt.setString(3, schema); try (ResultSet rs = stmt.executeQuery()) { - source = rs.next() ? coalesce(rs.getString(1)) : ""; + source = rs.next() ? coalesce(readTextColumn(rs, 1)) : ""; } } return new ObjectSource(name, objectType, schema, source); @@ -610,7 +611,7 @@ public final class DamengAgent extends BaseDatabaseAgent { stmt.setString(3, schema); try (ResultSet rs = stmt.executeQuery()) { if (rs.next()) { - String ddl = appendTableAndColumnComments(coalesce(rs.getString(1)), schema, table); + String ddl = appendTableAndColumnComments(coalesce(readTextColumn(rs, 1)), schema, table); return appendIndependentIndexDdl(ddl, schema, table); } } @@ -913,6 +914,24 @@ public final class DamengAgent extends BaseDatabaseAgent { return value == null ? null : unchecked(value::getString); } + private static String readTextColumn(ResultSet rs, int columnIndex) throws Exception { + try (Reader reader = rs.getCharacterStream(columnIndex)) { + String value = readAll(reader); + if (value != null) { + return value; + } + } catch (Exception ignored) { + } + try { + Clob clob = rs.getClob(columnIndex); + if (clob != null) { + return clob.getSubString(1, Math.toIntExact(clob.length())); + } + } catch (Exception ignored) { + } + return rs.getString(columnIndex); + } + private static String bytesToHex(byte[] bytes) { if (bytes == null) { return null; @@ -965,20 +984,24 @@ public final class DamengAgent extends BaseDatabaseAgent { } } catch (Exception ignored) { } - try (java.io.Reader reader = rs.getCharacterStream(column)) { - if (reader == null) { - return null; - } - StringBuilder sb = new StringBuilder(); - char[] buf = new char[4096]; - int n; - while ((n = reader.read(buf)) != -1) { - sb.append(buf, 0, n); - } - return sb.toString(); + try (Reader reader = rs.getCharacterStream(column)) { + return readAll(reader); } } + private static String readAll(Reader reader) throws Exception { + if (reader == null) { + return null; + } + StringBuilder sb = new StringBuilder(); + char[] buf = new char[4096]; + int n; + while ((n = reader.read(buf)) != -1) { + sb.append(buf, 0, n); + } + return sb.toString(); + } + private static List splitNonEmpty(String value, String delimiter) { List result = new ArrayList<>(); Arrays.stream(value.split(delimiter)) diff --git a/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentMetadataTest.java b/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentMetadataTest.java index 8bd1b2d57f..416ae879d0 100644 --- a/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentMetadataTest.java +++ b/agents/drivers/dameng/src/test/java/com/dbx/agent/dameng/DamengAgentMetadataTest.java @@ -13,6 +13,7 @@ import java.lang.reflect.Field; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; +import java.io.StringReader; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -188,6 +189,26 @@ class DamengAgentMetadataTest { Assertions.assertTrue(ddl.contains("COMMENT ON COLUMN \"APP\".\"USERS\".\"ID\" IS 'id comment';"), ddl); } + @Test + void readsFullTableDdlFromCharacterStreamWhenGetStringIsTruncated() { + DamengAgent agent = new DamengAgent(); + String fullDdl = "CREATE TABLE \"APP\".\"USERS\" (\n \"ID\" NUMBER,\n \"PAYLOAD\" VARCHAR2(2000)\n);\n-- " + + "x".repeat(5000) + + "\n-- DBX_FULL_DDL_END"; + TestSupport.setPrivateConnection(agent, metadataConnection( + "id comment", + null, + false, + List.of(), + null, + fullDdl + )); + + String ddl = agent.getTableDdl("APP", "USERS"); + + Assertions.assertTrue(ddl.contains("DBX_FULL_DDL_END"), ddl); + } + @Test void appendsIndependentIndexesToTableDdl() { DamengAgent agent = new DamengAgent(); @@ -269,6 +290,17 @@ class DamengAgentMetadataTest { boolean includeMaterializedView, List> independentIndexes, List sqls + ) { + return metadataConnection(allColumnComment, fallbackColumnComment, includeMaterializedView, independentIndexes, sqls, "CREATE TABLE \"APP\".\"USERS\" (\n \"ID\" NUMBER\n);"); + } + + private static Connection metadataConnection( + String allColumnComment, + String fallbackColumnComment, + boolean includeMaterializedView, + List> independentIndexes, + List sqls, + String dbmsMetadataDdl ) { return proxy(Connection.class, (method, args) -> { String name = method.getName(); @@ -278,7 +310,7 @@ class DamengAgentMetadataTest { sqls.add(sql); } if (sql.contains("DBMS_METADATA.GET_DDL")) { - return dbmsMetadataStatement(); + return dbmsMetadataStatement(dbmsMetadataDdl); } if (sql.contains("ALL_CONS_COLUMNS")) { return metadataStatement(List.of(List.of("ID"))); @@ -361,7 +393,7 @@ class DamengAgentMetadataTest { return List.of(name, columns, uniqueness, indexType); } - private static PreparedStatement dbmsMetadataStatement() { + private static PreparedStatement dbmsMetadataStatement(String ddl) { List params = new ArrayList<>(); return proxy(PreparedStatement.class, (method, args) -> { String name = method.getName(); @@ -370,7 +402,7 @@ class DamengAgentMetadataTest { if ("INDEX".equals(objectType)) { throw new AssertionError("Dameng table DDL should generate index DDL from metadata"); } - return metadataResultSet(List.of(List.of("CREATE TABLE \"APP\".\"USERS\" (\n \"ID\" NUMBER\n);"))); + return metadataResultSet(List.of(List.of(new LongText(ddl, ddl.substring(0, Math.min(ddl.length(), 64)))))); } if ("setString".equals(name)) { int index = ((Integer) args[0]) - 1; @@ -447,6 +479,9 @@ class DamengAgentMetadataTest { if ("getString".equals(name)) { if (args[0] instanceof Integer columnIndex) { Object value = rows.get(index[0]).get(columnIndex - 1); + if (value instanceof LongText longText) { + return longText.truncated; + } return value == null ? null : value.toString(); } return switch (((String) args[0]).toUpperCase()) { @@ -459,6 +494,12 @@ class DamengAgentMetadataTest { default -> null; }; } + if ("getCharacterStream".equals(name) && args[0] instanceof Integer columnIndex) { + Object value = rows.get(index[0]).get(columnIndex - 1); + if (value instanceof LongText longText) { + return new StringReader(longText.full); + } + } if ("getObject".equals(name)) { return switch (((String) args[0]).toUpperCase()) { case "DATA_PRECISION" -> rows.get(index[0]).get(3); @@ -477,9 +518,22 @@ class DamengAgentMetadataTest { private static String string(List> rows, int rowIndex, int columnIndex) { Object value = rows.get(rowIndex).get(columnIndex); + if (value instanceof LongText longText) { + return longText.full; + } return value == null ? null : value.toString(); } + private static final class LongText { + private final String full; + private final String truncated; + + private LongText(String full, String truncated) { + this.full = full; + this.truncated = truncated; + } + } + @SuppressWarnings("unchecked") private static T proxy(Class type, MethodHandler handler) { InvocationHandler invocationHandler = new InvocationHandler() {