fix(dameng): correct routine source fallback

Refs: #7954
This commit is contained in:
t8y2 committed 2026-09-03 23:28:16 +08:00
1 parent 1c170396d3
commit b17a87697b
2 files changed
+225 -17

No files matched your search

@@ -1274,7 +1274,7 @@ public final class DamengAgent extends AbstractJdbcAgent {
* <li>TRIGGER → ALL_TRIGGERS.TRIGGER_BODY</li> * <li>TRIGGER → ALL_TRIGGERS.TRIGGER_BODY</li>
* <li>SEQUENCE → 由 ALL_SEQUENCES 元数据重建 CREATE SEQUENCE 语句</li> * <li>SEQUENCE → 由 ALL_SEQUENCES 元数据重建 CREATE SEQUENCE 语句</li>
* <li>PROCEDURE/FUNCTION/PACKAGE/PACKAGE_BODY/TYPE/TYPE_BODY → ALL_SOURCE 按 LINE 拼接, * <li>PROCEDURE/FUNCTION/PACKAGE/PACKAGE_BODY/TYPE/TYPE_BODY → ALL_SOURCE 按 LINE 拼接,
* 再以 SYS.SYSOBJECTS + SYS.SYSTEXTS 作为最后一层</li> * 再以 SYS.SYSOBJECTS + SYS.SYSTEXTS(TXT/SEQNO) 作为最后一层</li>
* </ul> * </ul>
* 所有字典来源都不可用时返回带原因说明的占位源码(不可编辑),避免双击对象查看源码直接报错; * 所有字典来源都不可用时返回带原因说明的占位源码(不可编辑),避免双击对象查看源码直接报错;
* 连接类错误(断连/超时等)不属于元数据不可用,继续上抛由上层处理会话。 * 连接类错误(断连/超时等)不属于元数据不可用,继续上抛由上层处理会话。
@@ -1418,9 +1418,7 @@ public final class DamengAgent extends AbstractJdbcAgent {
try { try {
String type = normalizeObjectSourceType(objectType); String type = normalizeObjectSourceType(objectType);
List<String> typeCandidates = switch (type) { List<String> typeCandidates = switch (type) {
// 不同 DM 版本对函数/过程的 TYPE 取值不一致(有的统一为 PROCEDURE),逐一尝试。 case "FUNCTION", "PROCEDURE" -> List.of("PROC", type);
case "FUNCTION" -> List.of("FUNCTION", "PROCEDURE");
case "PROCEDURE" -> List.of("PROCEDURE", "FUNCTION");
case "PACKAGE" -> List.of("PACKAGE"); case "PACKAGE" -> List.of("PACKAGE");
case "PACKAGE_BODY" -> List.of("PACKAGE BODY", "PACKAGE_BODY"); case "PACKAGE_BODY" -> List.of("PACKAGE BODY", "PACKAGE_BODY");
case "TYPE" -> List.of("TYPE"); case "TYPE" -> List.of("TYPE");
@@ -1429,15 +1427,10 @@ public final class DamengAgent extends AbstractJdbcAgent {
}; };
for (String candidate : typeCandidates) { for (String candidate : typeCandidates) {
String source = readAllSourceLines(schema, name, candidate); String source = readAllSourceLines(schema, name, candidate);
if (notBlank(source)) { if (notBlank(source) && routineSourceMatchesRequestedType(schema, name, type, candidate, source)) {
return catalogRoutineObjectSource(schema, name, objectType, 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; return null;
} catch (RuntimeException error) { } catch (RuntimeException error) {
return metadataTierError(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 { private String readAllSourceLines(String schema, String name, String sourceType) throws Exception {
String sql = sourceType == null String sql = "SELECT TEXT FROM ALL_SOURCE WHERE OWNER = ? AND NAME = ? AND TYPE = ? ORDER BY LINE";
? "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";
StringBuilder source = new StringBuilder(); StringBuilder source = new StringBuilder();
try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) { try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) {
stmt.setString(1, schema); stmt.setString(1, schema);
stmt.setString(2, name); stmt.setString(2, name);
if (sourceType != null) {
stmt.setString(3, sourceType); stmt.setString(3, sourceType);
}
try (ResultSet rs = stmt.executeQuery()) { try (ResultSet rs = stmt.executeQuery()) {
while (rs.next()) { while (rs.next()) {
String line = coalesce(readTextColumn(rs, 1)); String line = coalesce(readTextColumn(rs, 1));
@@ -1470,6 +1459,66 @@ public final class DamengAgent extends AbstractJdbcAgent {
return source.toString(); 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( private static ObjectSource catalogRoutineObjectSource(
String schema, String schema,
String name, String name,
@@ -1505,12 +1554,12 @@ public final class DamengAgent extends AbstractJdbcAgent {
// DM 将过程/函数/包/类型的定义文本按行存放在 SYS.SYSTEXTS, // DM 将过程/函数/包/类型的定义文本按行存放在 SYS.SYSTEXTS,
// SYS.SYSOBJECTS 的 SCHID 关联所属 schema;适用于 ALL_SOURCE 不可用的实例。 // SYS.SYSOBJECTS 的 SCHID 关联所属 schema;适用于 ALL_SOURCE 不可用的实例。
String sql = """ String sql = """
SELECT t.TEXT SELECT t.TXT
FROM SYS.SYSTEXTS t FROM SYS.SYSTEXTS t
JOIN SYS.SYSOBJECTS o ON o.ID = t.ID 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 = ? JOIN SYS.SYSOBJECTS s ON s.ID = o.SCHID AND s.TYPE$ = 'SCH' AND s.NAME = ?
WHERE o.NAME = ? WHERE o.NAME = ?
ORDER BY t.LINE ORDER BY t.SEQNO
""".stripIndent().trim(); """.stripIndent().trim();
StringBuilder source = new StringBuilder(); StringBuilder source = new StringBuilder();
try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) { try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) {
@@ -1527,6 +1576,13 @@ public final class DamengAgent extends AbstractJdbcAgent {
} }
} }
return notBlank(source.toString()) return notBlank(source.toString())
&& routineSourceMatchesRequestedType(
schema,
name,
normalizeObjectSourceType(objectType),
"PROC",
source.toString()
)
? catalogRoutineObjectSource(schema, name, objectType, source.toString()) ? catalogRoutineObjectSource(schema, name, objectType, source.toString())
: null; : null;
} catch (RuntimeException error) { } catch (RuntimeException error) {
@@ -562,9 +562,92 @@ class DamengAgentMetadataTest {
Assertions.assertTrue(source.isEditable()); Assertions.assertTrue(source.isEditable());
Assertions.assertEquals(1, sqls.stream().filter(sql -> sql.contains("DBMS_METADATA.GET_DDL")).count()); 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("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)); Assertions.assertTrue(sqls.stream().noneMatch(sql -> sql.contains("SYS.SYSTEXTS")), String.join("\n", sqls));
} }
@Test
void matchesDamengProcedureTypeWhenAllSourceUsesProc() {
DamengAgent agent = new DamengAgent();
List<String> 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<String> 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<String> 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 @Test
void fallsBackToAllSourceTypeDdlWhenDbmsMetadataPackageIsMissing() { void fallsBackToAllSourceTypeDdlWhenDbmsMetadataPackageIsMissing() {
DamengAgent agent = new DamengAgent(); DamengAgent agent = new DamengAgent();
@@ -731,6 +814,34 @@ class DamengAgentMetadataTest {
Assertions.assertTrue(source.isEditable()); 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("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("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<String> 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 @Test
@@ -1499,6 +1610,47 @@ class DamengAgentMetadataTest {
}); });
} }
private static Connection typedRoutineFallbackConnection(
SQLException dbmsMetadataError,
List<String> sqls,
List<List<Object>> allSourceRows,
SQLException allSourceError,
List<List<Object>> 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<String> sqls) { private static Connection restrictedCrossOwnerMetadataConnection(List<String> sqls) {
return proxy(Connection.class, (method, args) -> { return proxy(Connection.class, (method, args) -> {
String name = method.getName(); String name = method.getName();