Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[INLONG-4050][Sort] Fix parameter definition error of HiveLoad #4051

Merged
merged 1 commit into from
May 1, 2022
Merged

[INLONG-4050][Sort] Fix parameter definition error of HiveLoad #4051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ...ort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/load/HiveLoadNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.inlong.sort.protocol.transformation.FilterFunction;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -62,7 +61,6 @@ public class HiveLoadNode extends LoadNode implements Serializable {
private String database;

@JsonProperty("hiveConfDir")
@Nonnull
private String hiveConfDir;

@JsonProperty("hiveVersion")
Expand All @@ -81,20 +79,20 @@ public HiveLoadNode(@JsonProperty("id") String id,
@JsonProperty("fields") List<FieldInfo> fields,
@JsonProperty("fieldRelationShips") List<FieldRelationShip> fieldRelationShips,
@JsonProperty("filters") List<FilterFunction> filters,
@Nullable @JsonProperty("sinkParallelism") Integer sinkParallelism,
@JsonProperty("sinkParallelism") Integer sinkParallelism,
@JsonProperty("properties") Map<String, String> properties,
@JsonProperty("catalogName") String catalogName,
@Nullable @JsonProperty("database") String database,
@Nullable @JsonProperty("tableName") String tableName,
@Nullable @JsonProperty("hiveConfDir") String hiveConfDir,
@Nullable @JsonProperty("hiveVersion") String hiveVersion,
@JsonProperty("database") String database,
@JsonProperty("tableName") String tableName,
@JsonProperty("hiveConfDir") String hiveConfDir,
@JsonProperty("hiveVersion") String hiveVersion,
@JsonProperty("hadoopConfDir") String hadoopConfDir,
@JsonProperty("parFields") List<FieldInfo> partitionFields) {
super(id, name, fields, fieldRelationShips, filters, sinkParallelism, properties);
this.database = Preconditions.checkNotNull(database, "database of hive is null");
this.tableName = Preconditions.checkNotNull(tableName, "table of hive is null");
this.hiveConfDir = Preconditions.checkNotNull(hiveConfDir, "hive config path is null");
this.hiveVersion = Preconditions.checkNotNull(hiveVersion, "version of hive is null");
this.hiveConfDir = hiveConfDir;
this.catalogName = catalogName;
this.hadoopConfDir = hadoopConfDir;
this.partitionFields = partitionFields;
Expand All @@ -121,11 +119,13 @@ public Map<String, String> tableOptions() {
Map<String, String> map = super.tableOptions();
map.put("connector", "hive");
map.put("default-database", database);
map.put("hive-conf-dir", hiveConfDir);
map.put("hive-version", hiveVersion);
if (null != hadoopConfDir) {
map.put("hadoop-conf-dir", hadoopConfDir);
}
if (null != hiveConfDir) {
map.put("hive-conf-dir", hiveConfDir);
}
if (null != partitionFields) {
Map<String, String> properties = super.getProperties();
if (null == properties || !properties.containsKey(trigger)) {
Expand Down