database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Bug](resource) fix npe on Resource read from json (#31723)

Browse Source 
fix npe on Resource read from json
This commit is contained in:
Pxl
2024-03-04 16:58:53 +08:00
committed by yiguolei
parent 25d1934289
commit 0c71b666d7
7 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fe/fe-core/src/main/java/org/apache/doris/catalog/EsResource.java
View File

@ -77,6 +77,10 @@ public class EsResource extends Resource {
@SerializedName(value = "properties")
private Map<String, String> properties;
public EsResource() {
super();
}
public EsResource(String name) {
super(name, Resource.ResourceType.ES);
properties = Maps.newHashMap();

4
fe/fe-core/src/main/java/org/apache/doris/catalog/HMSResource.java
View File

@ -44,6 +44,10 @@ public class HMSResource extends Resource {
@SerializedName(value = "properties")
private Map<String, String> properties;
public HMSResource() {
super();
}
public HMSResource(String name) {
super(name, ResourceType.HMS);
this.properties = Maps.newHashMap();

4
fe/fe-core/src/main/java/org/apache/doris/catalog/HdfsResource.java
View File

@ -54,6 +54,10 @@ public class HdfsResource extends Resource {
@SerializedName(value = "properties")
private Map<String, String> properties;
public HdfsResource() {
super();
}
public HdfsResource(String name) {
super(name, Resource.ResourceType.HDFS);
properties = Maps.newHashMap();

1
fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcCatalogResource.java
View File

@ -65,7 +65,6 @@ public class OdbcCatalogResource extends Resource {
@SerializedName(value = "configs")
private Map<String, String> configs;
// only for deep copy
public OdbcCatalogResource() {
super();
}

3
fe/fe-core/src/main/java/org/apache/doris/catalog/Resource.java
View File

@ -111,6 +111,9 @@ public abstract class Resource implements Writable, GsonPostProcessable {
lock.readLock().unlock();
}
// https://programmerr47.medium.com/gson-unsafe-problem-d1ff29d4696f
// Resource subclass also MUST define default ctor, otherwise when reloading object from json
// some not serialized field (i.e. `lock`) will be `null`.
public Resource() {
}

7
fe/fe-core/src/main/java/org/apache/doris/catalog/S3Resource.java
View File

@ -70,10 +70,9 @@ public class S3Resource extends Resource {
@SerializedName(value = "properties")
private Map<String, String> properties;
// for Gson fromJson
// TODO(plat1ko): other Resource subclass also MUST define default ctor, otherwise when reloading object from json
// some not serialized field (i.e. `lock`) will be `null`.
public S3Resource() {}
public S3Resource() {
super();
}
public S3Resource(String name) {
super(name, ResourceType.S3);

5
fe/fe-core/src/main/java/org/apache/doris/catalog/SparkResource.java
View File

@ -117,6 +117,11 @@ public class SparkResource extends Resource {
@SerializedName(value = "envConfigs")
private Map<String, String> envConfigs;
public SparkResource() {
super();
}
public SparkResource(String name) {
this(name, Maps.newHashMap(), null, null, Maps.newHashMap(), Maps.newHashMap());
}