Skip to content

Commit 652d4be

Browse files
adamretteradamretter
authored
Merge pull request #47 from evolvedbinary/6.x.x/hotfix/facets-bracketed-element
[6.x.x] Fix issues with Lucene Index optimisations and Matches
2 parents a623725 + 47ecb60 commit 652d4be

33 files changed

+1937
-825
lines changed

‎exist-core/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,8 @@
796796
<include>src/main/java/org/exist/dom/persistent/DocumentImpl.java</include>
797797
<include>src/main/java/org/exist/dom/persistent/DocumentSet.java</include>
798798
<include>src/main/java/org/exist/dom/persistent/ElementImpl.java</include>
799+
<include>src/main/java/org/exist/dom/persistent/Match.java</include>
800+
<include>src/main/java/org/exist/dom/persistent/NewArrayNodeSet.java</include>
799801
<include>src/main/java/org/exist/dom/persistent/NodeProxy.java</include>
800802
<include>src/test/java/org/exist/dom/persistent/NodeTest.java</include>
801803
<include>src/test/java/org/exist/dom/persistent/PersistentDomTest.java</include>
@@ -912,13 +914,16 @@
912914
<include>src/main/java/org/exist/xmlrpc/RpcConnection.java</include>
913915
<include>src/main/java/org/exist/xqj/Marshaller.java</include>
914916
<include>src/test/java/org/exist/xqj/MarshallerTest.java</include>
917+
<include>src/main/java/org/exist/xquery/CombiningExpression.java</include>
915918
<include>src/test/java/org/exist/xquery/ConstructedNodesRecoveryTest.java</include>
916919
<include>src/main/java/org/exist/xquery/DeferredFunctionCall.java</include>
917920
<include>src/main/java/org/exist/xquery/DynamicCardinalityCheck.java</include>
918921
<include>src/main/java/org/exist/xquery/DynamicTypeCheck.java</include>
919922
<include>src/main/java/org/exist/xquery/ErrorCodes.java</include>
923+
<include>src/main/java/org/exist/xquery/FilteredExpression.java</include>
920924
<include>src/test/java/org/exist/xquery/ForwardReferenceTest.java</include>
921925
<include>src/main/java/org/exist/xquery/FunctionFactory.java</include>
926+
<include>src/main/java/org/exist/xquery/LocationStep.java</include>
922927
<include>src/main/java/org/exist/xquery/Optimizer.java</include>
923928
<include>src/main/java/org/exist/xquery/PerformanceStats.java</include>
924929
<include>src/main/java/org/exist/xquery/TryCatchExpression.java</include>
@@ -962,6 +967,7 @@
962967
<include>src/main/java/org/exist/xquery/functions/xmldb/XMLDBStore.java</include>
963968
<include>src/main/java/org/exist/xquery/functions/xmldb/XMLDBXUpdate.java</include>
964969
<include>src/main/antlr/org/exist/xquery/parser/XQueryTree.g</include>
970+
<include>src/main/java/org/exist/xquery/pragmas/Optimize.java</include>
965971
<include>src/test/java/org/exist/xquery/update/UpdateReplaceTest.java</include>
966972
<include>src/main/java/org/exist/xquery/util/ExpressionDumper.java</include>
967973
<include>src/main/java/org/exist/xquery/util/SerializerUtils.java</include>
@@ -1076,6 +1082,8 @@
10761082
<exclude>src/main/java/org/exist/dom/persistent/DocumentImpl.java</exclude>
10771083
<exclude>src/main/java/org/exist/dom/persistent/DocumentSet.java</exclude>
10781084
<exclude>src/main/java/org/exist/dom/persistent/ElementImpl.java</exclude>
1085+
<exclude>src/main/java/org/exist/dom/persistent/Match.java</exclude>
1086+
<exclude>src/main/java/org/exist/dom/persistent/NewArrayNodeSet.java</exclude>
10791087
<exclude>src/main/java/org/exist/dom/persistent/NodeProxy.java</exclude>
10801088
<exclude>src/test/java/org/exist/dom/persistent/NodeTest.java</exclude>
10811089
<exclude>src/test/java/org/exist/dom/persistent/PersistentDomTest.java</exclude>
@@ -1252,13 +1260,16 @@
12521260
<exclude>src/main/java/org/exist/xqj/Marshaller.java</exclude>
12531261
<exclude>src/test/java/org/exist/xqj/MarshallerTest.java</exclude>
12541262
<exclude>src/main/java/org/exist/xquery/Cardinality.java</exclude>
1263+
<exclude>src/main/java/org/exist/xquery/CombiningExpression.java</exclude>
12551264
<exclude>src/test/java/org/exist/xquery/ConstructedNodesRecoveryTest.java</exclude>
12561265
<include>src/main/java/org/exist/xquery/DeferredFunctionCall.java</include>
12571266
<include>src/main/java/org/exist/xquery/DynamicCardinalityCheck.java</include>
12581267
<exclude>src/main/java/org/exist/xquery/DynamicTypeCheck.java</exclude>
12591268
<exclude>src/main/java/org/exist/xquery/ErrorCodes.java</exclude>
1269+
<exclude>src/main/java/org/exist/xquery/FilteredExpression.java</exclude>
12601270
<exclude>src/test/java/org/exist/xquery/ForwardReferenceTest.java</exclude>
12611271
<exclude>src/main/java/org/exist/xquery/FunctionFactory.java</exclude>
1272+
<exclude>src/main/java/org/exist/xquery/LocationStep.java</exclude>
12621273
<exclude>src/test/resources-filtered/org/exist/xquery/import-from-pkg-test.conf.xml</exclude>
12631274
<exclude>src/test/java/org/exist/xquery/ImportFromPkgTest.java</exclude>
12641275
<exclude>src/test/java/org/exist/xquery/ImportModuleTest.java</exclude>
@@ -1326,6 +1337,7 @@
13261337
<exclude>src/main/java/org/exist/xquery/functions/xmldb/XMLDBXUpdate.java</exclude>
13271338
<exclude>src/test/java/org/exist/xquery/functions/xquery3/SerializeTest.java</exclude>
13281339
<exclude>src/main/antlr/org/exist/xquery/parser/XQueryTree.g</exclude>
1340+
<exclude>src/main/java/org/exist/xquery/pragmas/Optimize.java</exclude>
13291341
<exclude>src/main/java/org/exist/xquery/pragmas/TimePragma.java</exclude>
13301342
<exclude>src/test/java/org/exist/xquery/update/UpdateReplaceTest.java</exclude>
13311343
<exclude>src/main/java/org/exist/xquery/util/ExpressionDumper.java</exclude>

0 commit comments

Comments
 (0)