fix(oracle): speed up metadata refresh
This commit is contained in:
1 parent
5846f85ce6
commit
95137b70a6
7 files changed
+289
-47
No files matched your search
+40
-12
@@ -145,15 +145,9 @@ public final class Oracle10gAgent extends BaseDatabaseAgent {
|
||||
public List<TableInfo> listTables(String schema) {
|
||||
return unchecked(() -> {
|
||||
List<TableInfo> result = new ArrayList<>();
|
||||
String sql = "SELECT o.OBJECT_NAME,"
|
||||
+ " CASE o.OBJECT_TYPE WHEN 'VIEW' THEN 'VIEW' ELSE 'TABLE' END AS TABLE_TYPE,"
|
||||
+ " c.COMMENTS"
|
||||
+ " FROM ALL_OBJECTS o"
|
||||
+ " LEFT JOIN ALL_TAB_COMMENTS c ON c.OWNER = o.OWNER AND c.TABLE_NAME = o.OBJECT_NAME"
|
||||
+ " WHERE o.OWNER = ? AND o.OBJECT_TYPE IN ('TABLE','VIEW')"
|
||||
+ " ORDER BY o.OBJECT_NAME";
|
||||
try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) {
|
||||
try (PreparedStatement stmt = requireConnected().prepareStatement(listTablesSql())) {
|
||||
stmt.setString(1, schema);
|
||||
stmt.setString(2, schema);
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
result.add(new TableInfo(rs.getString(1), rs.getString(2), rs.getString(3)));
|
||||
@@ -164,15 +158,32 @@ public final class Oracle10gAgent extends BaseDatabaseAgent {
|
||||
});
|
||||
}
|
||||
|
||||
static String listTablesSql() {
|
||||
return "SELECT OBJECT_NAME, TABLE_TYPE, COMMENTS"
|
||||
+ " FROM ("
|
||||
+ " SELECT t.TABLE_NAME AS OBJECT_NAME,"
|
||||
+ " 'TABLE' AS TABLE_TYPE,"
|
||||
+ " CAST(NULL AS VARCHAR2(4000)) AS COMMENTS"
|
||||
+ " FROM ALL_TABLES t"
|
||||
+ " WHERE t.OWNER = ?"
|
||||
+ " AND t.NESTED = 'NO'"
|
||||
+ " UNION ALL"
|
||||
+ " SELECT o.OBJECT_NAME,"
|
||||
+ " 'VIEW' AS TABLE_TYPE,"
|
||||
+ " CAST(NULL AS VARCHAR2(4000)) AS COMMENTS"
|
||||
+ " FROM ALL_OBJECTS o"
|
||||
+ " WHERE o.OWNER = ?"
|
||||
+ " AND o.OBJECT_TYPE = 'VIEW'"
|
||||
+ " ) ORDER BY OBJECT_NAME";
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ObjectInfo> listObjects(String schema) {
|
||||
return unchecked(() -> {
|
||||
List<ObjectInfo> result = new ArrayList<>();
|
||||
String sql = "SELECT OBJECT_NAME, OBJECT_TYPE FROM ALL_OBJECTS"
|
||||
+ " WHERE OWNER = ? AND OBJECT_TYPE IN ('TABLE', 'VIEW', 'PROCEDURE', 'FUNCTION')"
|
||||
+ " ORDER BY CASE OBJECT_TYPE WHEN 'TABLE' THEN 0 WHEN 'VIEW' THEN 1 WHEN 'PROCEDURE' THEN 2 ELSE 3 END, OBJECT_NAME";
|
||||
try (PreparedStatement stmt = requireConnected().prepareStatement(sql)) {
|
||||
try (PreparedStatement stmt = requireConnected().prepareStatement(listObjectsSql())) {
|
||||
stmt.setString(1, schema);
|
||||
stmt.setString(2, schema);
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
result.add(new ObjectInfo(rs.getString(1), rs.getString(2), schema, null));
|
||||
@@ -183,6 +194,23 @@ public final class Oracle10gAgent extends BaseDatabaseAgent {
|
||||
});
|
||||
}
|
||||
|
||||
static String listObjectsSql() {
|
||||
return "SELECT OBJECT_NAME, OBJECT_TYPE"
|
||||
+ " FROM ("
|
||||
+ " SELECT t.TABLE_NAME AS OBJECT_NAME,"
|
||||
+ " 'TABLE' AS OBJECT_TYPE"
|
||||
+ " FROM ALL_TABLES t"
|
||||
+ " WHERE t.OWNER = ?"
|
||||
+ " AND t.NESTED = 'NO'"
|
||||
+ " UNION ALL"
|
||||
+ " SELECT o.OBJECT_NAME,"
|
||||
+ " o.OBJECT_TYPE"
|
||||
+ " FROM ALL_OBJECTS o"
|
||||
+ " WHERE o.OWNER = ?"
|
||||
+ " AND o.OBJECT_TYPE IN ('VIEW', 'PROCEDURE', 'FUNCTION')"
|
||||
+ " ) ORDER BY CASE OBJECT_TYPE WHEN 'TABLE' THEN 0 WHEN 'VIEW' THEN 1 WHEN 'PROCEDURE' THEN 2 ELSE 3 END, OBJECT_NAME";
|
||||
}
|
||||
|
||||
@Override
|
||||
public ObjectSource getObjectSource(String schema, String name, String objectType) {
|
||||
return unchecked(() -> {
|
||||
|
||||
+21
@@ -15,6 +15,7 @@ import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
@@ -89,6 +90,26 @@ class Oracle10gAgentTest extends JdbcFakeExecutionBehaviorTest {
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
void listTablesSqlUsesSplitDictionaryQuery() {
|
||||
String sql = Oracle10gAgent.listTablesSql().toUpperCase(Locale.ROOT);
|
||||
|
||||
Assertions.assertTrue(sql.contains("ALL_TABLES"), sql);
|
||||
Assertions.assertTrue(sql.contains("ALL_OBJECTS"), sql);
|
||||
Assertions.assertTrue(sql.contains("UNION ALL"), sql);
|
||||
Assertions.assertFalse(sql.contains("ALL_TAB_COMMENTS"), sql);
|
||||
}
|
||||
|
||||
@Test
|
||||
void listObjectsSqlUsesSplitDictionaryQuery() {
|
||||
String sql = Oracle10gAgent.listObjectsSql().toUpperCase(Locale.ROOT);
|
||||
|
||||
Assertions.assertTrue(sql.contains("ALL_TABLES"), sql);
|
||||
Assertions.assertTrue(sql.contains("ALL_OBJECTS"), sql);
|
||||
Assertions.assertTrue(sql.contains("UNION ALL"), sql);
|
||||
Assertions.assertFalse(sql.contains("ALL_TAB_COMMENTS"), sql);
|
||||
}
|
||||
|
||||
@Test
|
||||
void loadsRoutineSourceFromDbmsMetadata() {
|
||||
Oracle10gAgent agent = new Oracle10gAgent();
|
||||
|
||||
Reference in new issue
Block a user