fix npe of sql check

oceanbase · Sep 29, 2024 · 71ba96b · 71ba96b
1 parent feb6a85
commit 71ba96b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/...-service/src/main/java/com/oceanbase/odc/service/sqlcheck/rule/MySQLOfflineDdlExists.java b/...-service/src/main/java/com/oceanbase/odc/service/sqlcheck/rule/MySQLOfflineDdlExists.java
@@ -91,7 +91,7 @@ public List<CheckViolation> check(@NonNull Statement statement, @NonNull SqlChec
  violations.addAll(dropPartition(statement, action));
  violations.addAll(truncatePartition(statement, action));
  return violations.stream();
- }).collect(Collectors.toList());
+ }).filter(Objects::nonNull).collect(Collectors.toList());
  } else if (statement instanceof TruncateTable) {
  return Collections.singletonList(SqlCheckUtil.buildViolation(statement.getText(),
  statement, getType(), new Object[] {"TRUNCATE TABLE"}));

diff --git a/...service/src/main/java/com/oceanbase/odc/service/sqlcheck/rule/OracleOfflineDdlExists.java b/...service/src/main/java/com/oceanbase/odc/service/sqlcheck/rule/OracleOfflineDdlExists.java
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.springframework.jdbc.core.JdbcOperations;
@@ -72,7 +73,7 @@ public List<CheckViolation> check(@NonNull Statement statement, @NonNull SqlChec
  violations.addAll(dropPartition(statement, action));
  violations.addAll(truncatePartition(statement, action));
  return violations.stream();
- }).collect(Collectors.toList());
+ }).filter(Objects::nonNull).collect(Collectors.toList());
  } else if (statement instanceof TruncateTable) {
  return Collections.singletonList(SqlCheckUtil.buildViolation(statement.getText(),
  statement, getType(), new Object[] {"TRUNCATE TABLE"}));

diff --git a/server/odc-service/src/test/java/com/oceanbase/odc/service/sqlcheck/MySQLCheckerTest.java b/server/odc-service/src/test/java/com/oceanbase/odc/service/sqlcheck/MySQLCheckerTest.java
@@ -1143,7 +1143,9 @@ public void check_offlineDdl_violationGenerated() {
  "create table abcd(id varchar(64))",
  "alter table abcd modify id int AUTO_INCREMENT",
  "alter table abcd modify id varchar(64)",
- "alter table abcd add column a int after a"
+ "alter table abcd add column a int after a",
+ "ALTER TABLE `xes_qiwei_teacher_relation` CHANGE `bind_time` "
+ + "`bind_time` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '绑定时间'"
  };
  JdbcTemplate jdbcTemplate = Mockito.mock(JdbcTemplate.class);
  Mockito.when(jdbcTemplate.queryForObject(Mockito.anyString(), Mockito.any(RowMapper.class)))