#553 #595
#553 #595
Conversation
| @@ -19,6 +19,19 @@ module namespace es-wrapper = "http://marklogic.com/data-hub/es-wrapper"; | |||
|
|
|||
| declare option xdmp:mapping "false"; | |||
|
|
|||
| declare function es-wrapper:search-options-generate($model) | |||
| { | |||
| xdmp:eval(' | |||
There was a problem hiding this comment.
why is this an eval instead of just calling es:search-options-generate()?
There was a problem hiding this comment.
this is part of the support for ML8. If this module didn't have the eval then the REST API would barf on the static check on ML8 when the code is deployed. If we drop ML8 support then this can go away.
| @@ -187,84 +75,39 @@ declare function hent:wrap-duplicates( | |||
| $item) | |||
| }; | |||
|
|
|||
| declare function hent:dump-search-options($entities as json:array) | |||
| declare %private function hent:fix-options($nodes as node()*) | |||
There was a problem hiding this comment.
I can see that this function replaces "es:" with "*:" in text nodes, but it's not clear why that's a useful thing. Please add a comment.
There was a problem hiding this comment.
Just saw the comment further down about entity services issue #359. Okay.
| map:delete($o, $x) | ||
| let $_ := | ||
| for $idx in json:array-values(map:get($o, "range-path-index")) | ||
| let $_ := xdmp:log(("idx:", $idx)) |
There was a problem hiding this comment.
is it still useful to have this xdmp:log statement?
There was a problem hiding this comment.
no. it should go away
| allCombos((codeFormat, dataFormat, flowType) -> { | ||
| allCombos((codeFormat, dataFormat, flowType, useEs) -> { | ||
| if (useEs) { | ||
| return; |
There was a problem hiding this comment.
we've got this return, but the code below also has useEs ? "-es" : "". Unclear why we'd return here.
There was a problem hiding this comment.
because we don't want to run ES tests in this case. and the useEs ? "-es" : "" was me going copy/paste crazy. I will remove the useEs ? "-es" : "" to make it a bit more clear. maybe a comment too :)
| allCombos((codeFormat, dataFormat, flowType) -> { | ||
| allCombos((codeFormat, dataFormat, flowType, useEs) -> { | ||
| if (useEs) { | ||
| return; |
There was a problem hiding this comment.
as above, unclear why we're returning when we're testing for useEs below.
| String flowName = getFlowName(prefix, codeFormat, dataFormat, flowType); | ||
| if (flowType.equals(FlowType.INPUT)) { | ||
| String flowName = getFlowName(prefix, codeFormat, dataFormat, flowType, useEs); | ||
| if (flowType.equals(FlowType.INPUT) && useEs) { |
There was a problem hiding this comment.
are there input flows that don't use ES? those would go to the else clause, which tests harmonize flows.
| tests.add(DynamicTest.dynamicTest(flowName, () -> { | ||
| // clear out the previous flows from above | ||
| FileUtils.deleteDirectory(entityDir.resolve("input").toFile()); | ||
| FileUtils.deleteDirectory(entityDir.resolve("harmonize").toFile()); | ||
|
|
||
| createFlow(prefix, codeFormat, dataFormat, flowType, (codeFormat1, dataFormat1, flowType1, srcDir, flowDir) -> { | ||
| copyFile(srcDir + "content-syntax-error." + codeFormat.toString(), flowDir.resolve("content." + codeFormat.toString())); | ||
| createFlow(prefix, codeFormat, dataFormat, flowType, useEs, (codeFormat1, dataFormat1, flowType1, srcDir, flowDir, useEs1) -> { |
There was a problem hiding this comment.
I see that codeFormat1 isn't a new variable, but it is pretty opaque.
There was a problem hiding this comment.
I've got nothing. leave it
| assertEquals(finalCounts.finalCount, getFinalDocCount()); | ||
| assertEquals(finalCounts.tracingCount, getTracingDocCount()); | ||
| assertEquals(finalCounts.jobCount, getJobDocCount()); | ||
| int stagingCount = getStagingDocCount(); |
There was a problem hiding this comment.
curious about this change -- it's fine, just curious
There was a problem hiding this comment.
it allowed me to put a conditional breakpoint when finalCount != finalCounts.finalCount. It was merely there for my debugging purposes.
| @@ -799,7 +857,7 @@ else if (prefix.equals("1x-legacy")) { | |||
| if (dataFormat.equals(DataFormat.JSON)) { | |||
| String expected = getResource("e2e-test/" + filename + "." + dataFormat.toString()); | |||
| String actual = stagingDocMgr.read("/input" + fileSuffix + "." + dataFormat.toString()).next().getContent(new StringHandle()).get(); | |||
| assertJsonEqual(expected, actual, false); | |||
| assertJsonEqual(expected, actual, false); | |||
There was a problem hiding this comment.
looks like an accidental space here
There was a problem hiding this comment.
are you talking about my brain? lol. yes. this is.
| @@ -0,0 +1 @@ | |||
| {"path-namespace":[{"prefix":"es", "namespace-uri":"http://marklogic.com/entity-services"}], "range-path-index":[{"collation":"http://marklogic.com/collation/codepoint", "invalid-values":"reject", "path-expression":"//*:instance/Employee/name", "range-value-positions":false, "scalar-type":"string"}], "range-element-index":[{"collation":"http://marklogic.com/collation/en", "invalid-values":"reject", "localname":"decimal", "namespace-uri":null, "range-value-positions":false, "scalar-type":"string"}]} | |||
There was a problem hiding this comment.
does this need to be all on one line?
There was a problem hiding this comment.
no. but I copied it from generated code and it came that way. wasn't worth my effort to format it.
…est_db fixed #565
Feature/bug 558
…y/marklogic-data-hub into feature/553_update_es
| @@ -484,7 +484,7 @@ public String getHubVersion() { | |||
| return hv.getVersion(); | |||
| } | |||
| catch(Exception e) {} | |||
| return "2.0.1"; | |||
| return "2.0.0"; // don't change this value | |||
There was a problem hiding this comment.
can you update the release notes to keep this one as-is?
|
Can one of the admins verify this patch? |
1 similar comment
|
Can one of the admins verify this patch? |
marklogic/datahub-central#1143