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

Jump to bottom

Adjust ExportToFiles compiler for re-usability #1395

Merged
merged 2 commits into from
Nov 12, 2024
Merged

Adjust ExportToFiles compiler for re-usability #1395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c47166
Adjust ExportToFiles compiler for re-usability
mujammil10 Nov 7, 2024
dfa2c0a
Resolve resourceKey for export jobs
mujammil10 Nov 11, 2024
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
8 changes: 4 additions & 4 deletions xyz-jobs/xyz-job-service/src/main/java/com/here/xyz/jobs/Job.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import com.here.xyz.jobs.RuntimeInfo.State;
import com.here.xyz.jobs.config.JobConfigClient;
import com.here.xyz.jobs.datasets.DatasetDescription;
import com.here.xyz.jobs.datasets.Files;
import com.here.xyz.jobs.datasets.streams.DynamicStream;
import com.here.xyz.jobs.steps.JobCompiler;
import com.here.xyz.jobs.steps.Step;
Expand Down Expand Up @@ -520,10 +521,9 @@ public Job withId(String id) {

@JsonView(Static.class)
public String getResourceKey() {
//TODO: Identify when to use the key from source vs from target
if (getTarget() == null)
return null;
return getTarget().getKey();
//Always use key from the source except when the source is Files
if(getSource() == null) return null;
return getSource() instanceof Files<?> ? getTarget().getKey() : getSource().getKey();
}

public String getDescription() {
Expand Down
55 changes: 30 additions & 25 deletions xyz-jobs/xyz-job-service/src/main/java/com/here/xyz/jobs/steps/compiler/ExportToFiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.here.xyz.jobs.datasets.Files;

import com.here.xyz.jobs.datasets.files.GeoJson;
import com.here.xyz.jobs.datasets.filters.Filters;
import com.here.xyz.jobs.steps.CompilationStepGraph;
import com.here.xyz.jobs.steps.Config;
import com.here.xyz.jobs.steps.JobCompiler;
Expand All @@ -48,41 +49,45 @@ public boolean chooseMe(Job job) {
@Override
public CompilationStepGraph compile(Job job) {
Space source = (Space) job.getSource();
resolveVersionRef(source);
String spaceId = source.getId();

ExportSpaceToFiles exportToFilesStep = new ExportSpaceToFiles()
.withSpaceId(spaceId)
.withJobId(job.getId())
.withSpatialFilter(source.getFilters() != null ? source.getFilters().getSpatialFilter() : null)
.withPropertyFilter(source.getFilters() != null ? source.getFilters().getPropertyFilter() : null)
.withContext(source.getFilters() != null ? source.getFilters().getContext() : null)
.withVersionRef(source.getVersionRef() != null ? source.getVersionRef() : null);

return compileImportSteps(exportToFilesStep);
return compileSteps(source.getId(), job.getId(), source.getFilters(), source.getVersionRef());
}

public static CompilationStepGraph compileImportSteps(ExportSpaceToFiles exportToFilesStep) {
public static CompilationStepGraph compileSteps(String spaceId, String jobId, Filters filters, Ref versionRef) {
return (CompilationStepGraph) new CompilationStepGraph()
.addExecution(exportToFilesStep);
.addExecution(compileExportStep(spaceId, jobId, filters, versionRef, false, true));
}

public static ExportSpaceToFiles compileExportStep(String spaceId, String jobId, Filters filters, Ref versionRef, boolean useSystemOutput, boolean addStatistics) {
versionRef = resolveVersionRef(spaceId, versionRef);
return new ExportSpaceToFiles()
.withSpaceId(spaceId)
.withJobId(jobId)
.withSpatialFilter(filters != null ? filters.getSpatialFilter() : null)
.withPropertyFilter(filters != null ? filters.getPropertyFilter() : null)
.withContext(filters != null ? filters.getContext() : null)
.withVersionRef(versionRef)
.withUseSystemOutput(useSystemOutput)
.withAddStatisticsToUserOutput(addStatistics);
}

private void resolveVersionRef(Space sourceSpace) {
if(sourceSpace.getVersionRef() == null || sourceSpace.getVersionRef().isRange())
return;
private static Ref resolveVersionRef(String spaceId, Ref versionRef) {
if(versionRef == null || versionRef.isRange())
return versionRef;

try {
if (sourceSpace.getVersionRef().isHead()) {
StatisticsResponse statisticsResponse = HubWebClient.getInstance(Config.instance.HUB_ENDPOINT).loadSpaceStatistics(sourceSpace.getId());
sourceSpace.setVersionRef(new Ref(statisticsResponse.getMaxVersion().getValue()));
} else if (sourceSpace.getVersionRef().isTag()) {
long version = HubWebClient.getInstance(Config.instance.HUB_ENDPOINT).loadTag(sourceSpace.getId(), sourceSpace.getVersionRef().getTag()).getVersion();
Long resolvedVersion = null;
if (versionRef.isHead()) {
StatisticsResponse statisticsResponse = HubWebClient.getInstance(Config.instance.HUB_ENDPOINT).loadSpaceStatistics(spaceId);
resolvedVersion = statisticsResponse.getMaxVersion().getValue();
} else if (versionRef.isTag()) {
long version = HubWebClient.getInstance(Config.instance.HUB_ENDPOINT).loadTag(spaceId, versionRef.getTag()).getVersion();
if (version >= 0) {
sourceSpace.setVersionRef(new Ref(version));
resolvedVersion = version;
}
}
}catch (Exception e) {
throw new JobCompiler.CompilationError("Unable to resolve '" + sourceSpace.getVersionRef() + "' VersionRef!");
return resolvedVersion == null ? versionRef : new Ref(resolvedVersion);
} catch (Exception e) {
throw new JobCompiler.CompilationError("Unable to resolve '" + versionRef + "' VersionRef!");
}
}
}
Loading