fix

dataroaring · Jun 18, 2024 · 546d745 · 546d745
1 parent 42e835a
commit 546d745
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java b/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java
@@ -758,12 +758,6 @@ public void write(JsonWriter out, T value) throws IOException {
  }
 
  public T read(JsonReader in) throws IOException {
- if (rawType == MTMV.class && Env.getCurrentEnvJournalVersion() < FeMetaVersion.VERSION_135) {
- JsonElement json = Streams.parse(in);
- JsonObject jsonObject = json.getAsJsonObject();
- jsonObject.addProperty("clazz", MTMV.class.getSimpleName());
- return (T) GsonUtils.GSON.fromJson(jsonObject, MTMV.class);
- }
  return delegate.read(in);
  }
  };

diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/gson/RuntimeTypeAdapterFactory.java b/fe/fe-core/src/main/java/org/apache/doris/persist/gson/RuntimeTypeAdapterFactory.java
@@ -282,7 +282,7 @@ public RuntimeTypeAdapterFactory<T> registerCompatibleSubtype(Class<? extends T>
  }
 
  public <R> TypeAdapter<R> create(Gson gson, TypeToken<R> type) {
- if (type.getRawType() != baseType && !subtypeToLabel.containsKey(type.getRawType())) {
+ if (!baseType.isAssignableFrom(type.getRawType()) && !subtypeToLabel.containsKey(type.getRawType())) {
  return null;
  }