You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2022/07/15 11:28:28 UTC
[jackrabbit-oak] branch trunk updated (799939d68a -> bbc141fd1f)
This is an automated email from the ASF dual-hosted git repository.
mreutegg pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
from 799939d68a OAK-9834 : clarify node names of ACL nodes (#610)
add ab5adf716b OAK-9535 related : trying to increase mvn memory
add 8c5bb742c0 OAK-9535 related : cleanup of erroneously pushed change
add 437439a501 Merge branch 'apache:trunk' into trunk
add 01628989fc Merge branch 'apache:trunk' into trunk
add 12896c5338 Merge branch 'apache:trunk' into trunk
add 6a72fcce1c Merge branch 'apache:trunk' into trunk
add c480532e0b OAK-9780 : rebased branch OAK-9780 to trunk, excluding oak-api
add 7ae925c40b Merge pull request #585 from stefan-egli/OAK-9780-2
add 880c2c017b OAK-9780 PoC for DocumentNodeStore cache warming - prefetch query results
add 29a860f388 OAK-9791 : Missing check for restriction node being present
add aa6a0292c5 OAK-9793 : AbstractRestrictionProvider: validation to respect aggregation for unsupported paths
add 6052ef60e1 OAK-9795 : Best practices: explicitly discourage ac setup for anonymous
add b7cb2c870b ElasticResultRowAsyncIterator should not limit result set to 10k results (#588)
add b223fe9f8a OAK-9798 : Inconsistent handling of supported permissions in CompositePermissionProviderOr
add f9b59f8c51 OAK-9757 : increased node name limit for mongo 4.2 version
add b50a449c27 OAK-9757 : created new api in documentstore to get size limit for node name
add dc05c5caf3 OAK-9757 : moved the node name length check to documentnodestate while creating/adding new node
add 84313be749 OAK-9757 : removed mongoversion class to use serverversion and changed documentstore api name
add 1d3287cad1 OAK-9757 : fixed mongo util errors
add e277bfaf4e OAK-9757 : fixed issue where size limit would come wrong for version less than 4.2.0
add 84aa93b680 OAK-9757 : move isNodeNameLong check to addNode api of commitbuilder
add 3b09fe1731 OAK-9757 : removed un-necessary junit
add a05a39f779 OAK-9757: increased node name limit for mongo 4.2 version
add 22c6036043 OAK-9757 : increased node name limit for mongo 4.2 version
add 35cd618797 OAK-9757 : created new api in documentstore to get size limit for node name
add a77f57ec90 OAK-9757 : moved the node name length check to documentnodestate while creating/adding new node
add 3bd2bea137 OAK-9757 : removed mongoversion class to use serverversion and changed documentstore api name
add e415630591 OAK-9757 : fixed mongo util errors
add bf6b24ab67 OAK-9757 : fixed issue where size limit would come wrong for version less than 4.2.0
add 8387f17d04 OAK-9757 : move isNodeNameLong check to addNode api of commitbuilder
add f54bb8abcf OAK-9757 : removed un-necessary junit
add 9d42c1c33d OAK-9757 : used MongoStatus.isVersion api to check node name limit
add 9d7022d594 Revert "OAK-9757 : used MongoStatus.isVersion api to check node name limit"
add 3d29a082be OAK-9757 : Override DocumentStore.getNodeNameLimit in wrapper classes
add e7c918005a releng: use newest maven-fluido-skin 1.11.0 (#591)
add 92afadc45a OAK-9798 : fix import in CompositePermissionProviderOrTest. accidential use of sun.reflect.generics.reflectiveObjects.NotImplementedException
add fc4c6841ad OAK-9804 Flaky unit test FlatFileStoreTest.resumePreviousUnfinishedDownload()
add bc1c534515 OAK-9797: Direct access blob cache override breaks metrics and monitoring
add 1fa19c93c2 OAK-9797: Direct access blob cache override breaks metrics and monito…
add 2e2a2bd38b OAK-9797: Direct access blob cache override breaks metrics and monitoring
add 5c252f868d OAK-9780 : rebased branch OAK-9780 to trunk, excluding oak-api
add 8b7c3a7335 Revert "OAK-9780 PoC for DocumentNodeStore cache warming - prefetch query results"
add 012c72bab6 Revert "Revert "OAK-9780 PoC for DocumentNodeStore cache warming - prefetch query results""
add 143cd76fd1 Revert failed attempt to get changes from trunk into branch
add 70a6625300 Merge changes from trunk using 'git merge origin/trunk'
add 83b43c7dce OAK-9780: PoC for DocumentNodeStore cache warming
add b7b413966f Merge remote-tracking branch 'origin/trunk' into OAK-9780
add 859387c134 OAK-9780: PoC for DocumentNodeStore cache warming
add 61384b8bc1 OAK-9780: PoC for DocumentNodeStore cache warming
add 7def7d18c2 OAK-9780 PoC for DocumentNodeStore cache warming - support relative prefetch (WIP)
add 89f8fe9cad OAK-9780 PoC for DocumentNodeStore cache warming - avoid unnecessary conversion
add 13bb08f8d8 Merge remote-tracking branch 'origin/trunk' into OAK-9780
add ddb1ef6b57 OAK-9780: PoC for DocumentNodeStore cache warming
add a6ed7b1a2c OAK-9780: PoC for DocumentNodeStore cache warming
add a8f08e4239 OAK-9780: PoC for DocumentNodeStore cache warming
add 7c7e1e9861 OAK-9780: PoC for DocumentNodeStore cache warming
add 5f8a17634d OAK-9780 Prefetch Cursor
add 4bdc32b8d5 Merge remote-tracking branch 'origin/trunk' into OAK-9780
add 3daf39292b OAK-9780 Prefetch Cursor - fix imports
add e3f2c83479 OAK-9780 Prefetch Cursor - fix exports
add 51bbf982f1 Merge remote-tracking branch 'origin/trunk' into OAK-9780
add 5f31e89530 OAK-9780: PoC for DocumentNodeStore cache warming
add f5978a6994 Merge branch 'trunk' into OAK-9780
add 754d9fc1c2 OAK-9780: Prefetch node states
add 6129c0947f OAK-9780: Prefetch node states
add 3086a9eab9 OAK-9780: Prefetch node states
add d73db4ec3e OAK-9780: Prefetch node states
add d005718e98 OAK-9780: Prefetch node states
new bbc141fd1f Merge pull request #622 from apache/OAK-9780
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../oak/api/jmx/QueryEngineSettingsMBean.java | 34 +-
.../jackrabbit/oak/api/jmx/package-info.java | 2 +-
oak-core/pom.xml | 3 +-
.../main/java/org/apache/jackrabbit/oak/Oak.java | 20 +
.../apache/jackrabbit/oak/core/ImmutableRoot.java | 7 +-
.../apache/jackrabbit/oak/core/MutableRoot.java | 11 +-
.../jackrabbit/oak/plugins/index/Cursors.java | 559 ---------------------
.../plugins/index/aggregate/AggregateIndex.java | 2 +-
.../plugins/index/aggregate/AggregationCursor.java | 2 +-
.../oak/plugins/index/cursor/AbstractCursor.java | 29 +-
.../oak/plugins/index/cursor/AncestorCursor.java | 62 +++
.../oak/plugins/index/cursor/ConcatCursor.java | 120 +++++
.../oak/plugins/index/cursor/Cursors.java | 113 +++++
.../plugins/index/cursor/IntersectionCursor.java | 121 +++++
.../oak/plugins/index/cursor/PathCursor.java | 73 +++
.../oak/plugins/index/cursor/PrefetchCursor.java | 203 ++++++++
.../oak/plugins/index/cursor/TraversingCursor.java | 192 +++++++
.../oak/plugins/index/diffindex/DiffIndex.java | 2 +-
.../oak/plugins/index/nodetype/NodeTypeIndex.java | 3 +-
.../plugins/index/property/PropertyIndexPlan.java | 2 +-
.../plugins/index/reference/ReferenceIndex.java | 2 +-
.../jackrabbit/oak/query/ExecutionContext.java | 12 +-
.../jackrabbit/oak/query/QueryEngineImpl.java | 4 +-
.../jackrabbit/oak/query/QueryEngineSettings.java | 39 +-
.../apache/jackrabbit/oak/query/QueryOptions.java | 91 ++++
.../apache/jackrabbit/oak/query/SQL2Parser.java | 19 +-
.../jackrabbit/oak/query/ast/SelectorImpl.java | 10 +-
.../oak/query/index/TraversingIndex.java | 2 +-
.../jackrabbit/oak/query/stats/QueryRecorder.java | 9 +-
.../jackrabbit/oak/query/stats/QueryStatsData.java | 6 -
.../jackrabbit/oak/query/xpath/Statement.java | 10 +-
.../oak/query/xpath/XPathToSQL2Converter.java | 42 +-
.../oak/plugins/index/cursor/CursorUtils.java | 27 +-
.../plugins/index/{ => cursor}/CursorsTest.java | 2 +-
.../plugins/index/cursor/PrefetchCursorTest.java | 119 +++++
.../oak/plugins/index/cursor/TestCursor.java | 29 +-
.../index/cursor/TestPrefetchNodeStore.java} | 30 +-
.../oak/plugins/index/cursor/TestRow.java | 32 +-
.../plugins/index/nodetype/NodeTypeIndexTest.java | 4 +-
.../oak/security/CustomQueryIndexProviderTest.java | 2 +-
.../site/markdown/nodestore/document/metrics.md | 2 +
.../oak/plugins/index/lucene/LuceneIndex.java | 4 +-
oak-parent/pom.xml | 1 +
.../index/search/spi/query/FulltextIndex.java | 4 +-
.../plugins/index/solr/query/SolrQueryIndex.java | 4 +-
.../oak/composite/CompositeNodeStore.java | 9 +-
.../oak/composite/CompositionContext.java | 7 +
.../jackrabbit/oak/composite/package-info.java | 2 +-
.../oak/plugins/document/DocumentNodeState.java | 30 ++
.../oak/plugins/document/DocumentNodeStore.java | 59 ++-
.../plugins/document/DocumentNodeStoreBuilder.java | 12 +
.../plugins/document/DocumentNodeStoreMBean.java | 6 +-
.../document/DocumentNodeStoreMBeanImpl.java | 4 +
.../plugins/document/DocumentNodeStoreService.java | 13 +
.../oak/plugins/document/DocumentStore.java | 8 +
.../oak/plugins/document/DocumentStoreStats.java | 31 ++
.../document/DocumentStoreStatsCollector.java | 10 +
.../plugins/document/DocumentStoreStatsMBean.java | 4 +
.../document/cache/CacheChangesTracker.java | 6 -
.../plugins/document/cache/NodeDocumentCache.java | 25 +-
.../plugins/document/mongo/MongoDocumentStore.java | 93 ++++
.../plugins/document/prefetch/CacheWarming.java | 74 +++
.../util/LeaseCheckDocumentStoreWrapper.java | 7 +
.../document/ConcurrentPrefetchAndUpdateIT.java | 157 ++++++
.../plugins/document/CountingDocumentStore.java | 6 +
.../document/DocumentNodeStoreMBeanTest.java | 24 +
.../document/cache/CacheChangesTrackerTest.java | 4 +-
.../document/mongo/MongoTestCollection.java | 4 +-
.../document/prefetch/CacheWarmingTest.java | 228 +++++++++
.../document/prefetch/CountingMongoCollection.java | 134 +++++
.../document/prefetch/CountingMongoDatabase.java | 354 +++++++++++++
.../oak/spi/state/PrefetchNodeStore.java | 26 +-
72 files changed, 2686 insertions(+), 717 deletions(-)
delete mode 100644 oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/Cursors.java
copy oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/monitor/FileStoreMonitorAdapter.java => oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/AbstractCursor.java (63%)
create mode 100644 oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/AncestorCursor.java
create mode 100644 oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/ConcatCursor.java
create mode 100644 oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/Cursors.java
create mode 100644 oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/IntersectionCursor.java
create mode 100644 oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/PathCursor.java
create mode 100644 oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/PrefetchCursor.java
create mode 100644 oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/TraversingCursor.java
copy oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/TemporaryPort.java => oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/cursor/CursorUtils.java (65%)
rename oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/{ => cursor}/CursorsTest.java (98%)
create mode 100644 oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/cursor/PrefetchCursorTest.java
copy oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/monitor/RemoteStoreMonitorAdapter.java => oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/cursor/TestCursor.java (66%)
copy oak-core/src/{main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/UUIDDiffIndex.java => test/java/org/apache/jackrabbit/oak/plugins/index/cursor/TestPrefetchNodeStore.java} (61%)
copy oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/container/DummyBlobStoreContainer.java => oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/cursor/TestRow.java (65%)
create mode 100644 oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/prefetch/CacheWarming.java
create mode 100755 oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentPrefetchAndUpdateIT.java
create mode 100644 oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/prefetch/CacheWarmingTest.java
create mode 100644 oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/prefetch/CountingMongoCollection.java
create mode 100644 oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/prefetch/CountingMongoDatabase.java
copy oak-examples/webapp/src/main/java/org/apache/jackrabbit/j2ee/JcrRemotingServlet.java => oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/PrefetchNodeStore.java (60%)
[jackrabbit-oak] 01/01: Merge pull request #622 from apache/OAK-9780
Posted by mr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mreutegg pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit bbc141fd1fb9ff0d9ce742279445df9eb698c3e3
Merge: 799939d68a d005718e98
Author: Marcel Reutegger <ma...@gmail.com>
AuthorDate: Fri Jul 15 13:28:22 2022 +0200
Merge pull request #622 from apache/OAK-9780
OAK-9780: Prefetch node states
.../oak/api/jmx/QueryEngineSettingsMBean.java | 34 +-
.../jackrabbit/oak/api/jmx/package-info.java | 2 +-
oak-core/pom.xml | 3 +-
.../main/java/org/apache/jackrabbit/oak/Oak.java | 20 +
.../apache/jackrabbit/oak/core/ImmutableRoot.java | 7 +-
.../apache/jackrabbit/oak/core/MutableRoot.java | 11 +-
.../jackrabbit/oak/plugins/index/Cursors.java | 559 ---------------------
.../plugins/index/aggregate/AggregateIndex.java | 2 +-
.../plugins/index/aggregate/AggregationCursor.java | 2 +-
.../oak/plugins/index/cursor/AbstractCursor.java | 22 +-
.../oak/plugins/index/cursor/AncestorCursor.java | 62 +++
.../oak/plugins/index/cursor/ConcatCursor.java | 120 +++++
.../oak/plugins/index/cursor/Cursors.java | 113 +++++
.../plugins/index/cursor/IntersectionCursor.java | 121 +++++
.../oak/plugins/index/cursor/PathCursor.java | 73 +++
.../oak/plugins/index/cursor/PrefetchCursor.java | 203 ++++++++
.../oak/plugins/index/cursor/TraversingCursor.java | 192 +++++++
.../oak/plugins/index/diffindex/DiffIndex.java | 2 +-
.../oak/plugins/index/nodetype/NodeTypeIndex.java | 3 +-
.../plugins/index/property/PropertyIndexPlan.java | 2 +-
.../plugins/index/reference/ReferenceIndex.java | 2 +-
.../jackrabbit/oak/query/ExecutionContext.java | 12 +-
.../jackrabbit/oak/query/QueryEngineImpl.java | 4 +-
.../jackrabbit/oak/query/QueryEngineSettings.java | 39 +-
.../apache/jackrabbit/oak/query/QueryOptions.java | 91 ++++
.../apache/jackrabbit/oak/query/SQL2Parser.java | 19 +-
.../jackrabbit/oak/query/ast/SelectorImpl.java | 10 +-
.../oak/query/index/TraversingIndex.java | 2 +-
.../jackrabbit/oak/query/stats/QueryRecorder.java | 9 +-
.../jackrabbit/oak/query/stats/QueryStatsData.java | 6 -
.../jackrabbit/oak/query/xpath/Statement.java | 10 +-
.../oak/query/xpath/XPathToSQL2Converter.java | 42 +-
.../oak/plugins/index/cursor/CursorUtils.java | 18 +-
.../plugins/index/{ => cursor}/CursorsTest.java | 2 +-
.../plugins/index/cursor/PrefetchCursorTest.java | 119 +++++
.../oak/plugins/index/cursor/TestCursor.java | 25 +-
.../index/cursor/TestPrefetchNodeStore.java | 26 +-
.../oak/plugins/index/cursor/TestRow.java | 29 +-
.../plugins/index/nodetype/NodeTypeIndexTest.java | 4 +-
.../oak/security/CustomQueryIndexProviderTest.java | 2 +-
.../site/markdown/nodestore/document/metrics.md | 2 +
.../oak/plugins/index/lucene/LuceneIndex.java | 4 +-
oak-parent/pom.xml | 1 +
.../index/search/spi/query/FulltextIndex.java | 4 +-
.../plugins/index/solr/query/SolrQueryIndex.java | 4 +-
.../oak/composite/CompositeNodeStore.java | 9 +-
.../oak/composite/CompositionContext.java | 7 +
.../jackrabbit/oak/composite/package-info.java | 2 +-
.../oak/plugins/document/DocumentNodeState.java | 30 ++
.../oak/plugins/document/DocumentNodeStore.java | 59 ++-
.../plugins/document/DocumentNodeStoreBuilder.java | 12 +
.../plugins/document/DocumentNodeStoreMBean.java | 6 +-
.../document/DocumentNodeStoreMBeanImpl.java | 4 +
.../plugins/document/DocumentNodeStoreService.java | 13 +
.../oak/plugins/document/DocumentStore.java | 8 +
.../oak/plugins/document/DocumentStoreStats.java | 31 ++
.../document/DocumentStoreStatsCollector.java | 10 +
.../plugins/document/DocumentStoreStatsMBean.java | 4 +
.../document/cache/CacheChangesTracker.java | 6 -
.../plugins/document/cache/NodeDocumentCache.java | 25 +-
.../plugins/document/mongo/MongoDocumentStore.java | 93 ++++
.../plugins/document/prefetch/CacheWarming.java | 74 +++
.../util/LeaseCheckDocumentStoreWrapper.java | 7 +
.../document/ConcurrentPrefetchAndUpdateIT.java | 157 ++++++
.../plugins/document/CountingDocumentStore.java | 6 +
.../document/DocumentNodeStoreMBeanTest.java | 24 +
.../document/cache/CacheChangesTrackerTest.java | 4 +-
.../document/mongo/MongoTestCollection.java | 4 +-
.../document/prefetch/CacheWarmingTest.java | 228 +++++++++
.../document/prefetch/CountingMongoCollection.java | 134 +++++
.../document/prefetch/CountingMongoDatabase.java | 354 +++++++++++++
.../oak/spi/state/PrefetchNodeStore.java | 23 +-
72 files changed, 2721 insertions(+), 652 deletions(-)