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

[Fix][Engine] Fix spark engine execute error #302

Merged
merged 1 commit into from
Dec 4, 2023
Merged

[Fix][Engine] Fix spark engine execute error #302

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions datavines-common/src/main/java/io/datavines/common/ConfigConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ public class ConfigConstants {
public static final String INVALIDATE_ITEM_CAN_OUTPUT = "invalidate_item_can_output";
public static final String ERROR_DATA_OUTPUT_TO_DATASOURCE_DATABASE = "error_data_output_to_datasource_database";
public static final String DATABASE = "database";

public static final String DATABASE_NAME = "database_name";
public static final String TABLE_NAME = "table_name";
public static final String COLUMN_NAME = "column_name";
public static final String SCHEMA = "schema";
public static final String SCHEMA2 = "schema2";
public static final String USER = "user";
Expand Down
14 changes: 14 additions & 0 deletions ...s-connector/datavines-connector-api/src/main/java/io/datavines/connector/api/Dialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,20 @@ default String getFullQualifiedTableName(String database, String schema, String
return table;
}

default String getFullQualifiedTableNameForSpark(String database, String schema, String table) {
table = "`" + table + "`";

if (!StringUtils.isEmptyOrNullStr(schema)) {
table = "`" + schema + "`." + table ;
}

if (!StringUtils.isEmptyOrNullStr(database)) {
table = "`" + database + "`." + table;
}

return table;
}

default boolean invalidateItemCanOutput(){
return true;
}
Expand Down
4 changes: 4 additions & 0 deletions ...-config/src/main/java/io/datavines/engine/local/config/BaseLocalConfigurationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ protected List<SourceConfig> getSourceConfigs() throws DataVinesException {
connectorParameterMap = connectorFactory.getConnectorParameterConverter().converter(connectorParameterMap);
String connectorUUID = connectorFactory.getConnectorParameterConverter().getConnectorUUID(connectorParameterMap);

metricInputParameter.put(DATABASE_NAME,metricInputParameter.get(DATABASE));
metricInputParameter.put(TABLE_NAME,metricInputParameter.get(TABLE));
metricInputParameter.put(COLUMN_NAME,metricInputParameter.get(COLUMN));

String table = connectorFactory.getDialect()
.getFullQualifiedTableName(metricInputParameter.get(DATABASE),metricInputParameter.get(SCHEMA),metricInputParameter.get(TABLE));
connectorParameterMap.put(TABLE, table);
Expand Down
9 changes: 7 additions & 2 deletions ...-config/src/main/java/io/datavines/engine/spark/config/BaseSparkConfigurationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,16 @@ protected List<SourceConfig> getSourceConfigs() throws DataVinesException {
metricInputParameter.put(SCHEMA, (String)connectorParameter.getParameters().get(SCHEMA));
}

metricInputParameter.put(DATABASE_NAME,metricInputParameter.get(DATABASE));
metricInputParameter.put(TABLE_NAME,metricInputParameter.get(TABLE));
metricInputParameter.put(COLUMN_NAME,metricInputParameter.get(COLUMN));

ConnectorFactory connectorFactory = PluginLoader
.getPluginLoader(ConnectorFactory.class)
.getNewPlugin(connectorParameter.getType());
String table = connectorFactory.getDialect()
.getFullQualifiedTableName(metricInputParameter.get(DATABASE),metricInputParameter.get(SCHEMA),metricInputParameter.get(TABLE));
.getFullQualifiedTableNameForSpark(metricInputParameter.get(DATABASE),
metricInputParameter.get(SCHEMA),metricInputParameter.get(TABLE));

connectorParameterMap.put(TABLE, table);
connectorParameterMap.put(DATABASE, metricInputParameter.get(DATABASE));
Expand Down Expand Up @@ -126,7 +131,7 @@ protected List<SourceConfig> getSourceConfigs() throws DataVinesException {
ConnectorFactory connectorFactory = PluginLoader
.getPluginLoader(ConnectorFactory.class)
.getNewPlugin(connectorParameter2.getType());
String table = connectorFactory.getDialect().getFullQualifiedTableName(metricInputParameter.get(DATABASE2),
String table = connectorFactory.getDialect().getFullQualifiedTableNameForSpark(metricInputParameter.get(DATABASE2),
metricInputParameter.get(SCHEMA2),
metricInputParameter.get(TABLE2));

Expand Down
8 changes: 7 additions & 1 deletion ...gine-spark-core/src/main/java/io/datavines/engine/spark/core/SparkDataVinesBootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,16 @@

import io.datavines.engine.core.BaseDataVinesBootstrap;

import java.util.Base64;

public class SparkDataVinesBootstrap extends BaseDataVinesBootstrap {

public static void main(String[] args) {
SparkDataVinesBootstrap bootstrap = new SparkDataVinesBootstrap();
bootstrap.execute(args);
if (args.length == 1) {
String arg = args[0];
args[0] = new String(Base64.getDecoder().decode(arg));
bootstrap.execute(args);
}
}
}
4 changes: 3 additions & 1 deletion ...-spark-executor/src/main/java/io/datavines/engine/spark/executor/SparkEngineExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Base64;
import java.util.Objects;

import io.datavines.common.entity.JobExecutionRequest;
import io.datavines.common.utils.FileUtils;
Expand Down Expand Up @@ -127,7 +129,7 @@ protected String buildCommand() {
JSONUtils.parseObject(jobExecutionRequest.getApplicationParameter(), DataVinesJobConfig.class);

sparkParameters.setMainArgs("\""
+ StringUtils.replaceDoubleBrackets(StringUtils.escapeJava(JSONUtils.toJsonString(configuration))) + "\"");
+ Base64.getEncoder().encodeToString(Objects.requireNonNull(JSONUtils.toJsonString(configuration)).getBytes()) + "\"");

sparkParameters.setMainClass("io.datavines.engine.spark.core.SparkDataVinesBootstrap");

Expand Down
6 changes: 3 additions & 3 deletions ...es-metric/datavines-metric-api/src/main/java/io/datavines/metric/api/MetricConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public class MetricConstants {
RESULT_COLUMN_LIST.add(new ColumnInfo("metric_type",false));
RESULT_COLUMN_LIST.add(new ColumnInfo("metric_name",false));
RESULT_COLUMN_LIST.add(new ColumnInfo("metric_dimension",false));
RESULT_COLUMN_LIST.add(new ColumnInfo("database_name",true,"database"));
RESULT_COLUMN_LIST.add(new ColumnInfo("table_name",true,"table"));
RESULT_COLUMN_LIST.add(new ColumnInfo("column_name",true,"column"));
RESULT_COLUMN_LIST.add(new ColumnInfo("database_name",true));
RESULT_COLUMN_LIST.add(new ColumnInfo("table_name",true));
RESULT_COLUMN_LIST.add(new ColumnInfo("column_name",true));
RESULT_COLUMN_LIST.add(new ColumnInfo("actual_value",false));
RESULT_COLUMN_LIST.add(new ColumnInfo("expected_value",false));
RESULT_COLUMN_LIST.add(new ColumnInfo("expected_type",false));
Expand Down
Loading