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 5b683a2789..02db30b45b 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 @@ -1274,7 +1274,7 @@ public final class DamengAgent extends AbstractJdbcAgent { *
  • TRIGGER → ALL_TRIGGERS.TRIGGER_BODY
  • *
  • SEQUENCE → 由 ALL_SEQUENCES 元数据重建 CREATE SEQUENCE 语句
  • *
  • PROCEDURE/FUNCTION/PACKAGE/PACKAGE_BODY/TYPE/TYPE_BODY → ALL_SOURCE 按 LINE 拼接, - * 再以 SYS.SYSOBJECTS + SYS.SYSTEXTS 作为最后一层
  • + * 再以 SYS.SYSOBJECTS + SYS.SYSTEXTS(TXT/SEQNO) 作为最后一层 * * 所有字典来源都不可用时返回带原因说明的占位源码(不可编辑),避免双击对象查看源码直接报错; * 连接类错误(断连/超时等)不属于元数据不可用,继续上抛由上层处理会话。 @@ -1418,9 +1418,7 @@ public final class DamengAgent extends AbstractJdbcAgent { try { String type = normalizeObjectSourceType(objectType); List typeCandidates = switch (type) { - // 不同 DM 版本对函数/过程的 TYPE 取值不一致(有的统一为 PROCEDURE),逐一尝试。 - case "FUNCTION" -> List.of("FUNCTION", "PROCEDURE"); - case "PROCEDURE" -> List.of("PROCEDURE", "FUNCTION"); + case "FUNCTION", "PROCEDURE" -> List.of("PROC", type); case "PACKAGE" -> List.of("PACKAGE"); case "PACKAGE_BODY" -> List.of("PACKAGE BODY", "PACKAGE_BODY"); case "TYPE" -> List.of("TYPE"); @@ -1429,15 +1427,10 @@ public final class DamengAgent extends AbstractJdbcAgent { }; for (String candidate : typeCandidates) { String source = readAllSourceLines(schema, name, candidate); - if (notBlank(source)) { + if (notBlank(source) && routineSourceMatchesRequestedType(schema, name, type, candidate, source)) { return catalogRoutineObjectSource(schema, name, objectType, source); } } - // 兜底:忽略 TYPE 过滤按名称读取全部源码行(同一 schema 内对象名唯一)。 - String anyTypeSource = readAllSourceLines(schema, name, null); - if (notBlank(anyTypeSource)) { - return catalogRoutineObjectSource(schema, name, objectType, anyTypeSource); - } return null; } catch (RuntimeException error) { return metadataTierError(error); @@ -1447,16 +1440,12 @@ public final class DamengAgent extends AbstractJdbcAgent { } private String readAllSourceLines(String schema, String name, String sourceType) throws Exception { - String sql = sourceType == null - ? "SELECT TEXT FROM ALL_SOURCE WHERE OWNER = ? AND NAME = ? ORDER BY LINE" - : "SELECT TEXT FROM ALL_SOURCE WHERE OWNER = ? AND NAME = ? AND TYPE = ? ORDER BY LINE"; + String sql = "SELECT TEXT FROM ALL_SOURCE WHERE OWNER = ? AND NAME = ? AND TYPE = ? ORDER BY LINE"; StringBuilder source = new StringBuilder(); try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) { stmt.setString(1, schema); stmt.setString(2, name); - if (sourceType != null) { - stmt.setString(3, sourceType); - } + stmt.setString(3, sourceType); try (ResultSet rs = stmt.executeQuery()) { while (rs.next()) { String line = coalesce(readTextColumn(rs, 1)); @@ -1470,6 +1459,66 @@ public final class DamengAgent extends AbstractJdbcAgent { return source.toString(); } + private boolean routineSourceMatchesRequestedType( + String schema, + String name, + String objectType, + String sourceType, + String source + ) { + if (!("FUNCTION".equals(objectType) || "PROCEDURE".equals(objectType)) + || !"PROC".equalsIgnoreCase(sourceType)) { + return true; + } + String catalogType = readDamengRoutineObjectType(schema, name); + return catalogType != null + ? objectType.equals(catalogType) + : routineSourceStartsWithType(source, objectType); + } + + private String readDamengRoutineObjectType(String schema, String name) { + String sql = """ + SELECT o.INFO1 + FROM SYS.SYSOBJECTS o + JOIN SYS.SYSOBJECTS s ON s.ID = o.SCHID AND s.TYPE$ = 'SCH' + WHERE o.SUBTYPE$ = 'PROC' AND s.NAME = ? AND o.NAME = ? + """.stripIndent().trim(); + try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) { + stmt.setString(1, schema); + stmt.setString(2, name); + try (ResultSet rs = stmt.executeQuery()) { + if (!rs.next()) { + return null; + } + String info1 = rs.getString(1); + return switch (info1 == null ? "" : info1.trim()) { + case "0" -> "FUNCTION"; + case "1" -> "PROCEDURE"; + default -> "PROCEDURE"; + }; + } + } catch (RuntimeException error) { + if (isDamengConnectionError(error)) { + throw error; + } + return null; + } catch (Exception error) { + if (isDamengConnectionError(error)) { + throw new RuntimeException(error); + } + return null; + } + } + + private static boolean routineSourceStartsWithType(String source, String objectType) { + String normalizedSource = source.stripLeading().toUpperCase(Locale.ROOT); + String normalizedType = objectType.toUpperCase(Locale.ROOT); + return startsWithRoutineDeclaration(normalizedSource, normalizedType) + || startsWithRoutineDeclaration(normalizedSource, "CREATE " + normalizedType) + || startsWithRoutineDeclaration(normalizedSource, "CREATE OR REPLACE " + normalizedType) + || startsWithRoutineDeclaration(normalizedSource, "ALTER " + normalizedType); + } + private static ObjectSource catalogRoutineObjectSource( String schema, String name, @@ -1505,12 +1554,12 @@ public final class DamengAgent extends AbstractJdbcAgent { // DM 将过程/函数/包/类型的定义文本按行存放在 SYS.SYSTEXTS, // SYS.SYSOBJECTS 的 SCHID 关联所属 schema;适用于 ALL_SOURCE 不可用的实例。 String sql = """ - SELECT t.TEXT + SELECT t.TXT FROM SYS.SYSTEXTS t JOIN SYS.SYSOBJECTS o ON o.ID = t.ID JOIN SYS.SYSOBJECTS s ON s.ID = o.SCHID AND s.TYPE$ = 'SCH' AND s.NAME = ? WHERE o.NAME = ? - ORDER BY t.LINE + ORDER BY t.SEQNO """.stripIndent().trim(); StringBuilder source = new StringBuilder(); try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) { @@ -1527,6 +1576,13 @@ public final class DamengAgent extends AbstractJdbcAgent { } } return notBlank(source.toString()) + && routineSourceMatchesRequestedType( + schema, + name, + normalizeObjectSourceType(objectType), + "PROC", + source.toString() + ) ? catalogRoutineObjectSource(schema, name, objectType, source.toString()) : null; } catch (RuntimeException error) { 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 fff38b4947..0cbb92aa96 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 @@ -562,9 +562,92 @@ class DamengAgentMetadataTest { Assertions.assertTrue(source.isEditable()); Assertions.assertEquals(1, sqls.stream().filter(sql -> sql.contains("DBMS_METADATA.GET_DDL")).count()); Assertions.assertTrue(sqls.stream().anyMatch(sql -> sql.contains("FROM ALL_SOURCE")), String.join("\n", sqls)); + Assertions.assertTrue(sqls.stream().anyMatch(sql -> sql.contains("TYPE = ?")), String.join("\n", sqls)); + Assertions.assertTrue(sqls.stream().noneMatch(sql -> sql.contains("FROM ALL_SOURCE") && !sql.contains("TYPE = ?")), String.join("\n", sqls)); Assertions.assertTrue(sqls.stream().noneMatch(sql -> sql.contains("SYS.SYSTEXTS")), String.join("\n", sqls)); } + @Test + void matchesDamengProcedureTypeWhenAllSourceUsesProc() { + DamengAgent agent = new DamengAgent(); + List sqls = new ArrayList<>(); + TestSupport.setPrivateConnection( + agent, + typedRoutineFallbackConnection( + missingDbmsMetadataPackageError(), + sqls, + List.of( + Arrays.asList("CREATE OR REPLACE PROCEDURE \"APP\".\"REBUILD_CACHE\" AS"), + Arrays.asList("BEGIN NULL; END;") + ), + null, + List.of(), + "1" + ) + ); + + ObjectSource source = agent.getObjectSource("APP", "REBUILD_CACHE", "PROCEDURE"); + + Assertions.assertTrue(source.getSource().contains("CREATE OR REPLACE PROCEDURE"), source.getSource()); + Assertions.assertTrue(source.isEditable()); + Assertions.assertTrue(sqls.stream().anyMatch(sql -> sql.contains("FROM ALL_SOURCE") && sql.contains("TYPE = ?")), String.join("\n", sqls)); + Assertions.assertTrue(sqls.stream().anyMatch(sql -> sql.contains("SELECT o.INFO1")), String.join("\n", sqls)); + Assertions.assertTrue(sqls.stream().noneMatch(sql -> sql.contains("FROM ALL_SOURCE") && !sql.contains("TYPE = ?")), String.join("\n", sqls)); + } + + @Test + void matchesDamengFunctionTypeWhenAllSourceUsesProc() { + DamengAgent agent = new DamengAgent(); + List sqls = new ArrayList<>(); + TestSupport.setPrivateConnection( + agent, + typedRoutineFallbackConnection( + missingDbmsMetadataPackageError(), + sqls, + List.of( + Arrays.asList("CREATE OR REPLACE FUNCTION \"APP\".\"CALC_SCORE\"(V_ID INT) RETURN INT AS"), + Arrays.asList("BEGIN RETURN V_ID * 2; END;") + ), + null, + List.of(), + "0" + ) + ); + + ObjectSource source = agent.getObjectSource("APP", "CALC_SCORE", "FUNCTION"); + + Assertions.assertTrue(source.getSource().contains("CREATE OR REPLACE FUNCTION"), source.getSource()); + Assertions.assertTrue(source.isEditable()); + Assertions.assertTrue(sqls.stream().anyMatch(sql -> sql.contains("SELECT o.INFO1")), String.join("\n", sqls)); + } + + @Test + void doesNotReturnProcedureSourceForFunctionFallback() { + DamengAgent agent = new DamengAgent(); + List sqls = new ArrayList<>(); + TestSupport.setPrivateConnection( + agent, + typedRoutineFallbackConnection( + missingDbmsMetadataPackageError(), + sqls, + List.of( + Arrays.asList("CREATE OR REPLACE PROCEDURE \"APP\".\"REBUILD_CACHE\" AS"), + Arrays.asList("BEGIN NULL; END;") + ), + null, + List.of(), + "1" + ) + ); + + ObjectSource source = agent.getObjectSource("APP", "REBUILD_CACHE", "FUNCTION"); + + Assertions.assertFalse(source.getSource().contains("CREATE OR REPLACE PROCEDURE"), source.getSource()); + Assertions.assertFalse(source.isEditable()); + Assertions.assertEquals(2, sqls.stream().filter(sql -> sql.contains("FROM ALL_SOURCE")).count(), String.join("\n", sqls)); + Assertions.assertTrue(sqls.stream().noneMatch(sql -> sql.contains("FROM ALL_SOURCE") && !sql.contains("TYPE = ?")), String.join("\n", sqls)); + } + @Test void fallsBackToAllSourceTypeDdlWhenDbmsMetadataPackageIsMissing() { DamengAgent agent = new DamengAgent(); @@ -731,6 +814,34 @@ class DamengAgentMetadataTest { Assertions.assertTrue(source.isEditable()); Assertions.assertTrue(sqls.stream().anyMatch(sql -> sql.contains("FROM ALL_SOURCE")), String.join("\n", sqls)); Assertions.assertTrue(sqls.stream().anyMatch(sql -> sql.contains("SYS.SYSTEXTS") && sql.contains("SYS.SYSOBJECTS")), String.join("\n", sqls)); + Assertions.assertTrue(sqls.stream().anyMatch(sql -> sql.contains("SELECT t.TXT") && sql.contains("ORDER BY t.SEQNO")), String.join("\n", sqls)); + Assertions.assertTrue(sqls.stream().noneMatch(sql -> sql.contains("SYS.SYSTEXTS") && (sql.contains("t.TEXT") || sql.contains("t.LINE"))), String.join("\n", sqls)); + } + + @Test + void doesNotReturnProcedureSourceForFunctionSysTextsFallback() { + DamengAgent agent = new DamengAgent(); + List sqls = new ArrayList<>(); + TestSupport.setPrivateConnection( + agent, + typedRoutineFallbackConnection( + missingDbmsMetadataPackageError(), + sqls, + List.of(), + missingCatalogViewError("ALL_SOURCE"), + List.of( + Arrays.asList("CREATE OR REPLACE PROCEDURE \"APP\".\"REBUILD_CACHE\" AS"), + Arrays.asList("BEGIN NULL; END;") + ), + "1" + ) + ); + + ObjectSource source = agent.getObjectSource("APP", "REBUILD_CACHE", "FUNCTION"); + + Assertions.assertFalse(source.getSource().contains("CREATE OR REPLACE PROCEDURE"), source.getSource()); + Assertions.assertFalse(source.isEditable()); + Assertions.assertTrue(sqls.stream().anyMatch(sql -> sql.contains("SELECT t.TXT") && sql.contains("ORDER BY t.SEQNO")), String.join("\n", sqls)); } @Test @@ -1499,6 +1610,47 @@ class DamengAgentMetadataTest { }); } + private static Connection typedRoutineFallbackConnection( + SQLException dbmsMetadataError, + List sqls, + List> allSourceRows, + SQLException allSourceError, + List> systemTextRows, + String info1 + ) { + int[] allSourceQueryCount = {0}; + return proxy(Connection.class, (method, args) -> { + String name = method.getName(); + if ("prepareStatement".equals(name)) { + String sql = (String) args[0]; + sqls.add(sql); + if (sql.contains("DBMS_METADATA.GET_DDL")) { + return failingMetadataStatement(dbmsMetadataError); + } + if (sql.contains("SELECT o.INFO1")) { + return metadataStatement(List.of(List.of(info1))); + } + if (sql.contains("FROM ALL_SOURCE")) { + if (allSourceError != null) { + return failingMetadataStatement(allSourceError); + } + return metadataStatement(allSourceQueryCount[0]++ == 0 ? allSourceRows : List.of()); + } + if (sql.contains("SYS.SYSTEXTS")) { + return metadataStatement(systemTextRows); + } + return metadataStatement(List.of()); + } + if ("close".equals(name)) { + return null; + } + if ("isClosed".equals(name)) { + return false; + } + return defaultValue(method.getReturnType()); + }); + } + private static Connection restrictedCrossOwnerMetadataConnection(List sqls) { return proxy(Connection.class, (method, args) -> { String name = method.getName();