Skip to content

MLE-30494: Support isolated HTTP and XDBC requests #608

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

Merged
abika5 merged 1 commit into from
Jun 26, 2026
Merged

MLE-30494: Support isolated HTTP and XDBC requests #608

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
9 changes: 7 additions & 2 deletions src/main/java/com/marklogic/mapreduce/ContentOutputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,18 @@ public class ContentOutputFormat<VALUEOUT> extends
+ "return if (exists($f)) then $f() else ()";
// For HTTP Server
public static final String HEADER_QUERY =
"fn:exists(xdmp:get-request-header('x-forwarded-for'))";
"let $f := fn:function-lookup(xs:QName('xdmp:is-forwarded'),0)\n" +
"return if (exists($f)) then $f() " +
"else fn:exists(xdmp:get-request-header('x-forwarded-for'))";
// For XDBC Server
public static final String XDBC_HEADER_QUERY =
"let $f := fn:function-lookup(xs:QName('xdmp:is-forwarded'),0)\n" +
"return if (exists($f)) then $f() " +
"else (" +
Comment on lines +131 to +138
"let $xdbcHeaderf := " +
"fn:function-lookup(xs:QName('xdmp:get-xdbc-request-header'),1)\n" +
"return if (exists($xdbcHeaderf)) " +
"then fn:exists($xdbcHeaderf('x-forwarded-for')) else false()";
"then fn:exists($xdbcHeaderf('x-forwarded-for')) else false())";

protected AssignmentManager am = AssignmentManager.getInstance();
protected boolean fastLoad;
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/marklogic/mapreduce/MarkLogicInputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,8 @@ public List<InputSplit> getSplits(JobContext jobContext) throws IOException,
StringBuilder buf = new StringBuilder();
buf.append("xquery version \"1.0-ml\";\n");
if (getForwardHeader) {
buf.append("fn:exists(xdmp:get-request-header('x-forwarded-for'));\n");
buf.append(ContentOutputFormat.HEADER_QUERY).append(";\n");
buf.append(ContentOutputFormat.XDBC_HEADER_QUERY).append(";\n");
}
buf.append("import module namespace hadoop = ");
buf.append("\"http://marklogic.com/xdmp/hadoop\" at ");
Expand Down Expand Up @@ -402,6 +403,8 @@ public List<InputSplit> getSplits(JobContext jobContext) throws IOException,
if (getForwardHeader) {
forwardHeaderExists = item.asString().equals("true");
item = result.next();
forwardHeaderExists |= item.asString().equals("true");
item = result.next();
Comment on lines 403 to +407
if (forwardHeaderExists) {
restrictHosts = true;
jobConf.setBoolean(INPUT_RESTRICT_HOSTS, true);
Expand Down
Loading