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.

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

remove scheduler client #106

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion db/wedpr_ddl.sql
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ CREATE TABLE if not exists wedpr_job_worker_table (
job_id VARCHAR(255),
type VARCHAR(255),
status VARCHAR(255),
args TEXT,
args LONGTEXT,
upstreams TEXT,
inputs_statement TEXT,
outputs TEXT,
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -132,29 +132,6 @@ protected void registerExecutors(
new ExecutiveContextBuilder(projectMapperWrapper),
threadPoolService);
executorManager.registerExecutor(ExecutorType.DAG.getType(), dagSchedulerExecutor);
/*
boolean enableLocalDagScheduler = true;
if (enableLocalDagScheduler) {
DagSchedulerExecutor dagSchedulerExecutor =
new DagSchedulerExecutor(
loadBalancer,
jobWorkerMapper,
jobChecker,
storage,
fileMetaBuilder,
executorManager);
executorManager.registerExecutor(ExecutorType.REMOTE.getType(), dagSchedulerExecutor);
} else {
SchedulerClient schedulerClient = new SchedulerClient();
RemoteSchedulerExecutor remoteSchedulerExecutor =
new RemoteSchedulerExecutor(
schedulerClient, jobChecker, storage, fileMetaBuilder);

executorManager.registerExecutor(
ExecutorType.REMOTE.getType(), remoteSchedulerExecutor);
}
*/

/*
// register the executor
PSIExecutor psiExecutor = new PSIExecutor(storage, fileMetaBuilder, jobChecker);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.webank.wedpr.common.utils.Common;
import com.webank.wedpr.common.utils.ObjectMapperFactory;
import com.webank.wedpr.common.utils.WeDPRException;
import com.webank.wedpr.components.scheduler.client.SchedulerClient;
import com.webank.wedpr.components.scheduler.executor.impl.model.DatasetInfo;
import com.webank.wedpr.components.scheduler.executor.impl.model.FileMeta;
import com.webank.wedpr.components.scheduler.executor.impl.model.FileMetaBuilder;
Expand All @@ -33,28 +32,10 @@ public class MPCJobParam {
// the dataset information
private List<DatasetInfo> dataSetList;

@JsonIgnore private transient List<String> datasetIDList;

public void transferSQL2MPC() throws Exception {
if (Common.isEmptyStr(sql)) {
return;
}

if (!Common.isEmptyStr(mpcContent)) {
return;
}
@JsonIgnore private DatasetInfo selfDataset;
@JsonIgnore private int selfIndex = -1;

SchedulerClient schedulerClient = new SchedulerClient();
String mpcContent = schedulerClient.transferSQL2MPCContent(jobID, sql);

this.mpcContent = mpcContent;

logger.info(
"transfer sql to mpc code, jobId: {}, sql: {}, mpc code: {}",
jobID,
sql,
mpcContent);
}
@JsonIgnore private transient List<String> datasetIDList;

public boolean checkNeedRunPSI() {

Expand Down Expand Up @@ -84,7 +65,6 @@ public void check() throws Exception {
throw new WeDPRException("Invalid mpc job param, must define the mpc code or sql!");
}

this.transferSQL2MPC();
for (DatasetInfo datasetInfo : dataSetList) {
datasetInfo.setDatasetIDList(datasetIDList);
datasetInfo.check();
Expand Down
Loading
Loading