fix jdbc catalog NPE issue when query have filter (StarRocks#20549)

Signed-off-by: leoyy0316 <571684903@qq.com> Fixes StarRocks#20548
trueeyu · Apr 3, 2023 · 51eb712 · 51eb712
1 parent 17ad317
commit 51eb712
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/JDBCTable.java b/fe/fe-core/src/main/java/com/starrocks/catalog/JDBCTable.java
@@ -70,6 +70,10 @@ public String getJdbcTable() {
         return jdbcTable;
     }
 
+    public String getProperty(String propertyKey) {
+        return properties.get(propertyKey);
+    }
+
     private void validate(Map<String, String> properties) throws DdlException {
         if (properties == null) {
             throw new DdlException("Please set properties of jdbc table, they are: table and resource");

diff --git a/fe/fe-core/src/main/java/com/starrocks/planner/JDBCScanNode.java b/fe/fe-core/src/main/java/com/starrocks/planner/JDBCScanNode.java
@@ -122,7 +122,8 @@ private void createJDBCTableFilters() {
         }
         JDBCResource resource = (JDBCResource) GlobalStateMgr.getCurrentState().getResourceMgr()
                 .getResource(table.getResourceName());
-        String jdbcURI = resource.getProperty(JDBCResource.URI);
+        // Compatible with jdbc catalog
+        String jdbcURI = resource != null ? resource.getProperty(JDBCResource.URI) : table.getProperty(JDBCResource.URI);
         boolean isMySQL = jdbcURI.startsWith("jdbc:mysql");
         ArrayList<Expr> mysqlConjuncts = Expr.cloneList(conjuncts, sMap);
         for (Expr p : mysqlConjuncts) {