feat: make odc adapt to OceanBase 4.2

server/odc-core/src/main/java/com/oceanbase/odc/core/shared/model/TraceSpan.java

@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -44,7 +43,7 @@ public class TraceSpan {
  @JsonAlias("logs")
  private String logs;
  @JsonAlias("tags")
- private List<Map<String, Object>> tags;
+ private List<Object> tags;
  @JsonAlias("elapse")
  private Long elapseMicroSeconds;
  @JsonAlias("parent")

server/odc-core/src/main/java/com/oceanbase/odc/core/sql/util/FullLinkTraceUtil.java

@@ -18,6 +18,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +33,8 @@
 
 public class FullLinkTraceUtil {
 
+ private final static String TRACE_ID_KEY = "log_trace_id";
+
  public static SqlExecTime getFullLinkTraceDetail(Statement statement) throws SQLException {
  OceanBaseConnection connection = (OceanBaseConnection) statement.getConnection();
  long lastPacketResponseTimestamp =
@@ -67,8 +70,8 @@ private static SqlExecTime parseSpanList(List<TraceSpan> spanList) {
  return v;
  });
  }
- if (traceId == null && parseLogTraceId(span.getTags()) != null) {
- traceId = parseLogTraceId(span.getTags());
+ if (traceId == null) {
+ traceId = findLogTraceId(span.getTags());
  }
  span.setNode(Node.from(span.getSpanName()));
  if ("com_query_process".equals(span.getSpanName())) {
@@ -89,13 +92,18 @@ private static SqlExecTime parseSpanList(List<TraceSpan> spanList) {
  return execDetail;
  }
 
- private static String parseLogTraceId(List<Map<String, Object>> tags) {
- if (tags == null) {
+ private static String findLogTraceId(Object tags) {
+ if (tags instanceof Map) {
+ if (((Map<?, ?>) tags).containsKey(TRACE_ID_KEY)) {
+ return ((Map<?, ?>) tags).get(TRACE_ID_KEY).toString();
+ }
  return null;
- }
- for (Map<String, Object> tag : tags) {
- if (tag.containsKey("log_trace_id")) {
- return (String) tag.get("log_trace_id");
+ } else if (tags instanceof Collection) {
+ for (Object obj : (Collection<?>) tags) {
+ String value = findLogTraceId(obj);
+ if (value != null) {
+ return value;
+ }
  }
  }
  return null;

server/odc-service/src/main/java/com/oceanbase/odc/service/db/DBRecyclebinService.java

@@ -138,7 +138,8 @@ public String getFlashbackSql(@NonNull ConnectionSession session, List<DBRecycle
  }
  sqlBuilder.identifier(recycleObject.getObjName()).append(" to before drop");
  if (StringUtils.isNotBlank(recycleObject.getNewName())) {
- sqlBuilder.append(" rename to ").identifier(recycleObject.getNewName());
+ sqlBuilder.append(" rename to ").identifier(recycleObject.getSchema())
+ .append(".").identifier(recycleObject.getNewName());
  }
  sqlBuilder.append(";\r\n");
  }