Skip to content

PDP-2114 Added --incremental-write-source-uri-name #677

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

Open
rjrudin wants to merge 1 commit into from
+10 −1
Open

PDP-2114 Added --incremental-write-source-uri-name #677

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
2 changes: 1 addition & 1 deletion flux-cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
implementation "info.picocli:picocli:${picocliVersion}"

// Need this for compilation as it's not an API dependency of the Spark connector.
compileOnly "com.marklogic:marklogic-client-api:8.1.0"
compileOnly "com.marklogic:marklogic-client-api:8.3-SNAPSHOT"

// The shadow jar intended for usage with spark-submit needs the above "core" libraries as well, but not the Spark
// API since spark-submit provides that.
Expand Down
7 changes: 7 additions & 0 deletions flux-cli/src/main/java/com/marklogic/flux/impl/importdata/IncrementalWriteParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ static class SchemaViewGroup {
// This is the default in the Java Client as well, but stating here it makes it clear that it's the default.
private String hashKeyName = "incrementalWriteHash";

@CommandLine.Option(
names = "--incremental-write-source-uri-name",
description = "Name of the optional metadata key in which to store the source URI of the document being written. No default value."
)
private String sourceUriKeyName;

@CommandLine.Option(
names = "--incremental-write-timestamp-name",
description = "Name of the optional metadata key in which to store the timestamp for when the document was written. No default value."
Expand Down Expand Up @@ -97,6 +103,7 @@ public Map<String, String> makeOptions() {
Options.WRITE_INCREMENTAL_SCHEMA, schemaView != null ? schemaView.schema : null,
Options.WRITE_INCREMENTAL_VIEW, schemaView != null ? schemaView.view : null,
Options.WRITE_INCREMENTAL_HASH_KEY_NAME, hashKeyName,
Options.WRITE_INCREMENTAL_SOURCE_URI_KEY_NAME, sourceUriKeyName,
Options.WRITE_INCREMENTAL_TIMESTAMP_KEY_NAME, timestampKeyName,
Options.WRITE_INCREMENTAL_CANONICALIZE_JSON, dontCanonicalizeJson != null ? (!dontCanonicalizeJson ? "true" : "false") : null,
Options.WRITE_INCREMENTAL_JSON_EXCLUSIONS, jsonExclusions.isEmpty() ? null : String.join("\n", jsonExclusions),
Expand Down
2 changes: 2 additions & 0 deletions flux-cli/src/test/java/com/marklogic/flux/impl/importdata/ImportFilesOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ void incrementalWriteOptions() {
"--incremental-write-schema", "mySchema",
"--incremental-write-view", "myView",
"--incremental-write-hash-name", "customHash",
"--incremental-write-source-uri-name", "mySourceUri",
"--incremental-write-timestamp-name", "customTimestamp",
"--incremental-write-disable-json-canonicalization",
"--incremental-write-json-exclusion", "/json1",
Expand All @@ -249,6 +250,7 @@ void incrementalWriteOptions() {
Options.WRITE_INCREMENTAL_SCHEMA, "mySchema",
Options.WRITE_INCREMENTAL_VIEW, "myView",
Options.WRITE_INCREMENTAL_HASH_KEY_NAME, "customHash",
Options.WRITE_INCREMENTAL_SOURCE_URI_KEY_NAME, "mySourceUri",
Options.WRITE_INCREMENTAL_TIMESTAMP_KEY_NAME, "customTimestamp",
Options.WRITE_INCREMENTAL_CANONICALIZE_JSON, "false",
Options.WRITE_INCREMENTAL_JSON_EXCLUSIONS, "/json1\n/json2",
Expand Down
Loading