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

z_source column is added at the end of dataset in alignDupes #119

Merged
merged 2 commits into from Jan 10, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/java/zingg/util/DSUtil.java
Expand Up @@ -131,11 +131,11 @@ public static Dataset<Row> alignDupes(Dataset<Row> dupesActual, Arguments args)
cols.add(dupesActual.col(ColName.ID_COL));
cols.add(dupesActual.col(ColName.PREDICTION_COL));
cols.add(dupesActual.col(ColName.SCORE_COL));
cols.add(dupesActual.col(ColName.SOURCE_COL));

for (FieldDefinition def: args.getFieldDefinition()) {
cols.add(dupesActual.col(def.fieldName));
}
cols.add(dupesActual.col(ColName.SOURCE_COL));

Dataset<Row> dupes1 = dupesActual.select(JavaConverters.asScalaIteratorConverter(cols.iterator()).asScala().toSeq());
List<Column> cols1 = new ArrayList<Column>();
Expand All @@ -145,10 +145,10 @@ public static Dataset<Row> alignDupes(Dataset<Row> dupesActual, Arguments args)
//cols1.add(dupesActual.col(ColName.PROBABILITY_COL));
cols1.add(dupesActual.col(ColName.SCORE_COL));

cols1.add(dupesActual.col(ColName.COL_PREFIX +ColName.SOURCE_COL));
for (FieldDefinition def: args.getFieldDefinition()) {
cols1.add(dupesActual.col(ColName.COL_PREFIX + def.fieldName));
}
cols1.add(dupesActual.col(ColName.COL_PREFIX +ColName.SOURCE_COL));
/*if (args.getJobId() != -1) {
cols1.add(dupesActual.col(ColName.SPARK_JOB_ID_COL));
}*/
Expand Down