From 38864de3f8fa393953d5d723146b9b1878537b21 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 16 Apr 2026 14:46:06 +0530 Subject: [PATCH 01/15] OAK-12161 : removed guava's cachestats and did the final cleanup --- .DS_Store | Bin 0 -> 22532 bytes .github/.DS_Store | Bin 0 -> 6148 bytes blast-radius-companions.json | 448 ++++ blast-radius-osgi-downstream.json | 1985 +++++++++++++++++ oak-api/.DS_Store | Bin 0 -> 6148 bytes oak-auth-external/.DS_Store | Bin 0 -> 6148 bytes oak-auth-ldap/.DS_Store | Bin 0 -> 6148 bytes oak-authorization-cug/.DS_Store | Bin 0 -> 6148 bytes oak-authorization-principalbased/.DS_Store | Bin 0 -> 6148 bytes oak-benchmarks-elastic/.DS_Store | Bin 0 -> 6148 bytes oak-benchmarks-lucene/.DS_Store | Bin 0 -> 6148 bytes oak-benchmarks/.DS_Store | Bin 0 -> 6148 bytes oak-blob-cloud-azure/.DS_Store | Bin 0 -> 8196 bytes oak-blob-cloud/.DS_Store | Bin 0 -> 10244 bytes oak-blob-cloud/src/.DS_Store | Bin 0 -> 6148 bytes oak-blob-plugins/.DS_Store | Bin 0 -> 6148 bytes .../oak/plugins/blob/CachingBlobStore.java | 9 +- .../oak/plugins/blob/FileCache.java | 4 +- .../blob/datastore/DataStoreBlobStore.java | 9 +- oak-blob/.DS_Store | Bin 0 -> 6148 bytes oak-commons/.DS_Store | Bin 0 -> 6148 bytes oak-core-spi/.DS_Store | Bin 0 -> 6148 bytes .../oak/cache/AbstractCacheStats.java | 14 +- .../jackrabbit/oak/cache/CacheStats.java | 86 - .../oak/cache/EmpiricalWeigher.java | 15 +- .../jackrabbit/oak/cache/api/Cache.java | 2 +- ...eStatsSnapshot.java => CacheCounters.java} | 49 +- ...CacheStatsAdapter.java => CacheStats.java} | 24 +- .../impl/caffeine/CaffeineCacheAdapter.java | 7 +- .../oak/cache/impl/lirs/LirsCacheAdapter.java | 6 +- .../jackrabbit/oak/cache/package-info.java | 2 +- .../oak/cache/AbstractCacheStatsTest.java | 5 +- .../jackrabbit/oak/cache/CacheStatsTest.java | 188 -- ...sSnapshotTest.java => CacheStatsTest.java} | 36 +- .../oak/cache/impl/CacheBuilderTest.java | 8 +- .../caffeine/CaffeineCacheAdapterTest.java | 4 +- .../cache/impl/lirs/LirsCacheAdapterTest.java | 4 +- oak-core/.DS_Store | Bin 0 -> 6148 bytes .../cache/impl/ConsolidatedCacheStats.java | 2 +- .../oak/cache/impl/CacheStatsMetricsTest.java | 6 +- oak-examples/.DS_Store | Bin 0 -> 6148 bytes oak-exercise/.DS_Store | Bin 0 -> 6148 bytes oak-http/.DS_Store | Bin 0 -> 6148 bytes oak-it-osgi/.DS_Store | Bin 0 -> 6148 bytes oak-it/.DS_Store | Bin 0 -> 6148 bytes oak-jackrabbit-api/.DS_Store | Bin 0 -> 6148 bytes oak-jcr/.DS_Store | Bin 0 -> 6148 bytes oak-lucene/.DS_Store | Bin 0 -> 6148 bytes oak-lucene/src/.DS_Store | Bin 0 -> 6148 bytes .../lucene/LuceneIndexProviderService.java | 4 +- oak-pojosr/.DS_Store | Bin 0 -> 6148 bytes oak-query-spi/.DS_Store | Bin 0 -> 6148 bytes oak-run-commons/.DS_Store | Bin 0 -> 6148 bytes .../document/DocumentStoreIndexerBase.java | 4 +- oak-run-elastic/.DS_Store | Bin 0 -> 6148 bytes oak-run/.DS_Store | Bin 0 -> 6148 bytes .../java/org/apache/jackrabbit/oak/.DS_Store | Bin 0 -> 6148 bytes oak-search-elastic/.DS_Store | Bin 0 -> 6148 bytes oak-search/.DS_Store | Bin 0 -> 6148 bytes .../index/search/ExtractedTextCache.java | 8 +- oak-security-spi/.DS_Store | Bin 0 -> 6148 bytes oak-segment-aws/.DS_Store | Bin 0 -> 6148 bytes oak-segment-azure/.DS_Store | Bin 0 -> 6148 bytes oak-segment-remote/.DS_Store | Bin 0 -> 6148 bytes .../RemotePersistentCacheService.java | 7 +- oak-segment-tar/.DS_Store | Bin 0 -> 6148 bytes oak-segment-tar/src/.DS_Store | Bin 0 -> 6148 bytes .../apache/jackrabbit/oak/segment/.DS_Store | Bin 0 -> 6148 bytes .../oak/segment/CachingSegmentReader.java | 6 +- .../jackrabbit/oak/segment/ReaderCache.java | 12 +- .../jackrabbit/oak/segment/RecordCache.java | 14 +- .../oak/segment/RecordCacheStats.java | 8 +- .../jackrabbit/oak/segment/SegmentCache.java | 6 +- .../segment/SegmentNodeStoreRegistrar.java | 13 +- .../oak/segment/WriterCacheManager.java | 30 +- .../oak/segment/file/PriorityCache.java | 6 +- .../persistentcache/SegmentCacheStats.java | 6 +- .../oak/segment/file/PriorityCacheTest.java | 2 +- oak-store-composite/.DS_Store | Bin 0 -> 6148 bytes oak-store-document/.DS_Store | Bin 0 -> 6148 bytes .../oak/plugins/document/DiffCache.java | 3 +- .../plugins/document/DocumentNodeStore.java | 11 +- .../document/DocumentNodeStoreBuilder.java | 10 +- .../document/DocumentNodeStoreService.java | 3 +- .../oak/plugins/document/DocumentStore.java | 4 +- .../plugins/document/JournalDiffLoader.java | 4 +- .../oak/plugins/document/LocalDiffCache.java | 9 +- .../oak/plugins/document/MemoryDiffCache.java | 9 +- .../oak/plugins/document/TieredDiffCache.java | 4 +- .../document/cache/NodeDocumentCache.java | 12 +- .../document/memory/MemoryDocumentStore.java | 4 +- .../document/mongo/MongoDocumentStore.java | 4 +- .../document/persistentCache/NodeCache.java | 4 +- .../document/rdb/RDBDocumentStore.java | 3 +- .../util/LeaseCheckDocumentStoreWrapper.java | 4 +- .../util/LoggingDocumentStoreWrapper.java | 11 +- .../SynchronizingDocumentStoreWrapper.java | 4 +- .../util/ThrottlingDocumentStoreWrapper.java | 3 +- .../util/TimingDocumentStoreWrapper.java | 6 +- .../plugins/document/AmnesiaDiffCache.java | 4 +- .../document/CountingDocumentStore.java | 4 +- .../document/DocumentMKBuilderTest.java | 8 +- .../DocumentNodeStoreBuilderTest.java | 2 +- .../document/DocumentNodeStoreDiffTest.java | 8 +- .../document/DocumentStoreWrapper.java | 4 +- .../plugins/document/LocalDiffCacheTest.java | 16 +- .../plugins/document/MemoryDiffCacheTest.java | 4 +- .../plugins/document/NodeStoreDiffTest.java | 4 +- .../plugins/document/TieredDiffCacheTest.java | 4 +- .../cache/CacheChangesTrackerTest.java | 6 +- .../document/cache/NodeDocumentCacheTest.java | 4 +- oak-store-spi/.DS_Store | Bin 0 -> 6148 bytes oak-upgrade/.DS_Store | Bin 0 -> 6148 bytes specs/guava-cache-removal/TASKS.md | 4 +- 114 files changed, 2691 insertions(+), 532 deletions(-) create mode 100644 .DS_Store create mode 100644 .github/.DS_Store create mode 100644 blast-radius-companions.json create mode 100644 blast-radius-osgi-downstream.json create mode 100644 oak-api/.DS_Store create mode 100644 oak-auth-external/.DS_Store create mode 100644 oak-auth-ldap/.DS_Store create mode 100644 oak-authorization-cug/.DS_Store create mode 100644 oak-authorization-principalbased/.DS_Store create mode 100644 oak-benchmarks-elastic/.DS_Store create mode 100644 oak-benchmarks-lucene/.DS_Store create mode 100644 oak-benchmarks/.DS_Store create mode 100644 oak-blob-cloud-azure/.DS_Store create mode 100644 oak-blob-cloud/.DS_Store create mode 100644 oak-blob-cloud/src/.DS_Store create mode 100644 oak-blob-plugins/.DS_Store create mode 100644 oak-blob/.DS_Store create mode 100644 oak-commons/.DS_Store create mode 100644 oak-core-spi/.DS_Store delete mode 100644 oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java rename oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/{CacheStatsSnapshot.java => CacheCounters.java} (69%) rename oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/{CacheStatsAdapter.java => CacheStats.java} (69%) delete mode 100644 oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java rename oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/{CacheStatsSnapshotTest.java => CacheStatsTest.java} (78%) create mode 100644 oak-core/.DS_Store create mode 100644 oak-examples/.DS_Store create mode 100644 oak-exercise/.DS_Store create mode 100644 oak-http/.DS_Store create mode 100644 oak-it-osgi/.DS_Store create mode 100644 oak-it/.DS_Store create mode 100644 oak-jackrabbit-api/.DS_Store create mode 100644 oak-jcr/.DS_Store create mode 100644 oak-lucene/.DS_Store create mode 100644 oak-lucene/src/.DS_Store create mode 100644 oak-pojosr/.DS_Store create mode 100644 oak-query-spi/.DS_Store create mode 100644 oak-run-commons/.DS_Store create mode 100644 oak-run-elastic/.DS_Store create mode 100644 oak-run/.DS_Store create mode 100644 oak-run/src/main/java/org/apache/jackrabbit/oak/.DS_Store create mode 100644 oak-search-elastic/.DS_Store create mode 100644 oak-search/.DS_Store create mode 100644 oak-security-spi/.DS_Store create mode 100644 oak-segment-aws/.DS_Store create mode 100644 oak-segment-azure/.DS_Store create mode 100644 oak-segment-remote/.DS_Store create mode 100644 oak-segment-tar/.DS_Store create mode 100644 oak-segment-tar/src/.DS_Store create mode 100644 oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/.DS_Store create mode 100644 oak-store-composite/.DS_Store create mode 100644 oak-store-document/.DS_Store create mode 100644 oak-store-spi/.DS_Store create mode 100644 oak-upgrade/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..2dedeb507df86cd8acbe0afa6cc65ddbc1de42b3 GIT binary patch literal 22532 zcmeHPeT-aH6~Aw0_G5Op?d(UpP(GY=!$*ZJ+e#=2Xoqc~U4?e-7Hs+2otd4^PCGMi zn3>(uHjo7+0SyX9i62obCI+-3G%r#0$1-3e0Exz{5+E)%;1lPa|kf&^?;i@b$rJ0oz zX|qs*--NgecoU)>UW@8-W#ACY%RmWeA8U}#XNi{a%t@ki?#TM5YvuIRb!%mSb_ME~ zV`VKI!LmA}EMB#a76UB?S`4%pct0`#b2lEH-PXDF-eRD|K#PGo1Lz;(@WOMVcAmG+ z(sjTaE}`*vTtdqOuH||b&T;$#&WYN2-a5lKa2S>5(8;qq;;q;(oQ=aBec~kYEKxI;T<;$yJIEp-tz9*n2WvXrTCB;-=ZJV#=wHa$2`=HXy5813u17A3| z*Jd%^quO#BXVfRS+F*=bGjvB^djF;{&mA%WMZ2W8WWr__C`;>!V8Vq?XhRD0?$Y)_JWnpYdzoVhX zH8Dl)qQwyR-*%n5eTw$0|EQ?B+QlwK>MzYu4jx979nwz}#0qge^!z+WXPly;i;B(S zVrc1g;xag|0F7x)1J}Nkk6x*9snnW)_hGS7Y!X}GY6A4DP-<1Pfa^qRp-tX<%)r>x zR+Qn#AZPR>>2XAo@of}t2BhRy%JJ08-^so4a_#;q_G?)Z<+ZT{8laY%i`?J@fx3ZlcPvuACF!D zNb5Ez#_^3$?yqH4$nQ3~M!!>By>A}`(~?D5KiGXSD^k3cp^#QfWRpnKx(adLSDf}} zjSpS;OI2gd4jqN=QndC$OkwT2>h;M%y^7Yn#W7$%WG&JLIyt$r)K`;_xl1yn;V#_i zLhMkK1CILpQxjU^bm@ZS;L0;uT@7+bLJ1%EmRy$ySx+*iUe;^<)*u}2g@ zqo~Qo;QZj2U&H~Z zDfRg=;GhVvJb0Tua`ig{KD-PqjvlC_&uF+x5i7_z>;c^h{KNP&C9O1^2?fmaOm7f; z)(mK+fs;wl$EYj|pQqsyuENm=Si5;vz^_`?5a(59Eh^TEOQCL;!_3-vUR|c)UIZGO zBu|^g7C>&{P@96C4?C!i~V#eGxQB787E2GKsRrqO(Y35VvI+?m6m)SKL8(3== ztI1q3Q1*w;w(Kr}%z*ucG`GH-$rPo%P20CuGS#i*dfQ}d zQ6*hA^Z9YJlB?#-;JuVQy435H=)EipnOvaf2v%ODOcd^(Al~zSuQ7w+05wf zYx2odCcmjTYF4Xe0VUB|+ANNjGiYgR4z3Z)&>HEcgcwSE%;I+_ai(<<6GMve&H;5* zI~zj>O9^?srDzs2(dbZOy!KP4I15I{W#S4LZF|I>;%nkw@rd}D_?>uNylHe8CmPF) zvy5|%4;yQY4aS&prI9vfjGVE<(hsRd$8kpvqXHjX8=d;Tw*Egp=p{>iVdSa1|Msch z$W?}`ZR#6?$Wve0HV{V)uC}$i7=3cCKtF{eJ_Y|Uca7s6<2sy)9BZ`52VkJkyBgi% zqu|eqAfJPGT;1i+!|_?ffR#J*YTe+|#=uXZKgYFy!}UI9L77$;NMnRxX*Sk@tRT~| zb|G3jE@7V{uNP*=yrgM6i_o(-fwX3iwyxNBp^88qQuZp#U5d7(h$Nsek~voUU2(T2 zL`Lvlwq`dC5#+ZRB0H1oYJs8bd*R!`%B9HHJb90bMgx>bdw6r2jG@7UP*IYFu<_+# zu7w$lGlM;sF=J;59GZ-gZfJAQawrq?fBCLr!oxmgAeaV2-ZO&87uUwAy%)OCUSiB! zWi=*l*O+L+5@V+Q;nmI6gEBRB_sfc@Cd#MG9i0WnWaktB5bt_dw#F}HQCUxW*Y+9f zU6VgJ7Img=L3WZOAIJXq5SV<|EU=dADPb)a*2h3f&O*5IF2L9?!+fO0*_fwgt>URm z88>$9ztyiS%H~@;BWm}8XBo6F2i2h*80J2xmRRD&0nFxXcR%l`GUoX@iFul`ML81U zC5R}Ss|)3IuRhevCJaw?1|^4f+*ung_3%mOV~e>Bwl1GTMYC#%H+w zlg-tGviaB-+7+8klux-lItz?R>)yBhR0_t>rk*dt9T9@^<&bBrbVP3fd4~+ee)}0I zwF+w>XRpJ&#sC-&*8myY&=ccP1<5BZJ)VQ)dPwYymXA@8T#u2XFkrlc z_Ut%EB=d9>k*gj<7X99Dy~>~ngFMepkp_`xEk~b!$IP?bKc=C?92`YyXN;vZ!?x{E z0i-nvisuO@`IEU5+h# z{#ExdE4V)5JxxA;Lu>D%#c&wehX99*Bt>-3ONSLAS7{rYzcfP`l0D4c=Zm|1oOf<< z--eDEcTG~vfow1aA~!w(3Q>`Qd>e}oytIN3Rh(mSBe7OUd(w>WuPuNga z?0Hj4GyLbw{Mc!aBE9mavsBA#cIYT{mtwWQAc3{FpX_tZHRDR3wQNHjhUB&-n5%0j zNAW!H#cwD)F0yt@`N=YD_ddn3;a@kxJyGy%7$2$fxfR+zc0Gs=!zP}1g<&Id6x*sV zFH^m;p-tLiezFXka9}fGe+52iq4m8mtl3@KtpxHl9fmD*gtr@!qu3Vp{mI#GOxA8U zKUsz?B7LlVNBcU6K5_1JdCpPp5}~ct^;|{5Oy2qOhrcDyH|FhkW zt2}S!`0jQ**6}~?o`GY$8{RI4)DrB3rhor0LH-7y6l}e<7-%tY{4roe)=jJ%1zd&; zwh(+Dhu0Lm@IbkFynq9)@n<~CKg9zdI^pA1{0{%^(qnEPef2)crMf5iX)1u&iHg8%>k literal 0 HcmV?d00001 diff --git a/.github/.DS_Store b/.github/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..7a732361cfbaf8a6a8ee9135abdfedae3b253432 GIT binary patch literal 6148 zcmeHKQA)!=5S^_BQ~c?tA0m5&9za-2JVC$w5Tq?yF(JV!#lM`wD~KoY3gQVof}g(G znbyQa@k>-@VD@chXLctqA(J5@H@=yVh=xRzKpA@j3?0JjtS#xOg%@4iqoiwEX6K{H ztY~?g;WskC&u*KRG@~oJpxX1x%UZf0Jn|wcuNp=KnGzN?TV_?Goe;+)QF(_7o@za4JwgA9B%uz7sUV>x1Vox@t3Y1W% zEryeD*uDA%#Y#}Z$!YW9^kkXm~YwPB?)_UkEl!g5&!A%Gzu@u9XOYtr=3hbUIz@S(O!UC}$fk=Z5 J#=ws<@CGC$RY3p% literal 0 HcmV?d00001 diff --git a/blast-radius-companions.json b/blast-radius-companions.json new file mode 100644 index 00000000000..af6cdc6b0bb --- /dev/null +++ b/blast-radius-companions.json @@ -0,0 +1,448 @@ +{ + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java": [], + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java": [], + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java": [ + "_companion_repos/com.adobe.granite.repository/src/test/java/com/adobe/granite/repository/impl/GraniteInstallTest.java", + "_companion_repos/oak-repository-service/client/src/test/java/org/apache/jackrabbit/oak/jcr/AddBinaryPropertyTest.java", + "_companion_repos/oak-repository-service/service-jcr-tests/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryServiceStub.java", + "_companion_repos/oak-repository-service/service-quarkus-tests/src/main/java/org/apache/jackrabbit/repositoryservice/testing/LongevityTestExecutor.java", + "_companion_repos/oak-repository-service/service-quarkus-tests/src/main/java/org/apache/jackrabbit/repositoryservice/testing/NodeStoreProvider.java", + "_companion_repos/oak-repository-service/service-quarkus/src/main/java/org/apache/jackrabbit/repositoryservice/remote/service/rest/BlobStoreProvider.java", + "_companion_repos/oak-repository-service/service-quarkus/src/main/java/org/apache/jackrabbit/repositoryservice/remote/service/rest/RepositoryService.java", + "_companion_repos/oak-repository-service/service-quarkus/src/test/java/org/apache/jackrabbit/repositoryservice/remote/service/ArchiveCloseTest.java", + "_companion_repos/oak-repository-service/service-quarkus/src/test/java/org/apache/jackrabbit/repositoryservice/remote/service/SegmentQueueBackpressureTest.java", + "_companion_repos/oak-repository-service/service-quarkus/src/test/java/org/apache/jackrabbit/repositoryservice/remote/service/aeron/TestRepositoryService.java", + "_companion_repos/oak-repository-service/service-quarkus/src/test/java/org/apache/jackrabbit/repositoryservice/remote/service/aeron/support/ResourcesManager.java", + "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/AzureBlobStoreProvider.java", + "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RepositoryServiceRemoteService.java", + "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/DurableRepositoryServiceRemoteServiceInitializationRetriesTest.java", + "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RemoteRepositoryTest.java", + "_companion_repos/oak-repository-service/store-tools/src/main/java/com/adobe/granite/pike/tool/Main.java", + "_companion_repos/oak-repository-service/store-tools/src/main/java/com/adobe/granite/pike/tool/commands/InitCmd.java", + "_companion_repos/oak-repository-service/store-tools/src/test/java/com/adobe/granite/pike/tool/commands/InitCmdTest.java", + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializer.java", + "oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java", + "oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreStatsTest.java", + "oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java", + "oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreUtils.java", + "oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferenceBinaryIT.java", + "oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java", + "oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneWritesOnSegmentStatsTest.java", + "oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java", + "oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java", + "oak-segment-aws/src/test/java/org/apache/jackrabbit/oak/segment/spi/persistence/split/SplitPersistenceBlobTest.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobIT.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ReadOnlyStoreBlobReferencesTest.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java" + ], + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java": [ + "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetrics.java", + "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RemoteRepository.java", + "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RepositoryServiceRemoteService.java", + "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetricsTest.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCacheTest.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCacheTest.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/PersistentCacheStatsTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java" + ], + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java": [ + "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetricsTest.java", + "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetrics.java", + "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RepositoryServiceRemoteService.java", + "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RemoteRepository.java", + "_companion_repos/oak-repository-service/service-quarkus/src/test/java/org/apache/jackrabbit/repositoryservice/remote/service/ArchiveCloseTest.java", + "_companion_repos/oak-repository-service/service-quarkus/src/test/java/org/apache/jackrabbit/repositoryservice/remote/service/SegmentQueueBackpressureTest.java", + "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RemoteRepositoryTest.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java" + ], + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/EmpiricalWeigherTest.java" + ], + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java": [], + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java" + ], + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java": [ + "oak-blob-cloud/pom.xml", + "oak-core-spi/pom.xml", + "oak-lucene/pom.xml" + ], + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java": [], + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java": [ + "_companion_repos/oak-repository-service/oakrs-online-migration-bundle/pom.xml", + "oak-core-spi/pom.xml", + "oak-lucene/pom.xml" + ], + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java": [], + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java": [], + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java": [], + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java": [], + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java": [ + "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetrics.java", + "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetricsTest.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCacheTest.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java" + ], + "oak-it-osgi/test-bundles.xml": [], + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java": [], + "oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java": [], + "oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java": [ + "_companion_repos/aem-sites-dataplane/bundles/dataplane/src/test/java/com/adobe/aem/wcm/dataplane/backend/impl/builder/sql2/OakLuceneQueryIndexTest.java", + "oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCacheTest.java", + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java", + "oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java", + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java", + "oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexImporterSupport.java", + "oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticOutOfBandIndexer.java", + "oak-run/src/main/java/org/apache/jackrabbit/oak/index/ExtendedIndexHelper.java", + "oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticReindexTest.java", + "oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestRepositoryBuilder.java", + "oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFacetSearchTest.java", + "oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithGlobalIndexSearchTest.java", + "oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithoutGlobalIndexSearchTest.java", + "oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTIndexedContentAvailability.java", + "oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTSeparatedIndexedContentAvailability.java", + "oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyTextSearchTest.java", + "oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java" + ], + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java": [ + "_companion_repos/oak-repository-service/client/pom.xml", + "_companion_repos/oak-repository-service/server/src/main/java/org/apache/jackrabbit/oak/segment/aeron/AeronSegmentWriter.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java" + ], + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java": [ + "_companion_repos/oak-repository-service/client/pom.xml" + ], + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java": [ + "_companion_repos/oak-repository-service/client/pom.xml" + ], + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java": [ + "_companion_repos/oak-repository-service/client/pom.xml", + "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetrics.java", + "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetricsTest.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCacheTest.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java" + ], + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java": [ + "_companion_repos/oak-repository-service/client-bundle/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/client/osgi/RemoteNodeStoreService.java", + "_companion_repos/oak-repository-service/client/pom.xml", + "_companion_repos/oak-repository-service/client/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/client/RemoteNodeStoreBuilder.java" + ], + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java": [ + "_companion_repos/oak-repository-service/client/pom.xml", + "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/OverlayWriterCacheManager.java", + "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/OverlayWriterCacheManagerTest.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java" + ], + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java": [ + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ConcurrentPriorityCacheTest.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java" + ], + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java": [ + "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetrics.java", + "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetricsTest.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCacheTest.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java" + ], + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java": [], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java": [ + "_companion_repos/com.adobe.granite.repository/src/test/java/com/adobe/granite/repository/impl/GraniteInstallTest.java", + "_companion_repos/com.adobe.granite.repository/src/test/java/com/adobe/granite/repository/impl/hc/PanicOnLeaseFailureTest.java", + "_companion_repos/oak-repository-service/oakrs-online-migration-bundle/src/test/java/org/apache/jackrabbit/oak/repositoryservice/migration/MigrationNodeStoreCrossStoreTest.java", + "_companion_repos/oak-repository-service/oakrs-online-migration-bundle/src/test/java/org/apache/jackrabbit/oak/repositoryservice/migration/MigrationNodeStoreObserverTest.java", + "_companion_repos/oak-repository-service/oakrs-online-migration-bundle/src/test/java/org/apache/jackrabbit/oak/repositoryservice/migration/MigrationNodeStoreTest.java", + "_companion_repos/oak-repository-service/oakrs-online-migration-bundle/src/test/java/org/apache/jackrabbit/oak/repositoryservice/migration/osgi/MigrationNodeStoreServiceTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java": [ + "_companion_repos/oak-repository-service/oakrs-online-migration-bundle/src/test/java/org/apache/jackrabbit/oak/repositoryservice/migration/osgi/MigrationNodeStoreServiceTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java": [ + "_companion_repos/com.adobe.granite.maintenance.oak/src/test/java/com/adobe/granite/maintenance/crx/impl/DocumentNodeStoreRGCTest.java", + "_companion_repos/com.adobe.granite.maintenance.oak/src/test/java/com/adobe/granite/repository/hc/impl/ContinuousRGCHealthCheckTest.java", + "_companion_repos/com.adobe.granite.operations.ui.core/src/main/java/com/adobe/granite/operations/ui/core/internal/reporters/NodeDataStoreReporter.java", + "_companion_repos/com.adobe.granite.operations.ui.core/src/test/java/com/adobe/granite/operations/ui/core/internal/reporters/NodeDataStoreReporterTest.java", + "_companion_repos/com.adobe.granite.repository/src/test/java/com/adobe/granite/repository/impl/hc/MongoDBDiskFullPanicTest.java", + "_companion_repos/com.adobe.granite.repository/src/test/java/com/adobe/granite/repository/impl/hc/PanicOnLeaseFailureTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java": [ + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java": [ + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheCompatibilityTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java": [ + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java": [ + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java": [ + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" + ], + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" + ], + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java": [ + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" + ], + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" + ], + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java": [], + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java": [], + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java": [], + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" + ], + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java": [], + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java": [], + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java": [], + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java": [], + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java": [], + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java": [], + "specs/guava-cache-removal/TASKS.md": [] +} diff --git a/blast-radius-osgi-downstream.json b/blast-radius-osgi-downstream.json new file mode 100644 index 00000000000..450971ea9c6 --- /dev/null +++ b/blast-radius-osgi-downstream.json @@ -0,0 +1,1985 @@ +{ + "schema_version": 2, + "total_downstream": 32, + "generated_at": "2026-08-23T08:46:07.558Z", + "downstream": { + "https://github.com/Adobe-AEM-CPSS/oak-repository-service": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.api", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.api", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-blob-plugins", + "exported_package": "org.apache.jackrabbit.oak.plugins.blob", + "changed_files": [ + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java", + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-blob-plugins", + "exported_package": "org.apache.jackrabbit.oak.plugins.blob", + "changed_files": [ + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java", + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-blob-plugins", + "exported_package": "org.apache.jackrabbit.oak.plugins.blob.datastore", + "changed_files": [ + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-blob-plugins", + "exported_package": "org.apache.jackrabbit.oak.plugins.blob.datastore", + "changed_files": [ + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.cache", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.memory", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.mongo", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.rdb", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.util", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.file", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.file", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" + ], + "dependency_type": "compile" + } + ] + }, + "https://git.corp.adobe.com/CQ/dam": { + "skipped": true, + "reason": "Command failed: git clone --bare --depth 1 https://git.corp.adobe.com/CQ/dam /Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/dam.git\nCloning into bare repository '/Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/dam.git'...\nerror: RPC failed; curl 56 Recv failure: Connection reset by peer\nerror: 28 bytes of body are still expected\nfatal: expected flush after ref listing\n", + "entries": [ + { + "importing_bundle": "com.adobe.cq.dam.cq-dam-processor-nui", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.adobe.cq.dam.cq-dam-processor-nui", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "cq-dam-repository-insights-agent", + "exporting_bundle": "org.apache.jackrabbit.oak-blob-plugins", + "exported_package": "org.apache.jackrabbit.oak.plugins.blob", + "changed_files": [ + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java", + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "cq-dam-repository-insights-agent", + "exporting_bundle": "org.apache.jackrabbit.oak-blob-plugins", + "exported_package": "org.apache.jackrabbit.oak.plugins.blob.datastore", + "changed_files": [ + "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.day.cq.dam.cq-dam-similaritysearch", + "exporting_bundle": "org.apache.jackrabbit.oak-lucene", + "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", + "changed_files": [ + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "cq-dam-repository-insights-agent", + "exporting_bundle": "org.apache.jackrabbit.oak-lucene", + "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", + "changed_files": [ + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "cq-dam-repository-insights-agent", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "cq-dam-repository-insights-agent", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "cq-dam-repository-insights-agent", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.file", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "cq-dam-repository-insights-agent", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" + ], + "dependency_type": "test" + } + ] + }, + "https://git.corp.adobe.com/CQ/asset-metadata-restriction-provider": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.cq.dam.asset-metadata-restriction-provider", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.cq.dam.asset-metadata-restriction-provider", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.api", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.cq.dam.asset-metadata-restriction-provider", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.cq.dam.asset-metadata-restriction-provider", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.cq.dam.asset-metadata-restriction-provider", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" + ], + "dependency_type": "compile" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.maintenance.oak": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.granite.maintenance.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.maintenance.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.api", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.maintenance.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.maintenance.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.maintenance.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.maintenance.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.maintenance.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.cache", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.maintenance.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.memory", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.maintenance.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.mongo", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.maintenance.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.rdb", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.maintenance.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.util", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.maintenance.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-lucene", + "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", + "changed_files": [ + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" + ], + "dependency_type": "compile" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.repository": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.api", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.cache", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.memory", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.mongo", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.rdb", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.util", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-lucene", + "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", + "changed_files": [ + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.file", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" + ], + "dependency_type": "compile" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.security.user": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.granite.security.user", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.security.user", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.api", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.security.user", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.security.user", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.security.user", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" + ], + "dependency_type": "compile" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.auth.authhandler": { + "skipped": true, + "reason": "Command failed: git --git-dir /Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/Granite/com.adobe.granite.auth.authhandler.git fetch --prune --depth 1 origin\nerror: RPC failed; curl 56 Recv failure: Connection reset by peer\nerror: 57 bytes of body are still expected\nfatal: expected flush after ref listing\n", + "entries": [ + { + "importing_bundle": "com.day.cq.cq-authhandler", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.cq-authhandler", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.api", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.cq-authhandler", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.cq-authhandler", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.cq-authhandler", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" + ], + "dependency_type": "compile" + } + ] + }, + "https://github.com/apache/sling-org-apache-sling-discovery-commons": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "org.apache.sling.discovery.commons", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "org.apache.sling.discovery.commons", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.api", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "org.apache.sling.discovery.commons", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "org.apache.sling.discovery.commons", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "org.apache.sling.discovery.commons", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", + "changed_files": [ + "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" + ], + "dependency_type": "provided" + } + ] + }, + "https://github.com/Adobe-AEM-Foundation/com.adobe.granite.workflow.console": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.granite.workflow.console", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.workflow.console", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.workflow.console", + "exporting_bundle": "org.apache.jackrabbit.oak-lucene", + "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", + "changed_files": [ + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" + ], + "dependency_type": "compile" + } + ] + }, + "https://git.corp.adobe.com/CQ/integration-analytics": { + "skipped": true, + "reason": "Command failed: git clone --bare --depth 1 https://git.corp.adobe.com/CQ/integration-analytics /Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/integration-analytics.git\nCloning into bare repository '/Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/integration-analytics.git'...\nerror: RPC failed; curl 56 Recv failure: Connection reset by peer\nerror: 13658 bytes of body are still expected\nfetch-pack: unexpected disconnect while reading sideband packet\nfatal: early EOF\nfatal: fetch-pack: invalid index-pack output\n", + "entries": [ + { + "importing_bundle": "com.adobe.cq.cq-analytics-integration", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "com.adobe.cq.cq-analytics-integration", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "com.adobe.cq.cq-analytics-integration", + "exporting_bundle": "org.apache.jackrabbit.oak-lucene", + "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", + "changed_files": [ + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" + ], + "dependency_type": "provided" + } + ] + }, + "https://git.corp.adobe.com/CQ/integration-target": { + "skipped": true, + "reason": "Command failed: git --git-dir /Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/integration-target.git fetch --prune --depth 1 origin\nfatal: unable to access 'https://git.corp.adobe.com/CQ/integration-target/': Recv failure: Connection reset by peer\n", + "entries": [ + { + "importing_bundle": "com.adobe.cq.cq-target-integration", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "com.adobe.cq.cq-target-integration", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "com.adobe.cq.cq-target-integration", + "exporting_bundle": "org.apache.jackrabbit.oak-lucene", + "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", + "changed_files": [ + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" + ], + "dependency_type": "provided" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.crypto.keystore": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.granite.crypto.keystore", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.adobe.granite.crypto.keystore", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.adobe.granite.crypto.keystore", + "exporting_bundle": "org.apache.jackrabbit.oak-lucene", + "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", + "changed_files": [ + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.adobe.granite.crypto.keystore", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.adobe.granite.crypto.keystore", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.adobe.granite.crypto.keystore", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.file", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.adobe.granite.crypto.keystore", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" + ], + "dependency_type": "test" + } + ] + }, + "https://github.com/Adobe-AEM-Foundation/com.adobe.granite.repository.indexdefs": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.granite.repository.indexdefs", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository.indexdefs", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.repository.indexdefs", + "exporting_bundle": "org.apache.jackrabbit.oak-lucene", + "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", + "changed_files": [ + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" + ], + "dependency_type": "compile" + } + ] + }, + "https://github.com/Adobe-AEM-Sites/msm": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.day.cq.wcm.cq-msm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-msm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-msm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-lucene", + "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", + "changed_files": [ + "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-msm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-msm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-msm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.file", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-msm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" + ], + "dependency_type": "test" + } + ] + }, + "https://git.corp.adobe.com/CQ/wcm": { + "skipped": true, + "reason": "Command failed: git clone --bare --depth 1 https://git.corp.adobe.com/CQ/wcm /Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/wcm.git\nCloning into bare repository '/Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/wcm.git'...\nerror: RPC failed; curl 56 Recv failure: Connection reset by peer\nerror: 84 bytes of body are still expected\nfatal: expected flush after ref listing\n", + "entries": [ + { + "importing_bundle": "com.day.cq.wcm.cq-wcm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-wcm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-wcm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-wcm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.cache", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java", + "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-wcm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.memory", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-wcm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.mongo", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-wcm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.rdb", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-wcm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-store-document", + "exported_package": "org.apache.jackrabbit.oak.plugins.document.util", + "changed_files": [ + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", + "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-wcm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-wcm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-wcm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.file", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", + "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.day.cq.wcm.cq-wcm-core", + "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", + "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", + "changed_files": [ + "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" + ], + "dependency_type": "compile" + } + ] + }, + "https://github.com/OneAdobe/aem-sites-dataplane": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.aem.sites-dataplane", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "com.adobe.aem.sites-dataplane", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + } + ] + }, + "https://github.com/Adobe-AEM-Sites/aem-sites-eventing": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.aem.sites-eventing", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.adobe.aem.sites-eventing", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + } + ] + }, + "https://git.corp.adobe.com/CQ/dam-delivery": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.cq.dam.cq-scene7-imaging", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.cq.dam.cq-scene7-imaging", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + } + ] + }, + "https://git.corp.adobe.com/CQ/unified-shell-integration": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.cq.unifiedshell.unified-shell-integration", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.cq.unifiedshell.unified-shell-integration", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.auth.saml": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.granite.auth.saml", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "com.adobe.granite.auth.saml", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.auth.saml.hooks.migration": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.granite.auth.saml.migration", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "com.adobe.granite.auth.saml.migration", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.auth.sso": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.granite.auth.sso", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "com.adobe.granite.auth.sso", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.oauth.server": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.granite.oauth.server", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "com.adobe.granite.oauth.server", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.operations.ui.core": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.granite.operations.ui.core", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + }, + { + "importing_bundle": "com.adobe.granite.operations.ui.core", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "compile" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.repository.hc.impl": { + "skipped": true, + "reason": "Command failed: git clone --bare --depth 1 https://git.corp.adobe.com/Granite/com.adobe.granite.repository.hc.impl /Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/Granite/com.adobe.granite.repository.hc.impl.git\nCloning into bare repository '/Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/Granite/com.adobe.granite.repository.hc.impl.git'...\nerror: RPC failed; curl 56 Recv failure: Connection reset by peer\nfatal: expected flush after ref listing\n", + "entries": [ + { + "importing_bundle": "com.adobe.granite.repository.hc.impl", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "com.adobe.granite.repository.hc.impl", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.security.ui": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.adobe.granite.security.ui", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "com.adobe.granite.security.ui", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.replication.core": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.day.cq.cq-replication", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.day.cq.cq-replication", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + } + ] + }, + "https://git.corp.adobe.com/CQ/reporting": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.day.cq.cq-reporting", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "com.day.cq.cq-reporting", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + } + ] + }, + "https://git.corp.adobe.com/Granite/com.adobe.granite.crx-auth-token": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "com.day.crx.sling.crx-auth-token", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "com.day.crx.sling.crx-auth-token", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + } + ] + }, + "https://github.com/apache/sling-org-apache-sling-discovery-oak": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "org.apache.sling.discovery.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "org.apache.sling.discovery.oak", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + } + ] + }, + "https://github.com/apache/sling-org-apache-sling-jcr-repoinit": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "org.apache.sling.jcr.repoinit", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + }, + { + "importing_bundle": "org.apache.sling.jcr.repoinit", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "provided" + } + ] + }, + "https://github.com/apache/sling-org-apache-sling-jcr-resource": { + "skipped": false, + "reason": null, + "entries": [ + { + "importing_bundle": "org.apache.sling.jcr.resource", + "exporting_bundle": "org.apache.jackrabbit.oak-core", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + }, + { + "importing_bundle": "org.apache.sling.jcr.resource", + "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", + "exported_package": "org.apache.jackrabbit.oak.cache.impl", + "changed_files": [ + "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", + "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", + "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" + ], + "dependency_type": "test" + } + ] + } + } +} \ No newline at end of file diff --git a/oak-api/.DS_Store b/oak-api/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ee6a87a7a53ba9976a5adb29ba9aae5711e8224b GIT binary patch literal 6148 zcmeHKy-ve05I&Qtio{Z}!01Py3kwoTqp+~{1)wb|L!(qscE1NBE3big4aCUC8}Oa) zN@E%r5rR9({_OklIiD2UM?|i?oehZwM3kd3Iv#Wgt2<3Q>dZ#RYYfNJrd~$v+NLhQ z7I^O&-Ox2n7xVW1?;bXmx~ZzkqM1OGk51m|`kZaqeV|y4mdDE1zT^{X^b|i7{Xd7z4(@|6~AnHcP%MXuUCD z3>X6+4Dk8j(HINGAQ+Dhbn%%F>_Hs`W3DAQ#w!+zK@b**lTe_9IxR7rghTJuuTTtv z5>8GF45yjb#fyvCvA&P)|JjVZXow2*$}H024k(4x&-)p2zSj6oVkI!ul8vw1+?>#5!Z(2N-w< Dz^Fx` literal 0 HcmV?d00001 diff --git a/oak-auth-external/.DS_Store b/oak-auth-external/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..fd2d5379c3ea46f83bf72b8c2e0f3241685639f6 GIT binary patch literal 6148 zcmeHKJ5B>J5FKwKv=S5%4OGZih^Xi`(Q<-ZAS6Md$Z8`9y)Qt+0T2=$_drM-15r_O z0^WEA;)R70A()ZuXV1suebU+!rGRyc?v}**DhZNwVtB7-6(QD>_2P zIUUm~&6@2EEP+g7N4;7fS$O7wRY&b1lI!Ua?RNg0MiGgaRehX^G(^9D1*Q zg<=qtaB^CFIL-W4yttSh>-*?Vt`M}|7%&E!40L4L z9F;?Sl-{kMK9BEOk2XeQVZXow2*!;^0498n>_(&5J&)m6C0fwv~Ef% literal 0 HcmV?d00001 diff --git a/oak-auth-ldap/.DS_Store b/oak-auth-ldap/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a9dc642111758d4ca8c97ff76c2468573086e81f GIT binary patch literal 6148 zcmeHKJ5B>J5S<|rib#`^(g&a*H&~+03Bm!$2ZbW5jUb3B(iU_agNx80S_)1;NlQh? z8_z)2uuvidGm`!6`FOlfTH8ZJJUE~AiF!oTK@(&dG>E7hORg!t@vQe{8qeh%#QU#bSKUfy>|wjfs}!kPJ43y5An-17Wrw2&zu2g;EyrD?R=CE z@KJWRe)>GQYXjO5nuz#SGJs&5JOVJ0b7VIf)gELFzs#^wlvP9@!-4(~h=h3O4Ez8C EuRqO8P5=M^ literal 0 HcmV?d00001 diff --git a/oak-authorization-cug/.DS_Store b/oak-authorization-cug/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..62ffc5781d2291ee0f820b49d21df62e419a1a4b GIT binary patch literal 6148 zcmeHKy-ve05I)nYiqxeeqhVz08-yxZSUV#@TU3Tdsi45>1qq4A;8_sw!N|;v_|A9G zmKdE(khj;dbo;5(mW9|r*`OpF0zz!)$Fwv++f*(_OK&}L)67%&Dt z8Q}B5V=(55K`_Qy{YwjgD#w+HEK@b**lTe_9I&CqWghTJuFINnL5>8H= z52uwsnim(VBfpRCyQhK*; zydK}R9^(Xqh5Z6AAXq0q0eIkZWH%bc?s*NrTrmi87S_jbp#2C$LToYyeu05^lSD~T literal 0 HcmV?d00001 diff --git a/oak-authorization-principalbased/.DS_Store b/oak-authorization-principalbased/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..015179e11489d8ca485f57de8316aadc77ff1071 GIT binary patch literal 6148 zcmeHKJ5B>J5FIBGS^-5$O4n3LO|wKBE|7{2l0~7&Y9k1}PrxNO0tF{PoC8Yw^t|y5 zWK9-IgkVOppFJOs_epDeh{%m@${|soh%z)r$AcDOb*rhP&TMqN#&9yLt7X*gs_nM} z@4ZXcbVakpyt)6w=Z&SRi(_HUIbF~y z$vU`y_-t?HKIyD)$FEPEJ6WTuH#_*sC)vl*fcIfy3>X8(fHCkt8Ni**lI;mvZwwd% z#=r*yd_H(I##}K7#-jsWECGN$sH0%awFJj_#auB6!UAy;3Y1W%C5Dr5=)L;oia}7q z$!YQ7H1m7$;$n8J@1r}pT+n)Bz!*pw=*qOu_x~8bOly&!hSqg Cyh$kl literal 0 HcmV?d00001 diff --git a/oak-benchmarks-elastic/.DS_Store b/oak-benchmarks-elastic/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d6f557169add0065225dc103db58653a4c914068 GIT binary patch literal 6148 zcmeHKJ5Iwu5S<|rN|YvalzWBTz(h_%Ng65yNl;S6as;8bxC9Nypn(g}atwqx03~mB z2C@c2i4e?4yKg<;^^?5oAtD}L%mze#BI;lWvMd@z)QzSsa~2~@j=^|Z7ORF7zgH!D zZ_zoO(R4Xa_kVM+u@q&VPnP8bnojTXdGYdizn5BP-&j|RBr6Am(KfB=1Qq9WO6#<0 z_x9@Wqdl#Cw7+vbdWyAcIf`<#gRgwjeRS_0WFIchfHU9>I0OHa0o>Ulot~o4&VV!E z47@WS=R?2{%nU2VcywTjEda0$brh_nmynoXm>E`zus~Qtff~xzVz7ooAIvW^tQ0kz z*qRTv%5TjJ$Lh!*qC0V>=(9864AdED>0@8+{}Dc!#wNcW;!nQ?iK86GRM<5d7lQZxG47>uM C(n*#8 literal 0 HcmV?d00001 diff --git a/oak-benchmarks-lucene/.DS_Store b/oak-benchmarks-lucene/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c7a0ed2dad2cf6585bea46b7ddb6e09cd9adc32d GIT binary patch literal 6148 zcmeHKJ5B>J5FL{hS&1ekrLT}1EYao!X{b<0f)b>xHcA5Z9)q3>a0i6A1r-INpr+)F zXF|MWp+tzxNcOYm z`Ln=#Z_$dDG@ei6{XgAqEk&8n2jBU``)FSec^@XmfH7bU7z6vs0Pbv-^hnTp zW55_N20j_!^TDGrW{Q1 zyoZm{yLIRD_^$P6Lo^olt9Ssxxb_IZgwK)VU=+LOG5j*cN|0A!eFz8ILm&`hoiXqW G4155z6-@R3 literal 0 HcmV?d00001 diff --git a/oak-benchmarks/.DS_Store b/oak-benchmarks/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f1079f6114ca071135ba847ebe94cdeb220ff537 GIT binary patch literal 6148 zcmeHKy-ve05Wb@oio}wU(T_miz*OnXkQacqs6}c>1!d2|3LSVSUV(`X39%zF@|}H9 z2LdBPa3|T{<$ipZPl_EA5f3k>1EQRWG7Lc$r9;Hr>Dtm@ak8v2C?|Eb6f2*o@3({W z-lKCmqsd~H_P<_lJXKv3<3&A&CA;#^^Owil{nR`C#=D#+tDf#5jkak;N2oZXV_KzE zv&*~kqd%>EaQ|>KdJ45$YgF~7gRf%JKCX8(fHCm@7{Hk=lI=va*%&Ye zjDdFsWPflNf?lzS7`6^f;R*ok!yE*9E(*{odc`IpJP?klz?jN<#o(9@yVE$Y*hGx! z#CrK)t^9U*;ZPmxyAV$7Bid{X7z1qvdhs!r^M8a-rt^~DPO&Frz!>;r3~;|Fiy>Z0 z&(=?`Cugn0IK&Wh5^9BF3|2p@rowwqIa~M9_d3Q7!Pn8>JUvuJn*9qZ!=&RFbo(5 z3Odh&0K{$_mJM~R17wV& z(bd>cC_^!)svd|ACA!2QDje;Oa7T1CHWaFGASxV)o|)(hg~-`4&XMjwT!ls&1`Gq8 z42asj2V&q@xu0&W-?@(#ahOWjPrsB6HGnQiA%Q?u`8!@ezuGIRjg|vmk7Z=;?}xkb zbv`-iM>5{J&i<|c_~f_oR%`Wttno@q)~+8!@&k~8hwG{Vg{*yTt=a{Z2zQCpgQz zkkLd2gjI?zOV>kI_vSS`n15VG1rMsH{3aFbT- z!+Tt3Y4xk!p}9LT`V8(4$aGf{N}0?zy}X>#Y@tP8tl0f&knkv);c1wKoGmV;$n{i4 z>r-r*js={!wR#EzJSMK4J_R->gmHzUud(KIXZEaUZsFyKtBykDlp$C-qR zl!ePL6qN<{T2uK2eQ&oRzuzTnO%OCGPXlQ0fnz&xzNCVU6q z!%uJ*9>8Dl9R49a#3skdNpg-{BA3ZkGDW^50a+m-NmPPd^N0RaJvSvuQEU65+m6>C zzdYS*Z#`sRUpaAa;@N$1$l7w$`R-BM&!_FcJ!)Wz_8jZwghiaya9m&DxCKYJA-WnH z3ULIRx&I{%Mi>U(8UtNw=3!C)f4=|U|KHmB%*2KP!@%ojfOJomC&g#Jx|%yD%;AuO u{T6o7gkM9U3_&4W#JDWS5qJJ!h`OU~uEvH!v|uwI0+I$J3YW(H>7n|U8I z@3(rp%o6~RTCZIJumHfo&Z)T{hg}+%^FGu@)XFiW1nmKO&<5&tDs_hqY3l`zfJQ(g zpb^jrXat@I1n`^9n=vM-9yJ0Q0gb>m0{s18Vdu1}XkSwC>cBx<0g&c!Sv2JF9w2Ni zMXQSTB^9RVQ{EnkG9~JYL8Lj#Ev}BVs%T$QX%0l115rB@bweRyceJyFI*_WQdejJL z1cnjdclSJ;0S7#=)A#poAeBX84QO=P%uLH;Ez~ehJo@af_kZ~DjbT4s)_wx5V3k)3 zlHEl1=CF#u@I;ZUBqTC%o^4tB4Eck%UM>DD&XAJt?7o{kyRYz_hXD8OA{w`G^kzNg zs3`fdc!X#E6-{W5LIfc=16rT&uGQLz0_E#LEAZSXE|-5HBcr(&_T`PdF=pJXud
VVkvNkK1&Rw3eD&@+#t*wGlES-JrYIDu&`s|*F3W$2a!T~wo9`7Tk zVs@Q%6%F}0iRO3HOyViLIJW=5!Etlq(BX;6iDI#Mj=y}oX&!Fb&RQqr=bUC9 z3u|7F-spsGyB^q%>vtM4y&c!xyR>N@8c@AT+qZU>7VZS7Gr6-M+`Sc2>I;8!D=QI= z8!3LNX^uxu$UJYJMQ-dee`z^FlxJhwo%L53?zoN!&jnl*Ez&STI%LyWvcu5!JG6G^ zrf0XPH|N(_9J6l2b(k+tJ}%tibUviqW$DU831X@GPQsj&j0q*lU?NQ>oT8-kT~HPL zg3o+fC{^dBq=28wQ}}ay7Zza+?!rg#F?Y zi9=S2OG4>jBzeTI$ayl72s!nLGpRTF<+UA2I`JNieD&cU4Uu@tE}itl(oE9jKH(cH zyY+hLd(7|P3P0UGi1Bq4LI)_s*%TxE)agXb=spjLcJV?c(JudwM9aja({1mjTjoJ$ zlJ46t{v1q%bm}et`oTBT@|&0OkxszJ>15LId-2W9_!vk=Jce!>0gZr0KqH_L&7*yi5b_@G^*m>i6eMyB04x${7 zRFva!!prfZ$boBRN8{x`j4<|EIAow>??8EpzXFmiPbv0H;>! Ay8r+H literal 0 HcmV?d00001 diff --git a/oak-blob-cloud/src/.DS_Store b/oak-blob-cloud/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4599bc4cb122bab0dbe48ebe967d177711e955e8 GIT binary patch literal 6148 zcmeHK%}*0S6n_Inwji=VtB5ga?8OAsmY85-3~Rw?V+@26ECSZub|@RRGtKUn3WTI* zJ^2Ut2YB^l;>DvEuilJ*f?hr8n~&vFFCL5``;wX8n|U9*@3%WUI{-imty&(y1ONk@ zz(gN*zY$>3*qhEhZ6bo%^-(Tii3#wzBBV^=rpzPQsF?s321wdhLScWb4lU3FQ#9Mb1u$=#t9 zbNHC+0X1Bsy_F;c^nmiyy@`O~$262h65_Clm`LY^EJqb|Tf5=-UpLv|s zaZdOrAOs2lgvVa`w`e>3(&O;7il)uzKdlAEb;S(C4E!|%;`@-nCeYH@Q7Ath*vTUR zVgje7pe}#?5i?=}(bCvah%+ceg(9j@qK_CvpB#t^N4ur{I|@}e5P4%D8w0*_(wp}5O*;H|CE7W8L!^R literal 0 HcmV?d00001 diff --git a/oak-blob-plugins/.DS_Store b/oak-blob-plugins/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..74aa0e87825bb365f842a87b2336565666513f50 GIT binary patch literal 6148 zcmeHKy-LJD5T4B)5)kCG}P0b@6z;9a|^gSm%dP*7Zw-(F!eS9~Gx` zK#RC)vitJz(H_^{I=#KipKiEzD@Ro?ckq=@ypNOK^-=%oH0zSRhV9ffDMp#c&c1y;r|X zu@RJTa@u@2t^C%!xKJJWeQ+n23EFH77z1qvdh$5n`+o;r47h$V zDssG(-mRZrkMCNKv4_FJehn`mShs!x@WAKDMlg!q^BR7cVk5{|SRcZH_9GAovB? weigher; private final Cache cache; diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java index 6a44a2c855f..cd4f62eb207 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java @@ -54,8 +54,7 @@ import org.apache.jackrabbit.oak.api.blob.BlobUploadOptions; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; @@ -134,7 +133,7 @@ public int weigh(@NotNull String key, @NotNull byte[] value) { } }; - private final AbstractCacheStats cacheStats; + private final CacheStats cacheStats; public static final String MEM_CACHE_NAME = "BlobStore-MemCache"; @@ -159,7 +158,7 @@ public DataStoreBlobStore(DataStore delegate, boolean encodeLengthInId, int cach .maximumWeight(cacheSize) .weigher(weigher::weigh) .build().asOakCache(); - this.cacheStats = new CacheStatsAdapter(cache, MEM_CACHE_NAME, weigher, cacheSize); + this.cacheStats = new CacheStats(cache, MEM_CACHE_NAME, weigher, cacheSize); } //~----------------------------------< DataStore > @@ -828,7 +827,7 @@ public DataStore getDataStore() { return delegate; } - public AbstractCacheStats getCacheStats() { + public CacheStats getCacheStats() { return cacheStats; } diff --git a/oak-blob/.DS_Store b/oak-blob/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4a7c14b9553f5451d78b56d8ec4a432e515d16f1 GIT binary patch literal 6148 zcmeHKy-ve05I)nY3PM617#O`X^$koEo}e!PZBZE-rGm2iS>Qd`Di$^tW=5WYf$w|= zjn&W*A-I$5&%Pg@^F^_9MC8ib*@$RJLSfXn)b`tf z_uiu$x~A!3-roPq$;MJQRW(^O6KIO(^?QB)x;|}NXFIIRtJbRfh$0%$iY}0GPM5UG zvK~Hc+1t5e^>kOhJ#y}Bjk?+F;5(meA4l?%IGKqtUvfwB8sn266^^G9B{$e}+${v&hdwY-S7?1AmMG*RRG^iHFj= zb?fo?uJvf=Xe{g(c>uvU`w75=&ynL~6uaj!{DNW>a z)QzqlMRW#|FUkBRA8fKiM6SGC)MpbDFQ0?fsAW9IC0Cs+z5v8CJ5}tLOUq;cnE{F22!j&RS9Tr*NZP+R_O!F6orE zN!Dt0{88V|oj=_imXG(GJBd*@?>qR)CfUbPKnN3Kz!)$FjDdg30N!ktY#?a8F<=ZB z18)rQ{ov6U3&kK9uMTvv1OWE290g;pCD_L+7K%X-8i*5Dptw3MF`T$#-K$-p7zD+g zoE9HWGrtxuE@nr3AI-@Xg4P=Y#z4wIPo_hD|Ht@bI*a_&#b(BUG4RJ2aQ$jhl{l2X zt)Gs^Z>>k0qOq`D-~j~V literal 0 HcmV?d00001 diff --git a/oak-core-spi/.DS_Store b/oak-core-spi/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..84e4d6148d12602a83322574fd8f51439a0c2086 GIT binary patch literal 6148 zcmeHKJ5Iwu5S<|r3PMOJDfbHLsF1NtMT3+JKpYf`SdJi6G(H7&B+i030xhD)Mt3o7Tc_WrMB=VqzuqL|F<2{eO;{JFY)x;toFr{7o?=dG+ej|ihpTGA;h&ghJm zN!7iZ@}s?7dwsmx&)4@-JIPVi?>qR)C)vl*3MpKi0cXG&a0dP<1GuwA2HT20I|I&u zGw{ZMoDTs*Ff(ivT literal 0 HcmV?d00001 diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java index ba2b8c381cf..398bed559db 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java @@ -25,8 +25,8 @@ import java.util.StringJoiner; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.cache.CacheStats; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; +import org.apache.jackrabbit.oak.cache.api.CacheCounters; import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean; import org.jetbrains.annotations.NotNull; @@ -38,8 +38,8 @@ public abstract class AbstractCacheStats extends AnnotatedStandardMBean implemen @NotNull private final String name; - private CacheStats lastSnapshot = - new CacheStats(0, 0, 0, 0, 0, 0); + private CacheCounters lastSnapshot = + new CacheCounters(0, 0, 0, 0, 0, 0); /** * Create a new {@code CacheStatsMBean} for a cache with the given {@code name}. @@ -51,19 +51,17 @@ protected AbstractCacheStats(@NotNull String name) { } /** - * Call back invoked to retrieve the most recent {@code CacheStats} instance of the + * Call back invoked to retrieve the most recent {@link CacheCounters} of the * underlying cache. */ - protected abstract CacheStats getCurrentStats(); + protected abstract CacheCounters getCurrentStats(); - private CacheStats stats() { + private CacheCounters stats() { return getCurrentStats().minus(lastSnapshot); } @Override public synchronized void resetStats() { - // Cache stats cannot be rest at Guava level. Instead we - // take a snapshot and then subtract it from future stats calls lastSnapshot = getCurrentStats(); } diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java deleted file mode 100644 index 3860b91dfd8..00000000000 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.jackrabbit.oak.cache; - -import java.util.Map; -import java.util.Objects; - -import org.apache.jackrabbit.guava.common.cache.Cache; -import org.apache.jackrabbit.guava.common.cache.Weigher; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -/** - * Cache statistics. - */ -public class CacheStats extends AbstractCacheStats { - private final Cache cache; - private final Weigher weigher; - private final long maxWeight; - - /** - * Construct the cache stats object. - * - * @param cache the cache - * @param name the name of the cache - * @param weigher the weigher used to estimate the current weight - * @param maxWeight the maximum weight - */ - @SuppressWarnings("unchecked") - public CacheStats( - @NotNull Cache cache, - @NotNull String name, - @Nullable Weigher weigher, - long maxWeight) { - super(name); - this.cache = (Cache) Objects.requireNonNull(cache); - this.weigher = (Weigher) weigher; - this.maxWeight = maxWeight; - } - - @Override - protected org.apache.jackrabbit.guava.common.cache.CacheStats getCurrentStats() { - return cache.stats(); - } - - @Override - public long getElementCount() { - return cache.size(); - } - - @Override - public long estimateCurrentWeight() { - if (weigher == null) { - return -1; - } - long size = 0; - for (Map.Entry e : cache.asMap().entrySet()) { - Object k = e.getKey(); - Object v = e.getValue(); - size += weigher.weigh(k, v); - } - return size; - } - - @Override - public long getMaxTotalWeight() { - return maxWeight; - } -} diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java index fea96ae9bbf..7e7f5dbd03e 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java @@ -27,8 +27,7 @@ * Determines the weight of object based on the memory taken by them. The memory estimates * are based on empirical data and not exact */ -public class EmpiricalWeigher extends GuavaCompatibleEmpiricalWeigher - implements Weigher { +public class EmpiricalWeigher implements Weigher { static final Logger LOG = LoggerFactory.getLogger(EmpiricalWeigher.class); @@ -45,15 +44,3 @@ public int weigh(@NotNull CacheValue key, @NotNull CacheValue value) { } } - -/** - * Compatibility base class that keeps {@link EmpiricalWeigher} assignable to the - * legacy Guava-shim {@link org.apache.jackrabbit.guava.common.cache.Weigher} type while the public API migrates to - * {@link Weigher}. - * - *

TODO OAK-12162: remove this compatibility base in - * OAK-12162 once downstream callers no longer require {@link org.apache.jackrabbit.guava.common.cache.Weigher} - * assignability.

- */ -abstract class GuavaCompatibleEmpiricalWeigher implements org.apache.jackrabbit.guava.common.cache.Weigher { -} diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java index 252383fe561..4c14db3f2da 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java @@ -115,7 +115,7 @@ public interface Cache { * @return a stats snapshot (never null) */ @NotNull - CacheStatsSnapshot stats(); + CacheCounters stats(); /** * Returns a view of the entries stored in this cache as a thread-safe map. diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheCounters.java similarity index 69% rename from oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java rename to oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheCounters.java index ec6f8e0e0ab..335e2ed7db2 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheCounters.java @@ -22,7 +22,7 @@ * An immutable snapshot of cache statistics at a point in time. * *

Returned by {@link Cache#stats()}. All counters are cumulative since - * the cache was created. Use {@link #minus(CacheStatsSnapshot)} to compute a delta + * the cache was created. Use {@link #minus(CacheCounters)} to compute a delta * between two snapshots.

* * @param hitCount number of times a requested key was found in the cache @@ -32,7 +32,7 @@ * @param totalLoadTime total time spent loading new values, in nanoseconds * @param evictionCount number of entries evicted from the cache */ -public record CacheStatsSnapshot( +public record CacheCounters( long hitCount, long missCount, long loadSuccessCount, @@ -71,6 +71,47 @@ public double missRate() { return requests == 0 ? 0.0 : (double) missCount / requests; } + /** + * Returns the total number of load attempts (successes + failures). + * + * @return load count + */ + public long loadCount() { + return loadSuccessCount + loadFailureCount; + } + + /** + * Returns the number of load attempts that threw an exception. + * Alias for {@link #loadFailureCount()}, matching the JMX interface naming. + * + * @return load exception count + */ + public long loadExceptionCount() { + return loadFailureCount; + } + + /** + * Returns the ratio of load attempts that threw an exception, or {@code 0.0} + * if no loads have been attempted. + * + * @return load exception rate between 0.0 and 1.0 + */ + public double loadExceptionRate() { + long loads = loadCount(); + return loads == 0 ? 0.0 : (double) loadFailureCount / loads; + } + + /** + * Returns the average time spent loading a new value, in nanoseconds, or + * {@code 0.0} if no loads have been attempted. + * + * @return average load penalty in nanoseconds + */ + public double averageLoadPenalty() { + long loads = loadCount(); + return loads == 0 ? 0.0 : (double) totalLoadTime / loads; + } + /** * Returns the difference between this snapshot and an earlier {@code other} * snapshot, useful for computing per-interval deltas. @@ -79,8 +120,8 @@ public double missRate() { * @return a new snapshot representing the delta */ @NotNull - public CacheStatsSnapshot minus(@NotNull CacheStatsSnapshot other) { - return new CacheStatsSnapshot( + public CacheCounters minus(@NotNull CacheCounters other) { + return new CacheCounters( Math.max(0, hitCount - other.hitCount), Math.max(0, missCount - other.missCount), Math.max(0, loadSuccessCount - other.loadSuccessCount), diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java similarity index 69% rename from oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java rename to oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java index e1bef782532..03acbde1e78 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java @@ -23,18 +23,10 @@ import org.jetbrains.annotations.Nullable; /** - * Exposes an {@link Cache}'s statistics via the {@link org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean} - * interface by bridging {@link CacheStatsSnapshot} to the Guava shim {@link org.apache.jackrabbit.guava.common.cache.CacheStats} expected - * by {@link AbstractCacheStats}. - * - *

The Guava return type from {@link #getCurrentStats()} is kept until TASK-16 updates - * the base class to use {@link CacheStatsSnapshot} directly.

- * - *

TODO OAK-TASK16: per {@code TASKS.md}, remove this temporary adapter in - * TASK-16 once {@link AbstractCacheStats} consumes {@link CacheStatsSnapshot} - * directly.

+ * Exposes a {@link Cache}'s statistics via the {@link org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean} + * interface. */ -public class CacheStatsAdapter extends AbstractCacheStats { +public class CacheStats extends AbstractCacheStats { private final Cache cache; private final Weigher weigher; @@ -49,7 +41,7 @@ public class CacheStatsAdapter extends AbstractCacheStats { * @param maxWeight configured maximum weight for the cache; {@code -1} if unbounded */ @SuppressWarnings("unchecked") - public CacheStatsAdapter( + public CacheStats( @NotNull Cache cache, @NotNull String name, @Nullable Weigher weigher, @@ -61,12 +53,8 @@ public CacheStatsAdapter( } @Override - protected org.apache.jackrabbit.guava.common.cache.CacheStats getCurrentStats() { - CacheStatsSnapshot s = cache.stats(); - return new org.apache.jackrabbit.guava.common.cache.CacheStats( - s.hitCount(), s.missCount(), - s.loadSuccessCount(), s.loadFailureCount(), - s.totalLoadTime(), s.evictionCount()); + protected CacheCounters getCurrentStats() { + return cache.stats(); } @Override diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java index 92510a885e0..c11dfe973a3 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java @@ -20,9 +20,8 @@ import java.util.concurrent.ConcurrentMap; import java.util.function.Function; -import com.github.benmanes.caffeine.cache.Policy; import com.github.benmanes.caffeine.cache.RemovalCause; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheCounters; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.jetbrains.annotations.NotNull; @@ -75,9 +74,9 @@ public long estimatedSize() { @Override @NotNull - public CacheStatsSnapshot stats() { + public CacheCounters stats() { com.github.benmanes.caffeine.cache.stats.CacheStats s = cache.stats(); - return new CacheStatsSnapshot( + return new CacheCounters( s.hitCount(), s.missCount(), s.loadSuccessCount(), s.loadFailureCount(), s.totalLoadTime(), s.evictionCount()); diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java index 02fbf7f44c9..55a2fbd79c8 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java @@ -24,7 +24,7 @@ import org.apache.jackrabbit.guava.common.cache.RemovalCause; import org.apache.jackrabbit.oak.cache.CacheLIRS; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheCounters; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.jetbrains.annotations.NotNull; @@ -85,9 +85,9 @@ public long estimatedSize() { @Override @NotNull - public CacheStatsSnapshot stats() { + public CacheCounters stats() { org.apache.jackrabbit.guava.common.cache.CacheStats s = cache.stats(); - return new CacheStatsSnapshot( + return new CacheCounters( s.hitCount(), s.missCount(), s.loadSuccessCount(), s.loadExceptionCount(), s.totalLoadTime(), s.evictionCount()); diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java index 61515af957e..a9a2f2e4336 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java @@ -19,7 +19,7 @@ * For Oak internal use only. Do not use outside Oak components. */ @Internal(since = "1.1.1") -@Version("2.1") +@Version("3.0") package org.apache.jackrabbit.oak.cache; import org.apache.jackrabbit.oak.commons.annotations.Internal; diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java index 4d3fb779d4e..7a4c92a38ff 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java @@ -18,6 +18,7 @@ import java.util.concurrent.ExecutionException; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -38,7 +39,7 @@ public class AbstractCacheStatsTest { @Before public void setUp() { cache = new CacheLIRS<>(null, MAX_WEIGHT, 1, 1, 0, null, null, null); - stats = new CacheStats(cache, CACHE_NAME, null, MAX_WEIGHT); + stats = new CacheStats(cache.asOakCache(), CACHE_NAME, null, MAX_WEIGHT); } @Test @@ -95,7 +96,7 @@ public void evictionCountIncreasesAfterCapacityEviction() { CacheLIRS smallCache = CacheLIRS.newBuilder() .maximumSize(5) .build(); - CacheStats smallStats = new CacheStats(smallCache, "small", null, 5); + CacheStats smallStats = new CacheStats(smallCache.asOakCache(), "small", null, 5); for (int i = 0; i < 30; i++) { smallCache.put("k" + i, "v" + i); } diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java deleted file mode 100644 index 2f0e3e48941..00000000000 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.jackrabbit.oak.cache; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; - -import org.apache.jackrabbit.guava.common.cache.Cache; -import org.apache.jackrabbit.guava.common.cache.CacheBuilder; -import org.apache.jackrabbit.guava.common.cache.Weigher; -import org.jetbrains.annotations.NotNull; -import org.junit.Before; -import org.junit.Test; - -public class CacheStatsTest { - private static final String NAME = "cache stats"; - private static final int KEYS = 100; - - private final Weigher weigher = new Weigher() { - @Override - public int weigh(@NotNull Integer key, @NotNull Integer value) { - return 1; - } - }; - - private final Cache cache = CacheBuilder.newBuilder() - .recordStats() - .maximumWeight(Long.MAX_VALUE) - .weigher(weigher) - .build(); - - private final CacheStats cacheStats = - new CacheStats(cache, NAME, weigher, Long.MAX_VALUE); - - private int misses; - private int fails; - private long loadTime; - - @Before - public void setup() { - for (int k = 0; k < KEYS; k++) { - cache.put(k, k); - } - - for (int k = 0; k < 100; k++) { - final int key = 4 * k; - try { - cache.get(key, new Callable() { - @Override - public Integer call() throws Exception { - long t0 = System.nanoTime(); - try { - if (key % 10 == 0) { - fails++; - throw new Exception("simulated load failure"); - } else { - misses++; - return key; - } - } finally { - loadTime += System.nanoTime() - t0; - } - - } - }); - } catch (ExecutionException ignore) { } - } - } - - @Test - public void name() throws Exception { - assertEquals(NAME, cacheStats.getName()); - } - - @Test - public void getRequestCount() { - assertEquals(KEYS, cacheStats.getRequestCount()); - } - - @Test - public void getHitCount() { - assertEquals(KEYS - misses - fails, cacheStats.getHitCount()); - } - - @Test - public void getHitRate() { - assertEquals((KEYS - (double) misses - fails)/KEYS, cacheStats.getHitRate(), Double.MIN_VALUE); - } - - @Test - public void getMissCount() { - assertEquals(misses + fails, cacheStats.getMissCount()); - } - - @Test - public void getMissRate() { - assertEquals(((double)misses + fails)/KEYS, cacheStats.getMissRate(), Double.MIN_VALUE); - } - - @Test - public void getLoadCount() { - assertEquals(misses + fails, cacheStats.getLoadCount()); - } - - @Test - public void getLoadSuccessCount() { - assertEquals(misses, cacheStats.getLoadSuccessCount()); - } - - @Test - public void getLoadExceptionCount() { - assertEquals(fails, cacheStats.getLoadExceptionCount()); - } - - @Test - public void getLoadExceptionRate() { - assertEquals((double)fails/(misses + fails), cacheStats.getLoadExceptionRate(), Double.MIN_VALUE); - } - - @Test - public void getTotalLoadTime() { - assertTrue(loadTime <= cacheStats.getTotalLoadTime()); - } - - @Test - public void getAverageLoadPenalty() { - assertTrue(((double)loadTime/(misses + fails)) <= cacheStats.getAverageLoadPenalty()); - } - - @Test - public void getEvictionCount() { - assertEquals(0, cacheStats.getEvictionCount()); - } - - @Test - public void getElementCount() { - assertEquals(KEYS + misses, cacheStats.getElementCount()); - } - - @Test - public void getMaxTotalWeight() { - assertEquals(Long.MAX_VALUE, cacheStats.getMaxTotalWeight()); - } - - @Test - public void estimateCurrentWeight() { - assertEquals(KEYS + misses, cacheStats.estimateCurrentWeight()); - } - - @Test - public void resetStats() { - cacheStats.resetStats(); - assertEquals(0, cacheStats.getRequestCount()); - assertEquals(0, cacheStats.getHitCount()); - assertEquals(1.0, cacheStats.getHitRate(), Double.MIN_VALUE); - assertEquals(0, cacheStats.getMissCount()); - assertEquals(0.0, cacheStats.getMissRate(), Double.MIN_VALUE); - assertEquals(0, cacheStats.getLoadCount()); - assertEquals(0, cacheStats.getLoadSuccessCount()); - assertEquals(0, cacheStats.getLoadExceptionCount()); - assertEquals(0, cacheStats.getLoadExceptionRate(), Double.MIN_VALUE); - assertEquals(0, cacheStats.getTotalLoadTime()); - assertEquals(0, cacheStats.getAverageLoadPenalty(), Double.MIN_VALUE); - assertEquals(0, cacheStats.getEvictionCount()); - assertEquals(KEYS + misses, cacheStats.getElementCount()); - assertEquals(Long.MAX_VALUE, cacheStats.getMaxTotalWeight()); - assertEquals(KEYS + misses, cacheStats.estimateCurrentWeight()); - } -} diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java similarity index 78% rename from oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java rename to oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java index 4820634feca..c6777086b0b 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java @@ -19,55 +19,55 @@ import org.junit.Assert; import org.junit.Test; -/** Tests for {@link CacheStatsSnapshot}. */ -public class CacheStatsSnapshotTest { +/** Tests for {@link CacheCounters}. */ +public class CacheStatsTest { - private CacheStatsSnapshot stats(long hits, long misses, long loadSuccess, long loadFail, - long loadTime, long evictions) { - return new CacheStatsSnapshot(hits, misses, loadSuccess, loadFail, loadTime, evictions); + private CacheCounters stats(long hits, long misses, long loadSuccess, long loadFail, + long loadTime, long evictions) { + return new CacheCounters(hits, misses, loadSuccess, loadFail, loadTime, evictions); } /** Verifies that {@code requestCount()} returns the sum of hits and misses. */ @Test public void requestCountIsHitsPlusMisses() { - CacheStatsSnapshot s = stats(3, 7, 0, 0, 0, 0); + CacheCounters s = stats(3, 7, 0, 0, 0, 0); Assert.assertEquals(10, s.requestCount()); } /** Verifies that {@code hitRate()} returns hits divided by total requests. */ @Test public void hitRateWithRequests() { - CacheStatsSnapshot s = stats(3, 7, 0, 0, 0, 0); + CacheCounters s = stats(3, 7, 0, 0, 0, 0); Assert.assertEquals(0.3, s.hitRate(), 0.001); } /** Verifies that {@code hitRate()} returns {@code 1.0} when no requests have been made. */ @Test public void hitRateWithNoRequestsReturnsOne() { - CacheStatsSnapshot s = stats(0, 0, 0, 0, 0, 0); + CacheCounters s = stats(0, 0, 0, 0, 0, 0); Assert.assertEquals(1.0, s.hitRate(), 0.0); } /** Verifies that {@code missRate()} returns misses divided by total requests. */ @Test public void missRateWithRequests() { - CacheStatsSnapshot s = stats(3, 7, 0, 0, 0, 0); + CacheCounters s = stats(3, 7, 0, 0, 0, 0); Assert.assertEquals(0.7, s.missRate(), 0.001); } /** Verifies that {@code missRate()} returns {@code 0.0} when no requests have been made. */ @Test public void missRateWithNoRequestsReturnsZero() { - CacheStatsSnapshot s = stats(0, 0, 0, 0, 0, 0); + CacheCounters s = stats(0, 0, 0, 0, 0, 0); Assert.assertEquals(0.0, s.missRate(), 0.0); } /** Verifies that {@code minus()} produces the correct per-field delta between two snapshots. */ @Test public void minusProducesDelta() { - CacheStatsSnapshot later = stats(10, 5, 4, 1, 1000, 3); - CacheStatsSnapshot earlier = stats(6, 3, 2, 0, 400, 1); - CacheStatsSnapshot delta = later.minus(earlier); + CacheCounters later = stats(10, 5, 4, 1, 1000, 3); + CacheCounters earlier = stats(6, 3, 2, 0, 400, 1); + CacheCounters delta = later.minus(earlier); Assert.assertEquals(4, delta.hitCount()); Assert.assertEquals(2, delta.missCount()); @@ -80,9 +80,9 @@ public void minusProducesDelta() { /** Verifies that {@code minus()} clamps negative deltas to zero when the earlier snapshot has larger values. */ @Test public void minusClampsNegativeValuesToZero() { - CacheStatsSnapshot later = stats(5, 2, 1, 0, 100, 1); - CacheStatsSnapshot earlier = stats(9, 3, 2, 1, 200, 2); - CacheStatsSnapshot delta = later.minus(earlier); + CacheCounters later = stats(5, 2, 1, 0, 100, 1); + CacheCounters earlier = stats(9, 3, 2, 1, 200, 2); + CacheCounters delta = later.minus(earlier); Assert.assertEquals(0, delta.hitCount()); Assert.assertEquals(0, delta.missCount()); @@ -95,7 +95,7 @@ public void minusClampsNegativeValuesToZero() { /** Verifies that all record accessors return the values supplied to the canonical constructor. */ @Test public void accessorsReturnConstructorValues() { - CacheStatsSnapshot s = stats(1, 2, 3, 4, 5, 6); + CacheCounters s = stats(1, 2, 3, 4, 5, 6); Assert.assertEquals(1, s.hitCount()); Assert.assertEquals(2, s.missCount()); Assert.assertEquals(3, s.loadSuccessCount()); @@ -107,7 +107,7 @@ public void accessorsReturnConstructorValues() { /** Verifies that {@code toString()} includes every field name and its value. */ @Test public void toStringContainsAllFields() { - CacheStatsSnapshot s = stats(1, 2, 3, 4, 5, 6); + CacheCounters s = stats(1, 2, 3, 4, 5, 6); String str = s.toString(); Assert.assertTrue(str.contains("hitCount=1")); Assert.assertTrue(str.contains("missCount=2")); diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java index b70694c8ee1..763f3f6ec38 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java @@ -24,11 +24,11 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheCounters; import org.apache.jackrabbit.oak.cache.api.LoadingCache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.cache.impl.caffeine.CaffeineCacheAdapter; import org.apache.jackrabbit.oak.cache.impl.caffeine.CaffeineLoadingCacheAdapter; import org.junit.Assert; @@ -179,7 +179,7 @@ public void statsReturnsCorrectHitMissCounts() { cache.getIfPresent("k"); cache.getIfPresent("missing"); - CacheStatsSnapshot stats = cache.stats(); + CacheCounters stats = cache.stats(); Assert.assertNotNull(stats); Assert.assertEquals(1, stats.hitCount()); Assert.assertEquals(1, stats.missCount()); @@ -248,7 +248,7 @@ public void oakCacheStatsAdapterBridgesOakStats() { .weigher((k, v) -> k.length() + v.length()) .recordStats() .build(); - CacheStatsAdapter stats = new CacheStatsAdapter( + CacheStats stats = new CacheStats( cache, "testCache", (k, v) -> k.length() + v.length(), 100); cache.put("aa", "bbb"); diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java index cda9f1ff4da..1111309f9ad 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java @@ -20,7 +20,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.RemovalCause; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheCounters; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.junit.Assert; import org.junit.Test; @@ -45,7 +45,7 @@ public void statsSnapshotReflectsUnderlyingCacheStats() { adapter.getIfPresent("hit"); adapter.getIfPresent("miss"); - CacheStatsSnapshot stats = adapter.stats(); + CacheCounters stats = adapter.stats(); Assert.assertEquals(1, stats.hitCount()); Assert.assertEquals(1, stats.missCount()); } diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java index b231067c660..16864bd7696 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java @@ -21,7 +21,7 @@ import org.apache.jackrabbit.guava.common.cache.RemovalCause; import org.apache.jackrabbit.oak.cache.CacheLIRS; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheCounters; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.junit.Assert; import org.junit.Test; @@ -51,7 +51,7 @@ public void statsSnapshotReflectsUnderlyingCacheStats() { adapter.getIfPresent("hit"); adapter.getIfPresent("miss"); - CacheStatsSnapshot stats = adapter.stats(); + CacheCounters stats = adapter.stats(); Assert.assertEquals(1, stats.hitCount()); Assert.assertEquals(1, stats.missCount()); } diff --git a/oak-core/.DS_Store b/oak-core/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5ce05b3f1a22df91fcbf2f999e3b7a0df80f0cc9 GIT binary patch literal 6148 zcmeHKJ5Iwu5S_&lSfU9X(|d<&*9sTLz>sF$RnQW55{rrwriEX34h&Z8ips z0b}5u0X`o*24kTZ1mn?xDYgK>4%AVw=3athykemk1Yv)0)nbYiU7p%fLNwuzvKk^BST_wWPQnfV2%u8GLC&-+cH1`*ZajFn|HUl@m=vBz8yBQU3>KrMCtis7^z@yO@J9&<%4 zC+9C8&adqJ4aLdom_L$qa literal 0 HcmV?d00001 diff --git a/oak-exercise/.DS_Store b/oak-exercise/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..cf46d4c3418df1c9ebd2cd340b2dbb6da1b44f46 GIT binary patch literal 6148 zcmeHKJ5B>J5FL{UZA6M78X6>DAvai}O-+#tKoYbmve^iNL_x6~C5M0ma0x^SXQ1R1 zyzvZV9TrN2U`Dc^Js*$vNo#wE$PF&0eWD%_C1{L}2MxmNM$?u$v(fPy{n4Z>mOXkwWTPtY&icXL* zr&C%*S-aOyoA!F{*Uv$&R4) z#(*(k416%a=YvOMOcg7^aCD#xB>=Dubr6iXmf#q#m?~C+ut1!I0wvUGiQyz1dar(| zVkIcyXPWQit16f{VCh1|eIrlZRR$OnZY#u0?x4Fw%{pye7UEoY#lrK94_ z&Op3iC=r4gY4@$?yMB^)Jw(LA%h`aaPed7pAj_gfMBQrYn6nsJatub(s$90D_`NFG zdzUWgoTiI;bN|=R8%tRg#bi-UpviXDyJxqL_Xkbu>>KOyw3+n*VYEdn8l&QzPH2@> z?Hr9i+MBiaU+%7or?u2ha+K9(2VeOl`{>@tK3tpuXTTY72L2}lxU)sFZAG7*0cXG& zcxOP)hkzlN8`g^P=)e?P0ALU5C|FA`Au+))H>?$5fv|=GHI%KzU=4>pm|t#KD{45g zH6Lu1-pXJ^0}NEztrV_)w7Lwqu=O@12UPtJfd@W&Y7UNI_$cqzME zKfRvZwE^Q8Lqz;)SwOH(egg0y=g3|(sy)aWez{?-C|N`w!-4)I5DD?g8TbJPUIDaT BNY?-W literal 0 HcmV?d00001 diff --git a/oak-it-osgi/.DS_Store b/oak-it-osgi/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..997ac39c7904434533ac3a71e62bff31c2cc097a GIT binary patch literal 6148 zcmeHKOHRWu5S^hBiquV!Sg`aJdV^4x!;Ty9 z#vW9M29`+B8OeF}e4Qu7&JYm~?xuaB9uegjf-I935p}C+Po2fclA}MG)YT$rvHlYx zd+*RK-Oyw{OZR`U+E}W(EXVVD3{C#{a(MNyULB{_=?~V$Wt#OKVYE+6I!DDBUC=VE znyufvU+rn_)8~`x;oFncZse%y%?`fvN%xVxdZaKh28;n?z!=z32K0{3<<2oN28;n? zAZ0+#2Zte8DEf%u=)fbi0Kg3DAec)pAu&#|Q1lUDfp823#!%K4gJU@KPW=i+A2Eg# zYxBWc`LlW9P#yVQa3?Mz+S3>?2AT|X;<6|A{}7){Ym?s$v6V4k4E!?&I4eix057F? z>(=YZUF$H;Fhs=9%LIaX<0k+MIY*9yG1{HX;a4d7h>}J0AslEw0)Y^F7z4k+zz3iG BO3eTO literal 0 HcmV?d00001 diff --git a/oak-it/.DS_Store b/oak-it/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..b1e763a544b72094c2b2a61b484a5909f3d7d344 GIT binary patch literal 6148 zcmeHK%}N6?5T4jl7QFN#c+A0r*Sl5?^w5?R6>lUqNqeoxEvuDA(2tJ13#i#I_ z%-C*h^(dksxmc-Y-Ky?uGyYih^eXlKWbsGR^e>d>4Hk#Ryt zG|#f0++TgxH*-H<-t3fbPnX6o2KapNXpBKI3Z|n2T`B>9i|0PZTuZQzR}6|#5E_URSD?5$Eis(9W8JG=P>h1& zPELytrXpuMnR6k>&YEx4}nC8b;iICFz^n| C7D+z< literal 0 HcmV?d00001 diff --git a/oak-jackrabbit-api/.DS_Store b/oak-jackrabbit-api/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..2c34b01b1421707447d7be10459dfc58bfea2a03 GIT binary patch literal 6148 zcmeHLJ5Iwu5S_tMWJHq=$~^+Pfw9a9QqV#Y6pAE{AoMPgC^-ULCE^;0l2hc`K_N7?@ow_%iD3Es7FLOnjp(yhsg3y)t(uPk|joeFsf&ZxY{w@ZwJ|X zMmKa#qv@o*|Fiq8W>#0#a9R(slHctg&L3Y_CvENc8|~t%6}9^UH|o-oE|76Tm$Xc> zW~I0OHV0i4+)`GKPM&VV!E z3~U&X??XTnEDRgP_~}3wO90^Jx{tBc65| zw&H^=^SXH9m>uy$G$$?;y>|wjfs}zvr#(6UQFpF?LaC9@oB?OxPcy)sYEYGUL_1qQ zJ*=Fy0qq=3MC=+FKrl`&0hq{tYDZD2`XFQ26^4zXM3MFA4)lvaB*Z&s;0G9Z2lmQG ADgXcg literal 0 HcmV?d00001 diff --git a/oak-jcr/.DS_Store b/oak-jcr/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5bc5f6655e225282681fd0c1ec4866c86ae27c1e GIT binary patch literal 6148 zcmeHKy-ve05I&O%MJhwbj(!59u1ui{D@$Jh+M+TvO;rjTk~bcN4S~eU10ddmk&!3h zJKsSa5f~AIJIVf>`*psmc8-YL@O(NT>Jd?n!RUC=BCKvTZK*RG9p@N~CUv!p+FiB% zcHq5dbVe(h%xCHTUw1Z^sxHg%ydFc7U)}Z>*Uyjpsdf5|b$Oa(-MdE^ZPS{LQE^5m zv`(vLmv{J0n)bBz;myUOe0k#9jT}|I*}+#n={~ZDfD|UifH7bU7z6*50o>Uvc~{V8 zW55_N20j?z^TA^<7K%YI9vzrs3jpju9R+LdB{;?_7K%X-7KoEjpoBVYF`R@$@71qR z41y9)PMZ&>mEW5e7po(`kM86OL7R;MW1z`ECXYS7{}1q&X>IbGA@*bp7z2Nd0oN%< zl9AU7qU*H7<>&8a_9{3#TN2Az1ui;lH20_lk`WOzh4}nOCO~$|v GFz^QEeM$=e literal 0 HcmV?d00001 diff --git a/oak-lucene/.DS_Store b/oak-lucene/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d25064f75a24673c4547a87dea03e227382bf655 GIT binary patch literal 6148 zcmeHKy-ve05I)liMJh-gL1HkE&^Itu7@7J4v<)glqf}5fhK%gI0UHtnJOvU9@4*YO z@}2LX4g^M2sdtk7+4tjfz9@E%h}`h17!dV|C_`g(JZKSCx0<%pnT?Lu7>uS>xro{u zwXHkw-aB+j7c`yE()~Z|uPkMi=aYFgfhH@iZ%+>Ho{v&%@rQMBo~(Kw5Juayq%kti z=!}+W)}62aC4Y;#8*7x+Y6rjhr2E)yeVx2D6Jx*_Fb0f)4PXFwHcQqM zwB8sn28@9(2KapNXpBLz7K}#+x>y1LyHH2Lm}?1+@rpsQ7K8=jBorv2PD>0Y;m~{a z3yQU%gpE@6Sl>r?azW5~W55__GSHD}pYQ);d@@!QHu!GTYo$=-?bj?6pe-bY92r^Zu|sb!sp0dG>YBx7=A&q7UWe}AH#w6BM=F(&KURy G20j2!w@How literal 0 HcmV?d00001 diff --git a/oak-lucene/src/.DS_Store b/oak-lucene/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a1062275b5ab975652a405d76841ef9e2a972563 GIT binary patch literal 6148 zcmeHKJ5Iwu5S;-R7HLvafV3PTH!zVoK{_f3L4Xp+krMi?xCj*oq2~;U3(!#WW@jK? zVNoIkGt%yxozIT_B=35Nh{w0H5z&x{N(@03rANfv>)NqkakA{OxEf6^+Gf?W$!|5u zvlrCRIo;4Qd;WQR>-w6uuBVH33R_7Jhs*ot$K%{T`_{j@?r?MWgjCes&?T*Dlhr*q zeeL?Xbzk0C%=XIZ*W38E^)iflmhHdZTSX^Zo6*ZmMnh&exS|aN!I-gu@o zhQJabn33#f&&T6DDYl1*-0*JJC+ZPVipJ=8&?2mEHSMS~8y&CFA5W`t8MGUly8K$; zy?5xAZfII8n)_d$Y%OJ#=aZtEK$8v%f4zQrI&NBL-&mJdja8EagwZao=mHrRG^bUR zb^qb?qrI8?=<)J?^!m)XqczHEyMwQMqJ12m@jgt90b{@zFb4i71GuwU(ypNO#(*(k z47@YI=YvOM%oJrg Cg+{>u literal 0 HcmV?d00001 diff --git a/oak-query-spi/.DS_Store b/oak-query-spi/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..141f93b88cc4cc3220f6a0f27a58b55fdb18133d GIT binary patch literal 6148 zcmeHKJ5B>J5FL{htVEL%QJI2@Dh;(+Ehh*EfFvjs*=z)%-@9-DE`f3nN-B=P8_$HS zVMB=!nUU;g&&MDM`Lt6=nz(Sn)cM0jgHqC499h~h}yMHUH&X^ z?LB&+dm7KCN&TyhrK-zvG^v^*(~{?p!LRpF<=aQ zGQj(TM`H|%jbPk5(8X&$FoQY@#{8Dx7_S%<8$nngPC|ha>hy`>BpiCLenGJjlyGwT zz;K#*{djRPJJ$Enom>#K-WV_jQU-c5?eqD6iC?Dkk)MXx%os2R{uu)(Q>!SlF-O0R-dZ5`YQsBS+CFcF$w@1;s{?S7Ch&2iip-5@MY(@Cyul04x?o AHvj+t literal 0 HcmV?d00001 diff --git a/oak-run-commons/.DS_Store b/oak-run-commons/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..45fb6d4801883cad5765010665c3b28c5687af82 GIT binary patch literal 6148 zcmeHKy-EW?5S}qX0)nIzs|72|11qaDT<`(%0-8i(k@G@~{k@Bj*GMI{K7*xC;Ws;@ zxz*EBL}y_4+nb-AxesplhKP7@H_eFpMAX9&WLdO`s9Q}t<}5~*J+jfHDi=|EY_{JH zQhSGPX-Sj$tXcob>DE$KMKPXNV`zGt^P`*l=ZCYVb^48UaoyN8dqNoP(uyvTaYk3P zO0q8Z4?o(QxwG|#hcAzkJK3YGwiSHklhm<}bx18P&VV!E3^)V-j{)4-BE3CDpPd0` zz!`XFK+cDNA($K1it*^c6k7mb7wRZjOD`cY!7w+h6=8v}h5|K|t;Jvshd!8JZdfa7 zII%S!Y?#{qRs!F-S zfgj+)AHa=I;0xdz(0;+*V8-@BLU%c$3VEdQvpqA;_*u4N0ARy;*azqW07oTkUB==Z zAv@`sG<44uL?*|04GF}LV=)fmHE+{l7%&WM8UwU<+mM04ox1~-{VM{r(6R6cb?1i^ ztN}D3hZ&63F8}5A@qDj%+V{pH$z&vZ_x^W$B3w6!Wjz0Saul6@|3Y8VqbDN#i#0p0 zjM{K847Q*EAM={R1d4iY>=xRqGpP9ni#*eLd=9cW$_v~6#v0AmrL8t^^KJgzI~EJC z@QZmq^k;|EdMZR5oYno{Su|OUy4UtZTKG{qnaO}CoS@6mL6nAKF%n47|fT zqwbC6((YM<-Br(8_6NK7dRE`I2dhB=xm1sta(DPjwl%`-yU@jq%ExrLjn-*ngHg`54&{2K1uv z?G4Gtq+u8^3~UYqbUs+9gpS5ip*%XUkWT=_7IsU)I{h?IjHS`hSSmyd3R9toDwOFb z22zBC4IN9O^)tb3-tvm3Hg-@We67fI+hi>if^JyL7PPtL`P$(5PML} OkAS4X6o!F+%D_*&?ySfF literal 0 HcmV?d00001 diff --git a/oak-run/.DS_Store b/oak-run/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8eb272d3558a9d9647e7031508648f22d68791d5 GIT binary patch literal 6148 zcmeHKJ5B>J5FL{!S&1eM5(R}TM4Ossi8c}?QZ4{VP!P(p5rp0sfGbdN5gLRz29#7B zfj6E3ys%Ir1T&KTY|qbr(%L&j00@ajNQHx}_ppw2)`ragZDhxlX~i~PEa&5QwK;Eyrj z+Qq0C;86OuemWk%wH|FBjfL$34Y I4Ez8CFVAjBUH||9 literal 0 HcmV?d00001 diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/.DS_Store b/oak-run/src/main/java/org/apache/jackrabbit/oak/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f974af47642caebd11c52bcf13f448f257764ce7 GIT binary patch literal 6148 zcmeHKy-ve05I!dbg38blF?nG^Nc0Ut6`r7CMW_S{D1QP~V$4ghcHtR#1jKtFBqSzw z7QVAh8#h#J6+(B?`E$;9_T|gZ*+irUleACNBcce(7;K{XL3o_CC4sYS0hO8KE*tlU zXJuZse8uoL8Q^EPMpsl&O6TN1zu@G+AI-}o8D-@N*68#4?Qv)Ne7NY5{^C(xHr|ln z1L3qm6=gJ`vB~4sdxwJVe%qs&$KL&J@$mA*c`VG6m-AefdwKbU8q-inH^`>&@>suk zosTrvKc2pS^Wfr|>$XR|^&Rb46KxaFHdr5-v9sr literal 0 HcmV?d00001 diff --git a/oak-search-elastic/.DS_Store b/oak-search-elastic/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..81619ea261c4de3447ece64b11521923ac2ec2fb GIT binary patch literal 6148 zcmeHKy-ve05Wb@oip0_p7UY$&ZxE`K8L2M-ZJ;1EN(5!k3-COwYz#;|1QX&382Qe3 zPzMSlLU1S9pM5_*=aXXlh=@m5<&bDVL>ZbO%V3R&daY^0oW;np#&9yLt0ro9%=X(s z_THmQx}e!&p6>s#T3M>PD5i^g3Qe|mb9(;rbhn>c%WtgBS+eTxA;M^rmUN7ab2_1A znw4+w4?fz{++}^;jGtrf&Kgy{+QC;o=|1>Dw&CIoI0MdrGw@Ftz@06UZ7F*13^)VM zz&itSJ_Izu+^|)QM+drC0s#9^N5NQX35f}YxnZja3xqWksG)2n25UI|wjfi43*oet#wALExr3f&LaR5IY+jmQSCv-@XHNbMOj7kF&yX*fk=pV&cF{a@CpC~ BN=*O& literal 0 HcmV?d00001 diff --git a/oak-search/.DS_Store b/oak-search/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4db272e6e9d4ab347fdd0d3e61b131da5baec74d GIT binary patch literal 6148 zcmeHKJ5Iwu5S<|rSfYu9gebQ~RJnnP%n4FJX_BB&*f@gF`vkPmBXJYNJt(O-0&jK( zVh2Ns5X?xsZ$01jlf3I8A|74OhC~A*N-zXj79Aq$PSb`ti;*SAa6GNbMbz$??YD#M zy+>DcNz-E9-2d(I%2HNYHYutJG|ASpm|tpGD{45g zH6Lu1- timeoutMap; private final File indexDir; - private final AbstractCacheStats cacheStats; + private final CacheStats cacheStats; private final boolean alwaysUsePreExtractedCache; private volatile ExecutorService executorService; private volatile int timeoutCount; @@ -111,7 +111,7 @@ public ExtractedTextCache(long maxWeight, long expiryTimeInSecs, boolean alwaysU .expireAfterAccess(Duration.ofSeconds(expiryTimeInSecs)) .recordStats() .build(); - cacheStats = new CacheStatsAdapter(cache, "ExtractedTextCache", + cacheStats = new CacheStats(cache, "ExtractedTextCache", EmpiricalWeigher.INSTANCE, maxWeight); } else { cache = null; @@ -250,7 +250,7 @@ public int getTimeoutCount() { } @Nullable - public AbstractCacheStats getCacheStats() { + public CacheStats getCacheStats() { return cacheStats; } diff --git a/oak-security-spi/.DS_Store b/oak-security-spi/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..bfd3c3b3ff6ad44fe6b00fd3183cb74f25ed09e3 GIT binary patch literal 6148 zcmeHKJ5Iwu5S=9vGJ+xn1qH>P04X;xE7K$80wxIxMT{*74Kx-N_uwpu8*l(hPQja< zfq21CA_Ozi?px1y{Uq;th{%Pj`Iu-#L>UI7<3*3Ky4SR!&TMp?V?3GFRTH(lYWwZL zdmqpxUC?Z~=^?57j#Oi zq-t5*eYAILKQ-4OygYL4Bu7=Rckq=@vX9#mDNKw3W55_N2L34nxU*TZZ9$uj0b{@z zcxQmm2amy+E4G61=)e?P0N@bnC|GkZ!7*MjS8N4gfj9{TN~qHo!$~;wUj1^#R#3vp zY4hQ<@>}!bVs+&A(Vbi_XtOb345SPU76f}Dl*F&t<=0+A4#jDa6u;1yE% BM>7Bb literal 0 HcmV?d00001 diff --git a/oak-segment-aws/.DS_Store b/oak-segment-aws/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9df0be426e71d0045b6e761899794f7e8bd2ae31 GIT binary patch literal 6148 zcmeHKJ5B>J5S?KovPL?_P!*NwEf_3eSA-@)6 z?HOIt1&!y^bp7|Y8&6qzKblt~Sn|D_)$H}*?kM$6zVR;3lUcK8q|r7l=@b>GbVkdx zYVYZK=c7NZeQ@R2KZe?kIm&9Yg0EuIb@W~iWgRBQfH7bU7z6*40i4+)`L3e%#(*(k z47@WS`-4LhEF#v5Ve3E_uKB@I{87mC&!1I9p;flP;8IscFG%d|f7n<+Lj28@9}#sGKx&=2rY z@ofF{d2-e|v=cNDiK|6{KyO?EFpzy@KRDIzL`Pf^u~w8>#2(Utb`c1KSZ56U00VEb CcuAZ9 literal 0 HcmV?d00001 diff --git a/oak-segment-azure/.DS_Store b/oak-segment-azure/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..fd9a73946d25227dfc3bc3e4194916c22ef0afcf GIT binary patch literal 6148 zcmeHKu}%Xq47F)hoj{;2NJw4s33P$=sE!?}KLBk}8G2j=WxpTbEBF?~7cj9g@(m0; z+kxi9!H5vpQt}czj&m=%I3Xe)-OPqWeIm+G1X&s_BI;JtMjR|gmN|ywX;m&&yBTf2 z9c1ktx~40dF6Qa_4|ms=vMP$nqMAUH4Q}@@@1F0EQtRv+>+&L*b^8Qv)T0%hA>y3Q zX_ZFhok#3R)1JnDI(Y3BFAoyCF-KXgSMb%CbR9g9{dRE%oB?OR8Th9RAZLqYTZUdc z1I~am@WFtb4*^9mk60V((Sb^z0KhKPDroE75*S1Q%p=x@&_LK+f#%BbiNWR$eTd`o zh_#`)6KiD56C=MrUO3)tIp}cW+|X-hz!_*V(6Me`^8Yb@rPfD&)5UwvfHUyN7~pO( zE=KsMm|H)6p5)qqa*84%<7#O@(AHE8)KrX)oFjW`G<%RX?0Ll6P-YRmx&!?ppoDnk I4Ez8CZ(==0vj6}9 literal 0 HcmV?d00001 diff --git a/oak-segment-remote/.DS_Store b/oak-segment-remote/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d0f861a97dd24fc6d3de68c0ecfaecb2f9a6098b GIT binary patch literal 6148 zcmeHKJ5B>J5S<}Wv=U89N?##8#U?B#$ORw?3P@RP1ffDg+tE^SCB!Y#AP^^@hUL_E5j4T$#e1%iej>;CeUP$y{og==lfyPI{U`DJZ-GnK@?GsR&|wjfs_HQMyW6N{~>;v)*?R*@tHH=4E!+$xLb^i5kAW9 z)=!@&cWppBLK6|cS_Tk|lScq1a*pgpquPUv;g=iMin5C6V>r+s0+A5!oPi%;;0;Qx BOMn0X literal 0 HcmV?d00001 diff --git a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java index f89d414c944..df4b1271442 100644 --- a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java +++ b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java @@ -20,7 +20,6 @@ import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; -import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.segment.spi.monitor.RoleStatisticsProvider; @@ -102,7 +101,7 @@ private PersistentCache createPersistentCache(Configuration configuration, Close Collections.emptyMap())); CacheStatsMBean diskCacheStatsMBean = persistentDiskCache.getCacheStats(); - registerCloseable(registerMBean(CacheStatsMBean.class, diskCacheStatsMBean, CacheStats.TYPE, diskCacheStatsMBean.getName())); + registerCloseable(registerMBean(CacheStatsMBean.class, diskCacheStatsMBean, CacheStatsMBean.TYPE, diskCacheStatsMBean.getName())); if (configuration.redisCacheEnabled()) { PersistentRedisCache redisCache = new PersistentRedisCache(configuration.redisCacheHost(), configuration.redisCachePort(), configuration.redisCacheExpireSeconds(), configuration.redisSocketTimeout(), configuration.redisConnectionTimeout(), @@ -111,7 +110,7 @@ private PersistentCache createPersistentCache(Configuration configuration, Close closer.register(redisCache); CacheStatsMBean redisCacheStatsMBean = redisCache.getCacheStats(); - registerCloseable(registerMBean(CacheStatsMBean.class, redisCacheStatsMBean, CacheStats.TYPE, redisCacheStatsMBean.getName())); + registerCloseable(registerMBean(CacheStatsMBean.class, redisCacheStatsMBean, CacheStatsMBean.TYPE, redisCacheStatsMBean.getName())); } return persistentDiskCache; @@ -121,7 +120,7 @@ private PersistentCache createPersistentCache(Configuration configuration, Close closer.register(redisCache); CacheStatsMBean redisCacheStatsMBean = redisCache.getCacheStats(); - registerCloseable(registerMBean(CacheStatsMBean.class, redisCacheStatsMBean, CacheStats.TYPE, redisCacheStatsMBean.getName())); + registerCloseable(registerMBean(CacheStatsMBean.class, redisCacheStatsMBean, CacheStatsMBean.TYPE, redisCacheStatsMBean.getName())); return redisCache; } diff --git a/oak-segment-tar/.DS_Store b/oak-segment-tar/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..58afdf1c24279486e0d940fc09461f4b0b3109d1 GIT binary patch literal 6148 zcmeHKy-ve05I)lgMPlj5z~DDPofuf$5=Is>vOrr@BpRiHcF!~L0w7+18Ht^D;VJme zcTficBSLT|*`IwsKIfBS`-sSmR?`7dpNMiaM#qB=VRffzL!H^^c#T0hsjEfQ?yBv# z1Mj^@*K|db`7GW4$!cw>>Y^CW>oGL>-qX#|&i(T+wNAgWE-sQ)hXG-OR$K^+Rn)~5$|MB1@=5DP~)$1L6<&*9syS?Lmm>2`bfH7bU{7(jOXS3v6g4P=Y z#(**K&H$ee9*r?5HiGf!Ko?5@Ua@gg5)Qprzo6I% zN;o+!KAdKLD_&g8j`e+XCl>^*HwKJ>HUmAG_WAxl#4poXGSxm^=PMPEbQ0t0D^Jr5r7GwBiqp^cF$w@1;s{?S7Ch&2iij*5@MY(@B<9I E0xsc5K>z>% literal 0 HcmV?d00001 diff --git a/oak-segment-tar/src/.DS_Store b/oak-segment-tar/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ae5846cde3ad32f9fe9a3fff0e056af8b7486921 GIT binary patch literal 6148 zcmeHKJ5Iwu5S;}VmS`eG0ixN88h7b1k?E0g0SJj8QXEGj^u7cqprGIg)SQ4Da1!3z zS%_CylnB9$wEJe~vtvKWyB-m7qq}J#G7ym*gXpOA2+h5&tr$$F;~tCaVtm!qtDa4M ztBKE^NiCN$mu2$&hkKK*uWqVpvS?__PwtE5!`sVg>Ysk=U)^-LIXXuw>aJxbx3W&^ z?!G>CecigxkHbyfm|HiSx_$nn?!htZnivDdfH7bU{BH(uXH)VWMVpNQW55{rWPs;` z#~_vwTg7m6UQ_qb+N^8nhv{pua@W&W%Sv9Ukc&T`|etA9K vwI1UFgTlC$3Iuxc6MzNJk^SIQzo(A4GGeR9U1$&KK>HC0gxF*Z`~U;*mX=4V literal 0 HcmV?d00001 diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/.DS_Store b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9eff97ca3dcfbbcd32883b144631a04874de1be1 GIT binary patch literal 6148 zcmeHKy-veG47S@2kznYEnC=z&2BD+_a~CFrO8Ju#r2~kCAy2|npstL(7N38hIT0}; zMD6PC^V#Qf@L;LqrROjui9oau*hFE$+J)B zhVH4R>+Jc9*XO>kX{%~gw=39+?bBj={PKR1``17EH+Ma54iiF=_kmjc>MZZ*^sVpf z=RLnT+vWAxrrqTo@@IL+@|{D1fnXpQ2nP0?0n}`f;=nNaU?3O>2EG`O{UM7xoh_ zC!J1Q8b%)s1Oqt(V;fGT{x9%X8ocD^Au$RDf`Na=08grAHOEVNZTqLP-*HR4BQjCG@BS-2qe-a)3(y=p?Rm860z&HpfA<+c`zrer;5@|%i literal 0 HcmV?d00001 diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java index e887a438281..6bd79f5b38d 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.segment.util.SafeEncode; import org.apache.jackrabbit.oak.spi.blob.BlobStore; @@ -227,12 +227,12 @@ public SegmentBlob readBlob(@NotNull RecordId id) { } @NotNull - public AbstractCacheStats getStringCacheStats() { + public CacheStats getStringCacheStats() { return stringCache.getStats(); } @NotNull - public AbstractCacheStats getTemplateCacheStats() { + public CacheStats getTemplateCacheStats() { return templateCache.getStats(); } } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java index 9d52fce3148..09177ea1852 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java @@ -25,18 +25,14 @@ import java.util.Arrays; import java.util.function.Function; -import org.apache.jackrabbit.oak.cache.api.Weigher; -import org.apache.jackrabbit.guava.common.cache.CacheStats; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; - - /** * A cache consisting of a fast and slow component. The fast cache for small items is based * on an array, and a slow one uses a LIRS cache. @@ -62,7 +58,7 @@ public abstract class ReaderCache { private final Cache cache; @NotNull - private final AbstractCacheStats cacheStats; + private final CacheStats cacheStats; /** * Create a new string cache. @@ -84,11 +80,11 @@ protected ReaderCache(long maxWeight, int averageWeight, .weigher(weigher::weigh) .build() .asOakCache(); - cacheStats = new CacheStatsAdapter(cache, name, weigher, maxWeight); + cacheStats = new CacheStats(cache, name, weigher, maxWeight); } @NotNull - public AbstractCacheStats getStats() { + public CacheStats getStats() { return cacheStats; } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java index ae632c28fbd..2ca4c32253a 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java @@ -23,8 +23,8 @@ import java.util.concurrent.atomic.LongAdder; import java.util.function.Supplier; -import org.apache.jackrabbit.guava.common.cache.CacheStats; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; +import org.apache.jackrabbit.oak.cache.api.CacheCounters; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.jetbrains.annotations.NotNull; @@ -51,7 +51,7 @@ public void put(@NotNull K key, @NotNull RecordId value, byte cost) { * @return access statistics for this cache */ @NotNull - public abstract CacheStats getStats(); + public abstract CacheCounters getStats(); /** * Factory method for creating {@code RecordCache} instances. The returned @@ -110,8 +110,8 @@ static final Supplier> emptyFactory() { } @Override - public @NotNull CacheStats getStats() { - return new CacheStats(0, missCount.sum(), 0, 0, 0, 0); + public @NotNull CacheCounters getStats() { + return new CacheCounters(0, missCount.sum(), 0, 0, 0, 0); } @Override @@ -146,10 +146,10 @@ private static class Default extends RecordCache { private final LongAdder loadCount = new LongAdder(); @Override - public @NotNull CacheStats getStats() { - org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot snapshot = cache.stats(); + public @NotNull CacheCounters getStats() { + CacheCounters snapshot = cache.stats(); // any addition to the cache counts as load by our definition - return new CacheStats(snapshot.hitCount(), snapshot.missCount(), + return new CacheCounters(snapshot.hitCount(), snapshot.missCount(), loadCount.sum(), 0, 0, snapshot.evictionCount()); } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java index b5e92fce005..3edacb07bf4 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java @@ -22,8 +22,8 @@ import java.util.function.Supplier; -import org.apache.jackrabbit.guava.common.cache.CacheStats; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheCounters; import org.jetbrains.annotations.NotNull; /** @@ -32,7 +32,7 @@ public class RecordCacheStats extends AbstractCacheStats { @NotNull - private final Supplier stats; + private final Supplier stats; @NotNull private final Supplier elementCount; @@ -42,7 +42,7 @@ public class RecordCacheStats extends AbstractCacheStats { public RecordCacheStats( @NotNull String name, - @NotNull Supplier stats, + @NotNull Supplier stats, @NotNull Supplier elementCount, @NotNull Supplier weight) { super(name); @@ -52,7 +52,7 @@ public RecordCacheStats( } @Override - protected CacheStats getCurrentStats() { + protected CacheCounters getCurrentStats() { return stats.get(); } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java index 582a3374685..90e686d88c5 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java @@ -29,10 +29,10 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Supplier; -import org.apache.jackrabbit.guava.common.cache.CacheStats; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; +import org.apache.jackrabbit.oak.cache.api.CacheCounters; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.segment.CacheWeights.SegmentCacheWeigher; import org.jetbrains.annotations.NotNull; @@ -344,8 +344,8 @@ protected Stats(@NotNull String name, long maximumWeight, @NotNull Supplier Supplier accumulateRecordCacheStats( + private static Supplier accumulateRecordCacheStats( final Iterable> caches) { - return new Supplier() { - @Override - public CacheStats get() { - CacheStats stats = new CacheStats(0, 0, 0, 0, 0, 0); - for (RecordCache cache : caches) { - stats = stats.plus(cache.getStats()); - } - return stats; + return () -> { + long hits = 0, misses = 0, loads = 0, failures = 0, loadTime = 0, evictions = 0; + for (RecordCache cache : caches) { + CacheCounters s = cache.getStats(); + hits += s.hitCount(); + misses += s.missCount(); + loads += s.loadSuccessCount(); + failures += s.loadFailureCount(); + loadTime += s.totalLoadTime(); + evictions += s.evictionCount(); } + return new CacheCounters(hits, misses, loads, failures, loadTime, evictions); }; } @@ -399,12 +402,7 @@ public Long get() { @Override public CacheStatsMBean getNodeCacheStats() { return new RecordCacheStats("Node deduplication cache stats", - new Supplier() { - @Override - public CacheStats get() { - return nodeCache().getStats(); - } - }, + () -> nodeCache().getStats(), new Supplier() { @Override public Long get() { diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java index 209d1580290..1b33202eabf 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java @@ -37,7 +37,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.apache.jackrabbit.guava.common.cache.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheCounters; import org.apache.jackrabbit.oak.cache.api.Weigher; /** @@ -400,8 +400,8 @@ private static String toString(AtomicInteger[] ints) { * @return access statistics for this cache */ @NotNull - public CacheStats getStats() { - return new CacheStats(hitCount.sum(), missCount.sum(), loadCount.sum(), + public CacheCounters getStats() { + return new CacheCounters(hitCount.sum(), missCount.sum(), loadCount.sum(), loadExceptionCount.sum(), 0, evictionCount.sum()); } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java index a29148852ed..b874fbe87a2 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java @@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Supplier; -import org.apache.jackrabbit.guava.common.cache.CacheStats; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheCounters; import org.jetbrains.annotations.NotNull; public class SegmentCacheStats extends AbstractCacheStats { @@ -72,8 +72,8 @@ public SegmentCacheStats(@NotNull String name, } @Override - protected CacheStats getCurrentStats() { - return new CacheStats( + protected CacheCounters getCurrentStats() { + return new CacheCounters( hitCount.get(), missCount.get(), loadSuccessCount.get(), diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java index bfb8850ee91..2873379f6b0 100644 --- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java +++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java @@ -191,7 +191,7 @@ public void loadExceptionCount() { assertEquals(0, cache.getStats().evictionCount()); assertEquals(success, cache.size()); - assertEquals(failure, cache.getStats().loadExceptionCount()); + assertEquals(failure, cache.getStats().loadFailureCount()); } } diff --git a/oak-store-composite/.DS_Store b/oak-store-composite/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3896e81e4b5cdde0aecba41303b36501cb790e73 GIT binary patch literal 6148 zcmeHKu}%Xq40UJ)C$Usah$#yn(3L5aV@K)_KwDIX9#^33_YwR6V&?;3M*IW=V&o6l zc#hrn0tX{PU`xqMVmtOd>5`a;T<>z!CF&4ShQ{c4&>+0rs9I5DRyy9J+aH$2G_JN) z_uGMUZ_x#v({M7b=YRFQ)D&f&4<_XRE7{Z8&gsp|!){$W`bIlFsqMOU05@8t866?w zn2u?dMBTXG{;03VzP*0C+k1WF*vTG6xy;}znqb1mn?xE|vhm#d9BHt|i#VD+a|%5E_URSD?5$Eis(9W8JG= zP^<*SotzdQP9x8Y7Z;;re;>`s1wreL0b?L#pe54|-~apgWg3h8)Wv4TfHCmL7;x>p zpZD-ldbfW1Jico^+94VX+f_V(V4OSxFyV7#Gb%;zc?`RtSPAkjydK?w_7I4KSZ56U G00Zye)=M4$ literal 0 HcmV?d00001 diff --git a/oak-store-document/.DS_Store b/oak-store-document/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f637c3e1e3b7791d68367f2ef9381d8e966d19fc GIT binary patch literal 6148 zcmeHKJ5Iwu5S=9v1VNFK(j6UAasXt4sh~iFk^=HkKuT~FlHM1f;{u3N&*-M9fysXo5G_9=b!#`?W5y^+ue7+_sl(d@pJ|AV$$oVZU(##6Jx*_Fa{RI0D3k{X-&{Z zW55_N1||&f_aT5XhKh-x|8!vRM*v_EW-plYS%Px{#ZWO3ga_gz6)34rj~GtUVGlGe zR7?aVotz#%oK|*vLUF!2?jQJYa-pD&#(*)9WuPFJW$yob^Uwd;B)c*OjDdf}fGbAz zsD>?RZ_RCvdu;$cg|cv5A~;FG#J6I^ax30|dVxLQ2{2Sl1Yv>LkASDa24i5M4157$ CWNs1w literal 0 HcmV?d00001 diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java index 4b4de76757c..692e9a7d1e4 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java @@ -17,6 +17,7 @@ package org.apache.jackrabbit.oak.plugins.document; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.json.JsopReader; import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; import org.jetbrains.annotations.NotNull; @@ -69,7 +70,7 @@ abstract Entry newEntry(@NotNull RevisionVector from, * @return the statistics for this cache. */ @NotNull - abstract Iterable getStats(); + abstract Iterable getStats(); /** * Invalidates all the entries in the cache. diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java index 25da5cd45a2..fc0d83b783d 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java @@ -77,6 +77,7 @@ import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.PerfLogger; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; @@ -416,7 +417,7 @@ public final class DocumentNodeStore * Key: PathRev, value: DocumentNodeState */ private final Cache nodeCache; - private final AbstractCacheStats nodeCacheStats; + private final CacheStats nodeCacheStats; /** * Child node cache. @@ -424,7 +425,7 @@ public final class DocumentNodeStore * Key: PathRev, value: Children */ private final Cache nodeChildrenCache; - private final AbstractCacheStats nodeChildrenCacheStats; + private final CacheStats nodeChildrenCacheStats; /** * The change log to keep track of commits for diff operations. @@ -1279,16 +1280,16 @@ public ClusterNodeInfo getClusterInfo() { return clusterNodeInfo; } - public AbstractCacheStats getNodeCacheStats() { + public CacheStats getNodeCacheStats() { return nodeCacheStats; } - public AbstractCacheStats getNodeChildrenCacheStats() { + public CacheStats getNodeChildrenCacheStats() { return nodeChildrenCacheStats; } @NotNull - public Iterable getDiffCacheStats() { + public Iterable getDiffCacheStats() { return diffCache.getStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java index 94ca8f2c90c..cca5a8bf99d 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java @@ -38,7 +38,7 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.CacheValue; @@ -959,17 +959,17 @@ public Cache buildPrevDocumentsCache(DocumentStore do public NodeDocumentCache buildNodeDocumentCache(DocumentStore docStore, NodeDocumentLocks locks) { Cache nodeDocumentsCache = buildDocumentCache(docStore); - AbstractCacheStats nodeDocumentsCacheStats = newCacheStatsAdapter(nodeDocumentsCache, "Document-Documents", getDocumentCacheSize()); + CacheStats nodeDocumentsCacheStats = newCacheStatsAdapter(nodeDocumentsCache, "Document-Documents", getDocumentCacheSize()); Cache prevDocumentsCache = buildPrevDocumentsCache(docStore); - AbstractCacheStats prevDocumentsCacheStats = newCacheStatsAdapter(prevDocumentsCache, "Document-PrevDocuments", getPrevDocumentCacheSize()); + CacheStats prevDocumentsCacheStats = newCacheStatsAdapter(prevDocumentsCache, "Document-PrevDocuments", getPrevDocumentCacheSize()); return new NodeDocumentCache(nodeDocumentsCache, nodeDocumentsCacheStats, prevDocumentsCache, prevDocumentsCacheStats, locks); } @SuppressWarnings({"unchecked", "rawtypes"}) - AbstractCacheStats newCacheStatsAdapter(Cache cache, String name, long maxWeight) { - return new CacheStatsAdapter((Cache) cache, name, (Weigher) weigher, maxWeight); + CacheStats newCacheStatsAdapter(Cache cache, String name, long maxWeight) { + return new CacheStats((Cache) cache, name, (Weigher) weigher, maxWeight); } /** diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java index 9c48771aa37..fc9da99a1a3 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java @@ -60,6 +60,7 @@ import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean; import org.apache.jackrabbit.oak.api.jmx.PersistentCacheStatsMBean; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentNodeStoreBuilder; @@ -864,7 +865,7 @@ private void registerJMXBeans(final DocumentNodeStore store, DocumentNodeStoreBu } DocumentStore ds = store.getDocumentStore(); if (ds.getCacheStats() != null) { - for (AbstractCacheStats cacheStats : ds.getCacheStats()) { + for (CacheStats cacheStats : ds.getCacheStats()) { registerCacheStatsMBean(cacheStats); } } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java index cfb42d65c0f..2bb1648c348 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java @@ -22,7 +22,7 @@ import java.util.Set; import java.util.stream.Collectors; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Condition; import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats; import org.apache.jackrabbit.oak.plugins.document.util.Utils; @@ -431,7 +431,7 @@ T findAndUpdate(Collection collection, * @return status information about the cache */ @Nullable - Iterable getCacheStats(); + Iterable getCacheStats(); /** * @return description of the underlying storage. diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java index 2da34f667d2..4dbe51dacea 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.sort.StringSort; import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.document.util.StringValue; @@ -298,7 +298,7 @@ private void trackStats(Path path, @NotNull @Override - Iterable getStats() { + Iterable getStats() { return cache.getStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java index da42b338ef9..2eecfa639b2 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java @@ -20,10 +20,9 @@ import java.util.HashMap; import java.util.Map; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.commons.json.JsopReader; import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; @@ -46,11 +45,11 @@ public class LocalDiffCache extends DiffCache { private static int MAX_ENTRY_SIZE = 16 * 1024 * 1024; private final Cache diffCache; - private final AbstractCacheStats diffCacheStats; + private final CacheStats diffCacheStats; LocalDiffCache(DocumentNodeStoreBuilder builder) { this.diffCache = builder.buildLocalDiffCache(); - this.diffCacheStats = new CacheStatsAdapter(diffCache, + this.diffCacheStats = new CacheStats(diffCache, "Document-LocalDiff", (k, v) -> builder.getWeigher().weigh(k, v), builder.getLocalDiffCacheSize()); } @@ -108,7 +107,7 @@ private boolean exceedsSize(){ @NotNull @Override - public Iterable getStats() { + public Iterable getStats() { return Collections.singleton(diffCacheStats); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java index 8f27d8164cc..4565075e522 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java @@ -18,10 +18,9 @@ import java.util.Collections; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.util.StringValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -51,12 +50,12 @@ public class MemoryDiffCache extends DiffCache { * Key: PathRev, value: StringValue */ protected final Cache diffCache; - protected final AbstractCacheStats diffCacheStats; + protected final CacheStats diffCacheStats; protected MemoryDiffCache(DocumentNodeStoreBuilder builder) { diffCache = builder.buildMemoryDiffCache(); - diffCacheStats = new CacheStatsAdapter(diffCache, "Document-MemoryDiff", + diffCacheStats = new CacheStats(diffCache, "Document-MemoryDiff", (k, v) -> builder.getWeigher().weigh(k, v), builder.getMemoryDiffCacheSize()); } @@ -97,7 +96,7 @@ public Entry newEntry(@NotNull RevisionVector from, @NotNull @Override - public Iterable getStats() { + public Iterable getStats() { return Collections.singleton(diffCacheStats); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java index 1d817b7a462..1cbab987399 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java @@ -16,9 +16,9 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.plugins.document.util.RevisionsKey; import org.jetbrains.annotations.NotNull; @@ -93,7 +93,7 @@ public Entry newEntry(@NotNull RevisionVector from, @NotNull RevisionVector to, @NotNull @Override - public Iterable getStats() { + public Iterable getStats() { return IterableUtils.chainedIterable(localCache.getStats(), memoryCache.getStats()); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java index 4ff05d09529..2473b759dbf 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java @@ -32,9 +32,9 @@ import java.util.function.Function; import java.util.function.Predicate; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.CacheValue; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; @@ -50,7 +50,7 @@ public class NodeDocumentCache implements Closeable { private final Cache nodeDocumentsCache; - private final AbstractCacheStats nodeDocumentsCacheStats; + private final CacheStats nodeDocumentsCacheStats; /** * The previous documents cache @@ -58,16 +58,16 @@ public class NodeDocumentCache implements Closeable { * Key: StringValue, value: NodeDocument */ private final Cache prevDocumentsCache; - private final AbstractCacheStats prevDocumentsCacheStats; + private final CacheStats prevDocumentsCacheStats; private final NodeDocumentLocks locks; private final List changeTrackers; public NodeDocumentCache(@NotNull Cache nodeDocumentsCache, - @NotNull AbstractCacheStats nodeDocumentsCacheStats, + @NotNull CacheStats nodeDocumentsCacheStats, @NotNull Cache prevDocumentsCache, - @NotNull AbstractCacheStats prevDocumentsCacheStats, + @NotNull CacheStats prevDocumentsCacheStats, @NotNull NodeDocumentLocks locks) { this.nodeDocumentsCache = nodeDocumentsCache; this.nodeDocumentsCacheStats = nodeDocumentsCacheStats; @@ -319,7 +319,7 @@ public Iterable values() { return IterableUtils.chainedIterable(nodeDocumentsCache.asMap().values(), prevDocumentsCache.asMap().values()); } - public Iterable getCacheStats() { + public Iterable getCacheStats() { return Arrays.asList(nodeDocumentsCacheStats, prevDocumentsCacheStats); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java index b53fefe0417..d4b604796c7 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java @@ -33,7 +33,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.stream.Collectors; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.properties.SystemPropertySupplier; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; @@ -444,7 +444,7 @@ public WriteConcern getWriteConcern() { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return null; } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java index a683938213c..2e3e5cb86f9 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java @@ -42,8 +42,8 @@ import java.util.stream.StreamSupport; import org.apache.commons.io.IOUtils; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.CacheValue; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; @@ -2085,7 +2085,7 @@ public void dispose() { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return nodesCache.getCacheStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java index 2811d2cb4d7..96d82840e34 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java @@ -27,7 +27,7 @@ import java.util.function.Function; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheCounters; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; @@ -290,7 +290,7 @@ public long estimatedSize() { } @Override - public CacheStatsSnapshot stats() { + public CacheCounters stats() { return memCache.stats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java index c4d227afb71..597b65ad55a 100755 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java @@ -61,6 +61,7 @@ import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.CacheValue; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; import org.apache.jackrabbit.oak.commons.collections.SetUtils; @@ -836,7 +837,7 @@ private T getIfCached(Collection collection, String id, } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return nodesCache.getCacheStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java index 3223c5db290..27340684185 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.function.Supplier; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfo; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; @@ -213,7 +213,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return leaseChecking(delegate::getCacheStats); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java index 1db5af0944c..b71357aae81 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.Callable; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; @@ -366,15 +366,10 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { try { logMethod("getCacheStats"); - return logResult(new Callable>() { - @Override - public Iterable call() throws Exception { - return store.getCacheStats(); - } - }); + return logResult(store::getCacheStats); } catch (Exception e) { logException(e); throw convert(e); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java index b870da9a23e..bc9660ae6eb 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; @@ -154,7 +154,7 @@ public synchronized void setReadWriteMode(String readWriteMode) { } @Override - public synchronized Iterable getCacheStats() { + public synchronized Iterable getCacheStats() { return store.getCacheStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java index d1f6417fd21..3f062859527 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java @@ -17,6 +17,7 @@ package org.apache.jackrabbit.oak.plugins.document.util; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; @@ -233,7 +234,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return store.getCacheStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java index 4e3dbbb7083..c515d77295a 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; @@ -423,10 +423,10 @@ public void setReadWriteMode(String readWriteMode) { @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { try { long start = now(); - Iterable result = base.getCacheStats(); + Iterable result = base.getCacheStats(); updateAndLogTimes("getCacheStats", start, 0, 0); return result; } catch (Exception e) { diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java index 2d69c7fb791..f6e9b1ba383 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java @@ -18,7 +18,7 @@ import java.util.Collections; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -61,7 +61,7 @@ public boolean done() { @NotNull @Override - public Iterable getStats() { + public Iterable getStats() { return Collections.emptyList(); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java index 6289c232520..67eb5bc1453 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats; import org.jetbrains.annotations.NotNull; @@ -215,7 +215,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return delegate.getCacheStats(); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java index 4a9295fafa9..4a6a1363acf 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java @@ -18,7 +18,7 @@ import com.mongodb.client.MongoClient; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.junit.Test; import org.junit.runner.RunWith; @@ -74,11 +74,11 @@ protected DocumentMK.Builder newBuilder(MongoClient client, String dbName) throw @Test public void lazyInit() throws Exception { - Iterable cacheStats = mk.getDocumentStore().getCacheStats(); + Iterable cacheStats = mk.getDocumentStore().getCacheStats(); assertNotNull(cacheStats); assertEquals(2, IterableUtils.size(cacheStats)); - AbstractCacheStats docCacheStats = IterableUtils.get(cacheStats, 0); - AbstractCacheStats prevDocCacheStats = IterableUtils.get(cacheStats, 1); + CacheStats docCacheStats = IterableUtils.get(cacheStats, 0); + CacheStats prevDocCacheStats = IterableUtils.get(cacheStats, 1); assertEquals("Document-Documents", docCacheStats.getName()); assertEquals("Document-PrevDocuments", prevDocCacheStats.getName()); assertEquals(expectedDocCacheSize, docCacheStats.getMaxTotalWeight()); diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java index dff4d9b7d0f..d37acf496e4 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java @@ -64,7 +64,7 @@ public void buildNodeDocumentCacheStatsAreNonEmpty() { DocumentStore store = new MemoryDocumentStore(); NodeDocumentCache cache = DocumentNodeStoreBuilder.newDocumentNodeStoreBuilder() .buildNodeDocumentCache(store, new StripedNodeDocumentLocks()); - Iterable stats = cache.getCacheStats(); + Iterable stats = cache.getCacheStats(); Assert.assertNotNull(stats); Assert.assertTrue(stats.iterator().hasNext()); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java index 527239c9c4b..00612485e0e 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.plugins.document; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff; @@ -63,14 +63,14 @@ public void diff() throws Exception { merge(store, builder); } - Iterable stats = store.getDiffCacheStats(); - for (AbstractCacheStats cs : stats) { + Iterable stats = store.getDiffCacheStats(); + for (CacheStats cs : stats) { cs.resetStats(); } // must not cause cache misses Diff.perform(before, after); - for (AbstractCacheStats cs : stats) { + for (CacheStats cs : stats) { assertEquals(0, cs.getMissCount()); } } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java index aadc7ee8cc5..da286e36e1c 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats; import org.jetbrains.annotations.NotNull; @@ -150,7 +150,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return store.getCacheStats(); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java index 6bf7c3bd43c..baa9e29047e 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java @@ -22,7 +22,7 @@ import java.util.Map; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.LocalDiffCache.Diff; import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; @@ -56,7 +56,7 @@ public void simpleDiff() throws Exception{ o.reset(); DiffCache cache = store.getDiffCache(); - Iterable stats = cache.getStats(); + Iterable stats = cache.getStats(); NodeBuilder builder = store.getRoot().builder(); builder.child("a").child("a2").setProperty("foo", "bar"); @@ -118,24 +118,24 @@ private static DocumentMK create(DocumentStore ds, int clusterId){ .open(); } - private static long getHitCount(Iterable stats) { + private static long getHitCount(Iterable stats) { long hitCount = 0; - for (AbstractCacheStats cs : stats) { + for (CacheStats cs : stats) { hitCount += cs.getHitCount(); } return hitCount; } - private static long getMissCount(Iterable stats) { + private static long getMissCount(Iterable stats) { long missCount = 0; - for (AbstractCacheStats cs : stats) { + for (CacheStats cs : stats) { missCount += cs.getMissCount(); } return missCount; } - private static void resetStats(Iterable stats) { - for (AbstractCacheStats cs : stats) { + private static void resetStats(Iterable stats) { + for (CacheStats cs : stats) { cs.resetStats(); } } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java index d37ae5a3cbf..21c500b49c9 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java @@ -18,7 +18,7 @@ import java.util.UUID; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.junit.Rule; import org.junit.Test; @@ -68,7 +68,7 @@ public void getStatsReturnsNonEmptyIterable() { DiffCache cache = new MemoryDiffCache(builderProvider.newBuilder() .setCacheSegmentCount(1) .memoryCacheDistribution(0, 0, 0, 99, 0)); - Iterable statsIterable = cache.getStats(); + Iterable statsIterable = cache.getStats(); assertNotNull(statsIterable); assertTrue(statsIterable.iterator().hasNext()); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java index 3e6f1e4e063..c301d68aa38 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java @@ -25,7 +25,7 @@ import java.util.Set; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler; import org.apache.jackrabbit.oak.plugins.commit.ConflictHook; @@ -228,7 +228,7 @@ public void diffBranchBase() throws Exception { private long diffCacheRequests(DocumentNodeStore ns) { long num = 0; - for (AbstractCacheStats stats : ns.getDiffCacheStats()) { + for (CacheStats stats : ns.getDiffCacheStats()) { num += stats.getRequestCount(); } return num; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java index cbb2e1ae943..1dc85336acb 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java @@ -18,7 +18,7 @@ import java.lang.reflect.Field; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.junit.Rule; import org.junit.Test; @@ -88,7 +88,7 @@ public void newEntryExternalPopulatesMemoryCache() { @Test public void getStatsReturnsNonEmptyIterable() { TieredDiffCache cache = buildCache(); - Iterable stats = cache.getStats(); + Iterable stats = cache.getStats(); assertNotNull(stats); assertTrue(stats.iterator().hasNext()); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java index 1702a88de3e..e3cde765105 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java @@ -27,8 +27,8 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.CacheValue; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; @@ -153,8 +153,8 @@ public void testOnlyExternalChanges() { private NodeDocumentCache createCache() { Cache nodeDocumentsCache = (new CacheLIRS(10)).asOakCache(); Cache prevDocumentsCache = (new CacheLIRS(10)).asOakCache(); - AbstractCacheStats nodeDocumentsCacheStats = Mockito.mock(AbstractCacheStats.class); - AbstractCacheStats prevDocumentsCacheStats = Mockito.mock(AbstractCacheStats.class); + CacheStats nodeDocumentsCacheStats = Mockito.mock(CacheStats.class); + CacheStats prevDocumentsCacheStats = Mockito.mock(CacheStats.class); NodeDocumentLocks locks = new StripedNodeDocumentLocks(); return new NodeDocumentCache(nodeDocumentsCache, nodeDocumentsCacheStats, prevDocumentsCache, prevDocumentsCacheStats, locks); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java index eafe2607a94..95ec0567a10 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.document.cache; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; @@ -126,7 +126,7 @@ public void invalidateRemovesDocumentFromCache() { @Test public void getCacheStatsReturnsNonEmptyIterable() { - Iterable statsIterable = cache.getCacheStats(); + Iterable statsIterable = cache.getCacheStats(); assertNotNull(statsIterable); assertTrue(statsIterable.iterator().hasNext()); } diff --git a/oak-store-spi/.DS_Store b/oak-store-spi/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..329180566fb95e9e1fd6d49a42da997a65893d3f GIT binary patch literal 6148 zcmeHK%}T>S5T3O~0t)uv!ISJO^a+e%dl!0Ew5?RIF-7Y=@8UCfFNpXa9(@E)ezP;u ztVWN;pBdQwHuJMH`5?O)B67v;q)*f%q6~x4@uEdo-D=uUXEr+Cqdy#1O(-g3gd}O6Rml zvhKc~e6%-nZy!G#6faMlJK3YGRuz2Zlhm<)#C4b$1IB=7$6(AAYr%MQV2UjOunTn*thtxq7_XQs)`GA=oP+`;)M<<1BpiCLez{^T zDBoHC-SlF-T1qAElCjbw8j_gIF*gdb|mn+tSybJ4NIM99sA|W;z18ZR5 E4Pib=A^-pY literal 0 HcmV?d00001 diff --git a/oak-upgrade/.DS_Store b/oak-upgrade/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c083321e1e7af6b6e8cee8967dbf8102a3810899 GIT binary patch literal 6148 zcmeHKJ5B>J5FL{!T7@PO1yso52Dtz-(Sj)GaskLkp~$ik3H>(o+<}^7AX<7P3QA7F zd$v)$uuvidGm`!6`FOlfT8}LvW^gs>i}XY!Ln9gv8ieXb(?)cr(Qu9aa9kD(uic8a z-wxb+OO|pe zi&zB=;bMGdtP?Z8KVFQ_4!!m6Vq8G&l>ud-&Oj?nd#wM5_+=U&`SlQ;DFe#DA7j9@ z^I<-~N5$Iu>GN1?E!rs>g?<$W5R7Y=08Ds}?093aTaMx9B31#p3iUo5s22fGh<3`r H4>0fsw{u8j literal 0 HcmV?d00001 diff --git a/specs/guava-cache-removal/TASKS.md b/specs/guava-cache-removal/TASKS.md index 303b5256429..93d0fbb2bf4 100644 --- a/specs/guava-cache-removal/TASKS.md +++ b/specs/guava-cache-removal/TASKS.md @@ -20,9 +20,7 @@ This document decomposes the Oak Cache API migration plan (PLAN.md) into indepen **Remaining:** -- OAK-12157, OAK-12158 (oak-segment-tar) — not yet started -- OAK-12159 (oak-blob-plugins) — not yet started -- OAK-12161, OAK-12162 — blocked on OAK-12157, OAK-12158, OAK-12159 +- OAK-12162 — in progress on branch OAK-12161 ## Dependency Graph From e6b8a68fe568da7f5162ae5be5843cbb672a3c24 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 16 Apr 2026 15:36:03 +0530 Subject: [PATCH 02/15] OAK-12162 : renamed cachecounters to cachestatssnapshot to reduce changeset --- .../oak/cache/AbstractCacheStats.java | 12 +++---- .../jackrabbit/oak/cache/api/Cache.java | 2 +- .../jackrabbit/oak/cache/api/CacheStats.java | 2 +- ...eCounters.java => CacheStatsSnapshot.java} | 8 ++--- .../oak/cache/api/package-info.java | 2 +- .../impl/caffeine/CaffeineCacheAdapter.java | 6 ++-- .../oak/cache/impl/lirs/LirsCacheAdapter.java | 6 ++-- .../oak/cache/api/CacheStatsTest.java | 34 +++++++++---------- .../oak/cache/impl/CacheBuilderTest.java | 4 +-- .../caffeine/CaffeineCacheAdapterTest.java | 4 +-- .../cache/impl/lirs/LirsCacheAdapterTest.java | 4 +-- .../oak/cache/impl/CacheStatsMetricsTest.java | 6 ++-- .../jackrabbit/oak/segment/RecordCache.java | 14 ++++---- .../oak/segment/RecordCacheStats.java | 8 ++--- .../jackrabbit/oak/segment/SegmentCache.java | 6 ++-- .../segment/SegmentNodeStoreRegistrar.java | 13 +++---- .../oak/segment/WriterCacheManager.java | 8 ++--- .../oak/segment/file/PriorityCache.java | 6 ++-- .../persistentcache/SegmentCacheStats.java | 6 ++-- .../document/persistentCache/NodeCache.java | 4 +-- 20 files changed, 78 insertions(+), 77 deletions(-) rename oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/{CacheCounters.java => CacheStatsSnapshot.java} (95%) diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java index 398bed559db..07fe7e09695 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean; import org.jetbrains.annotations.NotNull; @@ -38,8 +38,8 @@ public abstract class AbstractCacheStats extends AnnotatedStandardMBean implemen @NotNull private final String name; - private CacheCounters lastSnapshot = - new CacheCounters(0, 0, 0, 0, 0, 0); + private CacheStatsSnapshot lastSnapshot = + new CacheStatsSnapshot(0, 0, 0, 0, 0, 0); /** * Create a new {@code CacheStatsMBean} for a cache with the given {@code name}. @@ -51,12 +51,12 @@ protected AbstractCacheStats(@NotNull String name) { } /** - * Call back invoked to retrieve the most recent {@link CacheCounters} of the + * Call back invoked to retrieve the most recent {@link CacheStatsSnapshot} of the * underlying cache. */ - protected abstract CacheCounters getCurrentStats(); + protected abstract CacheStatsSnapshot getCurrentStats(); - private CacheCounters stats() { + private CacheStatsSnapshot stats() { return getCurrentStats().minus(lastSnapshot); } diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java index 4c14db3f2da..252383fe561 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java @@ -115,7 +115,7 @@ public interface Cache { * @return a stats snapshot (never null) */ @NotNull - CacheCounters stats(); + CacheStatsSnapshot stats(); /** * Returns a view of the entries stored in this cache as a thread-safe map. diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java index 03acbde1e78..14433f982d9 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java @@ -53,7 +53,7 @@ public CacheStats( } @Override - protected CacheCounters getCurrentStats() { + protected CacheStatsSnapshot getCurrentStats() { return cache.stats(); } diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheCounters.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java similarity index 95% rename from oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheCounters.java rename to oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java index 335e2ed7db2..80fbb0805e8 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheCounters.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java @@ -22,7 +22,7 @@ * An immutable snapshot of cache statistics at a point in time. * *

Returned by {@link Cache#stats()}. All counters are cumulative since - * the cache was created. Use {@link #minus(CacheCounters)} to compute a delta + * the cache was created. Use {@link #minus(CacheStatsSnapshot)} to compute a delta * between two snapshots.

* * @param hitCount number of times a requested key was found in the cache @@ -32,7 +32,7 @@ * @param totalLoadTime total time spent loading new values, in nanoseconds * @param evictionCount number of entries evicted from the cache */ -public record CacheCounters( +public record CacheStatsSnapshot( long hitCount, long missCount, long loadSuccessCount, @@ -120,8 +120,8 @@ public double averageLoadPenalty() { * @return a new snapshot representing the delta */ @NotNull - public CacheCounters minus(@NotNull CacheCounters other) { - return new CacheCounters( + public CacheStatsSnapshot minus(@NotNull CacheStatsSnapshot other) { + return new CacheStatsSnapshot( Math.max(0, hitCount - other.hitCount), Math.max(0, missCount - other.missCount), Math.max(0, loadSuccessCount - other.loadSuccessCount), diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java index a79ed0f7b30..ce415459ccb 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java @@ -19,7 +19,7 @@ * For Oak internal use only. Do not use outside Oak components. */ @Internal(since = "1.0.0") -@Version("1.1.0") +@Version("2.0.0") package org.apache.jackrabbit.oak.cache.api; import org.apache.jackrabbit.oak.commons.annotations.Internal; diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java index c11dfe973a3..cc11a8cd3a3 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java @@ -21,7 +21,7 @@ import java.util.function.Function; import com.github.benmanes.caffeine.cache.RemovalCause; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.jetbrains.annotations.NotNull; @@ -74,9 +74,9 @@ public long estimatedSize() { @Override @NotNull - public CacheCounters stats() { + public CacheStatsSnapshot stats() { com.github.benmanes.caffeine.cache.stats.CacheStats s = cache.stats(); - return new CacheCounters( + return new CacheStatsSnapshot( s.hitCount(), s.missCount(), s.loadSuccessCount(), s.loadFailureCount(), s.totalLoadTime(), s.evictionCount()); diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java index 55a2fbd79c8..02fbf7f44c9 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java @@ -24,7 +24,7 @@ import org.apache.jackrabbit.guava.common.cache.RemovalCause; import org.apache.jackrabbit.oak.cache.CacheLIRS; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.jetbrains.annotations.NotNull; @@ -85,9 +85,9 @@ public long estimatedSize() { @Override @NotNull - public CacheCounters stats() { + public CacheStatsSnapshot stats() { org.apache.jackrabbit.guava.common.cache.CacheStats s = cache.stats(); - return new CacheCounters( + return new CacheStatsSnapshot( s.hitCount(), s.missCount(), s.loadSuccessCount(), s.loadExceptionCount(), s.totalLoadTime(), s.evictionCount()); diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java index c6777086b0b..e33f80fb905 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java @@ -19,55 +19,55 @@ import org.junit.Assert; import org.junit.Test; -/** Tests for {@link CacheCounters}. */ +/** Tests for {@link CacheStatsSnapshot}. */ public class CacheStatsTest { - private CacheCounters stats(long hits, long misses, long loadSuccess, long loadFail, - long loadTime, long evictions) { - return new CacheCounters(hits, misses, loadSuccess, loadFail, loadTime, evictions); + private CacheStatsSnapshot stats(long hits, long misses, long loadSuccess, long loadFail, + long loadTime, long evictions) { + return new CacheStatsSnapshot(hits, misses, loadSuccess, loadFail, loadTime, evictions); } /** Verifies that {@code requestCount()} returns the sum of hits and misses. */ @Test public void requestCountIsHitsPlusMisses() { - CacheCounters s = stats(3, 7, 0, 0, 0, 0); + CacheStatsSnapshot s = stats(3, 7, 0, 0, 0, 0); Assert.assertEquals(10, s.requestCount()); } /** Verifies that {@code hitRate()} returns hits divided by total requests. */ @Test public void hitRateWithRequests() { - CacheCounters s = stats(3, 7, 0, 0, 0, 0); + CacheStatsSnapshot s = stats(3, 7, 0, 0, 0, 0); Assert.assertEquals(0.3, s.hitRate(), 0.001); } /** Verifies that {@code hitRate()} returns {@code 1.0} when no requests have been made. */ @Test public void hitRateWithNoRequestsReturnsOne() { - CacheCounters s = stats(0, 0, 0, 0, 0, 0); + CacheStatsSnapshot s = stats(0, 0, 0, 0, 0, 0); Assert.assertEquals(1.0, s.hitRate(), 0.0); } /** Verifies that {@code missRate()} returns misses divided by total requests. */ @Test public void missRateWithRequests() { - CacheCounters s = stats(3, 7, 0, 0, 0, 0); + CacheStatsSnapshot s = stats(3, 7, 0, 0, 0, 0); Assert.assertEquals(0.7, s.missRate(), 0.001); } /** Verifies that {@code missRate()} returns {@code 0.0} when no requests have been made. */ @Test public void missRateWithNoRequestsReturnsZero() { - CacheCounters s = stats(0, 0, 0, 0, 0, 0); + CacheStatsSnapshot s = stats(0, 0, 0, 0, 0, 0); Assert.assertEquals(0.0, s.missRate(), 0.0); } /** Verifies that {@code minus()} produces the correct per-field delta between two snapshots. */ @Test public void minusProducesDelta() { - CacheCounters later = stats(10, 5, 4, 1, 1000, 3); - CacheCounters earlier = stats(6, 3, 2, 0, 400, 1); - CacheCounters delta = later.minus(earlier); + CacheStatsSnapshot later = stats(10, 5, 4, 1, 1000, 3); + CacheStatsSnapshot earlier = stats(6, 3, 2, 0, 400, 1); + CacheStatsSnapshot delta = later.minus(earlier); Assert.assertEquals(4, delta.hitCount()); Assert.assertEquals(2, delta.missCount()); @@ -80,9 +80,9 @@ public void minusProducesDelta() { /** Verifies that {@code minus()} clamps negative deltas to zero when the earlier snapshot has larger values. */ @Test public void minusClampsNegativeValuesToZero() { - CacheCounters later = stats(5, 2, 1, 0, 100, 1); - CacheCounters earlier = stats(9, 3, 2, 1, 200, 2); - CacheCounters delta = later.minus(earlier); + CacheStatsSnapshot later = stats(5, 2, 1, 0, 100, 1); + CacheStatsSnapshot earlier = stats(9, 3, 2, 1, 200, 2); + CacheStatsSnapshot delta = later.minus(earlier); Assert.assertEquals(0, delta.hitCount()); Assert.assertEquals(0, delta.missCount()); @@ -95,7 +95,7 @@ public void minusClampsNegativeValuesToZero() { /** Verifies that all record accessors return the values supplied to the canonical constructor. */ @Test public void accessorsReturnConstructorValues() { - CacheCounters s = stats(1, 2, 3, 4, 5, 6); + CacheStatsSnapshot s = stats(1, 2, 3, 4, 5, 6); Assert.assertEquals(1, s.hitCount()); Assert.assertEquals(2, s.missCount()); Assert.assertEquals(3, s.loadSuccessCount()); @@ -107,7 +107,7 @@ public void accessorsReturnConstructorValues() { /** Verifies that {@code toString()} includes every field name and its value. */ @Test public void toStringContainsAllFields() { - CacheCounters s = stats(1, 2, 3, 4, 5, 6); + CacheStatsSnapshot s = stats(1, 2, 3, 4, 5, 6); String str = s.toString(); Assert.assertTrue(str.contains("hitCount=1")); Assert.assertTrue(str.contains("missCount=2")); diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java index 763f3f6ec38..6a87b1dfb51 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.LoadingCache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; @@ -179,7 +179,7 @@ public void statsReturnsCorrectHitMissCounts() { cache.getIfPresent("k"); cache.getIfPresent("missing"); - CacheCounters stats = cache.stats(); + CacheStatsSnapshot stats = cache.stats(); Assert.assertNotNull(stats); Assert.assertEquals(1, stats.hitCount()); Assert.assertEquals(1, stats.missCount()); diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java index 1111309f9ad..cda9f1ff4da 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java @@ -20,7 +20,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.RemovalCause; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.junit.Assert; import org.junit.Test; @@ -45,7 +45,7 @@ public void statsSnapshotReflectsUnderlyingCacheStats() { adapter.getIfPresent("hit"); adapter.getIfPresent("miss"); - CacheCounters stats = adapter.stats(); + CacheStatsSnapshot stats = adapter.stats(); Assert.assertEquals(1, stats.hitCount()); Assert.assertEquals(1, stats.missCount()); } diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java index 16864bd7696..b231067c660 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java @@ -21,7 +21,7 @@ import org.apache.jackrabbit.guava.common.cache.RemovalCause; import org.apache.jackrabbit.oak.cache.CacheLIRS; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.junit.Assert; import org.junit.Test; @@ -51,7 +51,7 @@ public void statsSnapshotReflectsUnderlyingCacheStats() { adapter.getIfPresent("hit"); adapter.getIfPresent("miss"); - CacheCounters stats = adapter.stats(); + CacheStatsSnapshot stats = adapter.stats(); Assert.assertEquals(1, stats.hitCount()); Assert.assertEquals(1, stats.missCount()); } diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java index 48c81af39c0..9a3deb4304d 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java @@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.jetbrains.annotations.NotNull; import org.junit.Test; @@ -95,8 +95,8 @@ private static class TestStats extends AbstractCacheStats { } @Override - protected CacheCounters getCurrentStats() { - return new CacheCounters(HIT_COUNT, MISS_COUNT, MISS_COUNT, 0, LOAD_TIME, EVICTION_COUNT); + protected CacheStatsSnapshot getCurrentStats() { + return new CacheStatsSnapshot(HIT_COUNT, MISS_COUNT, MISS_COUNT, 0, LOAD_TIME, EVICTION_COUNT); } @Override diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java index 2ca4c32253a..76016737431 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java @@ -24,7 +24,7 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.jetbrains.annotations.NotNull; @@ -51,7 +51,7 @@ public void put(@NotNull K key, @NotNull RecordId value, byte cost) { * @return access statistics for this cache */ @NotNull - public abstract CacheCounters getStats(); + public abstract CacheStatsSnapshot getStats(); /** * Factory method for creating {@code RecordCache} instances. The returned @@ -110,8 +110,8 @@ static final Supplier> emptyFactory() { } @Override - public @NotNull CacheCounters getStats() { - return new CacheCounters(0, missCount.sum(), 0, 0, 0, 0); + public @NotNull CacheStatsSnapshot getStats() { + return new CacheStatsSnapshot(0, missCount.sum(), 0, 0, 0, 0); } @Override @@ -146,10 +146,10 @@ private static class Default extends RecordCache { private final LongAdder loadCount = new LongAdder(); @Override - public @NotNull CacheCounters getStats() { - CacheCounters snapshot = cache.stats(); + public @NotNull CacheStatsSnapshot getStats() { + CacheStatsSnapshot snapshot = cache.stats(); // any addition to the cache counts as load by our definition - return new CacheCounters(snapshot.hitCount(), snapshot.missCount(), + return new CacheStatsSnapshot(snapshot.hitCount(), snapshot.missCount(), loadCount.sum(), 0, 0, snapshot.evictionCount()); } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java index 3edacb07bf4..8ddef871521 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java @@ -23,7 +23,7 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.jetbrains.annotations.NotNull; /** @@ -32,7 +32,7 @@ public class RecordCacheStats extends AbstractCacheStats { @NotNull - private final Supplier stats; + private final Supplier stats; @NotNull private final Supplier elementCount; @@ -42,7 +42,7 @@ public class RecordCacheStats extends AbstractCacheStats { public RecordCacheStats( @NotNull String name, - @NotNull Supplier stats, + @NotNull Supplier stats, @NotNull Supplier elementCount, @NotNull Supplier weight) { super(name); @@ -52,7 +52,7 @@ public RecordCacheStats( } @Override - protected CacheCounters getCurrentStats() { + protected CacheStatsSnapshot getCurrentStats() { return stats.get(); } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java index 90e686d88c5..e36d541103e 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java @@ -32,7 +32,7 @@ import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.segment.CacheWeights.SegmentCacheWeigher; import org.jetbrains.annotations.NotNull; @@ -344,8 +344,8 @@ protected Stats(@NotNull String name, long maximumWeight, @NotNull Supplier Supplier accumulateRecordCacheStats( + private static Supplier accumulateRecordCacheStats( final Iterable> caches) { return () -> { long hits = 0, misses = 0, loads = 0, failures = 0, loadTime = 0, evictions = 0; for (RecordCache cache : caches) { - CacheCounters s = cache.getStats(); + CacheStatsSnapshot s = cache.getStats(); hits += s.hitCount(); misses += s.missCount(); loads += s.loadSuccessCount(); @@ -364,7 +364,7 @@ private static Supplier accumulateRecordCacheStats( loadTime += s.totalLoadTime(); evictions += s.evictionCount(); } - return new CacheCounters(hits, misses, loads, failures, loadTime, evictions); + return new CacheStatsSnapshot(hits, misses, loads, failures, loadTime, evictions); }; } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java index 1b33202eabf..58dc75f6c37 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java @@ -37,7 +37,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Weigher; /** @@ -400,8 +400,8 @@ private static String toString(AtomicInteger[] ints) { * @return access statistics for this cache */ @NotNull - public CacheCounters getStats() { - return new CacheCounters(hitCount.sum(), missCount.sum(), loadCount.sum(), + public CacheStatsSnapshot getStats() { + return new CacheStatsSnapshot(hitCount.sum(), missCount.sum(), loadCount.sum(), loadExceptionCount.sum(), 0, evictionCount.sum()); } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java index b874fbe87a2..cf2ecbc79c0 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java @@ -24,7 +24,7 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.jetbrains.annotations.NotNull; public class SegmentCacheStats extends AbstractCacheStats { @@ -72,8 +72,8 @@ public SegmentCacheStats(@NotNull String name, } @Override - protected CacheCounters getCurrentStats() { - return new CacheCounters( + protected CacheStatsSnapshot getCurrentStats() { + return new CacheStatsSnapshot( hitCount.get(), missCount.get(), loadSuccessCount.get(), diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java index 96d82840e34..2811d2cb4d7 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java @@ -27,7 +27,7 @@ import java.util.function.Function; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheCounters; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; @@ -290,7 +290,7 @@ public long estimatedSize() { } @Override - public CacheCounters stats() { + public CacheStatsSnapshot stats() { return memCache.stats(); } From b462d58010a01af2c20a47d84120e1da42f28cdb Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 16 Apr 2026 15:38:31 +0530 Subject: [PATCH 03/15] OAK-12162 : renamed cachestats to CacheStatsAdapter --- .../oak/plugins/blob/CachingBlobStore.java | 8 ++++---- .../jackrabbit/oak/plugins/blob/FileCache.java | 4 ++-- .../blob/datastore/DataStoreBlobStore.java | 9 ++++----- .../{CacheStats.java => CacheStatsAdapter.java} | 4 ++-- .../oak/cache/AbstractCacheStatsTest.java | 8 ++++---- ...StatsTest.java => CacheStatsAdapterTest.java} | 2 +- .../oak/cache/impl/CacheBuilderTest.java | 4 ++-- .../index/lucene/LuceneIndexProviderService.java | 4 ++-- .../document/DocumentStoreIndexerBase.java | 4 ++-- .../plugins/index/search/ExtractedTextCache.java | 9 ++++----- .../oak/segment/CachingSegmentReader.java | 6 +++--- .../jackrabbit/oak/segment/ReaderCache.java | 9 ++++----- .../oak/segment/SegmentNodeStoreRegistrar.java | 14 +++++++------- .../oak/plugins/document/DiffCache.java | 5 ++--- .../oak/plugins/document/DocumentNodeStore.java | 13 ++++++------- .../document/DocumentNodeStoreBuilder.java | 10 +++++----- .../document/DocumentNodeStoreService.java | 4 ++-- .../oak/plugins/document/DocumentStore.java | 4 ++-- .../oak/plugins/document/JournalDiffLoader.java | 4 ++-- .../oak/plugins/document/LocalDiffCache.java | 8 ++++---- .../oak/plugins/document/MemoryDiffCache.java | 8 ++++---- .../oak/plugins/document/TieredDiffCache.java | 4 ++-- .../document/cache/NodeDocumentCache.java | 12 ++++++------ .../document/memory/MemoryDocumentStore.java | 4 ++-- .../document/mongo/MongoDocumentStore.java | 4 ++-- .../plugins/document/rdb/RDBDocumentStore.java | 5 ++--- .../util/LeaseCheckDocumentStoreWrapper.java | 4 ++-- .../util/LoggingDocumentStoreWrapper.java | 4 ++-- .../util/SynchronizingDocumentStoreWrapper.java | 4 ++-- .../util/ThrottlingDocumentStoreWrapper.java | 5 ++--- .../util/TimingDocumentStoreWrapper.java | 6 +++--- .../oak/plugins/document/AmnesiaDiffCache.java | 4 ++-- .../plugins/document/CountingDocumentStore.java | 4 ++-- .../plugins/document/DocumentMKBuilderTest.java | 8 ++++---- .../document/DocumentNodeStoreBuilderTest.java | 2 +- .../document/DocumentNodeStoreDiffTest.java | 8 ++++---- .../plugins/document/DocumentStoreWrapper.java | 4 ++-- .../oak/plugins/document/LocalDiffCacheTest.java | 16 ++++++++-------- .../plugins/document/MemoryDiffCacheTest.java | 4 ++-- .../oak/plugins/document/NodeStoreDiffTest.java | 4 ++-- .../plugins/document/TieredDiffCacheTest.java | 4 ++-- .../document/cache/CacheChangesTrackerTest.java | 6 +++--- .../document/cache/NodeDocumentCacheTest.java | 4 ++-- 43 files changed, 127 insertions(+), 134 deletions(-) rename oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/{CacheStats.java => CacheStatsAdapter.java} (96%) rename oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/{CacheStatsTest.java => CacheStatsAdapterTest.java} (99%) diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java index 3bbd16fb32b..46a6939a531 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.plugins.blob; import org.apache.jackrabbit.oak.cache.CacheLIRS; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.cache.api.LoadingCache; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.StringUtils; @@ -47,7 +47,7 @@ public abstract class CachingBlobStore extends AbstractBlobStore { return (int) weight; }; - private final CacheStats cacheStats; + private final CacheStatsAdapter cacheStats; public static final String MEM_CACHE_NAME = "BlobStore-MemCache"; @@ -61,7 +61,7 @@ public CachingBlobStore(long cacheSize) { weigher(weigher::weigh). build().asOakCache(); - cacheStats = new CacheStats(cache, MEM_CACHE_NAME, weigher, cacheSize); + cacheStats = new CacheStatsAdapter(cache, MEM_CACHE_NAME, weigher, cacheSize); } public CachingBlobStore() { @@ -78,7 +78,7 @@ public long getBlobCacheSize() { return blobCacheSize; } - public CacheStats getCacheStats() { + public CacheStatsAdapter getCacheStats() { return cacheStats; } } diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java index 8c34d663bb7..94fa0bfed61 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java @@ -39,7 +39,7 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheLoader; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; @@ -423,7 +423,7 @@ private int build() { } } -class FileCacheStats extends CacheStats implements DataStoreCacheStatsMBean { +class FileCacheStats extends CacheStatsAdapter implements DataStoreCacheStatsMBean { private static final long BLOCK_SIZE = 4 * 1024; private final Weigher weigher; private final Cache cache; diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java index cd4f62eb207..9a34a3fdda7 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java @@ -52,9 +52,8 @@ import org.apache.jackrabbit.oak.api.blob.BlobDownloadOptions; import org.apache.jackrabbit.oak.api.blob.BlobUpload; import org.apache.jackrabbit.oak.api.blob.BlobUploadOptions; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; @@ -133,7 +132,7 @@ public int weigh(@NotNull String key, @NotNull byte[] value) { } }; - private final CacheStats cacheStats; + private final CacheStatsAdapter cacheStats; public static final String MEM_CACHE_NAME = "BlobStore-MemCache"; @@ -158,7 +157,7 @@ public DataStoreBlobStore(DataStore delegate, boolean encodeLengthInId, int cach .maximumWeight(cacheSize) .weigher(weigher::weigh) .build().asOakCache(); - this.cacheStats = new CacheStats(cache, MEM_CACHE_NAME, weigher, cacheSize); + this.cacheStats = new CacheStatsAdapter(cache, MEM_CACHE_NAME, weigher, cacheSize); } //~----------------------------------< DataStore > @@ -827,7 +826,7 @@ public DataStore getDataStore() { return delegate; } - public CacheStats getCacheStats() { + public CacheStatsAdapter getCacheStats() { return cacheStats; } diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java similarity index 96% rename from oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java rename to oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java index 14433f982d9..760359c0709 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java @@ -26,7 +26,7 @@ * Exposes a {@link Cache}'s statistics via the {@link org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean} * interface. */ -public class CacheStats extends AbstractCacheStats { +public class CacheStatsAdapter extends AbstractCacheStats { private final Cache cache; private final Weigher weigher; @@ -41,7 +41,7 @@ public class CacheStats extends AbstractCacheStats { * @param maxWeight configured maximum weight for the cache; {@code -1} if unbounded */ @SuppressWarnings("unchecked") - public CacheStats( + public CacheStatsAdapter( @NotNull Cache cache, @NotNull String name, @Nullable Weigher weigher, diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java index 7a4c92a38ff..f48d04b7fc0 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java @@ -18,7 +18,7 @@ import java.util.concurrent.ExecutionException; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -34,12 +34,12 @@ public class AbstractCacheStatsTest { private static final long MAX_WEIGHT = 1000; private CacheLIRS cache; - private CacheStats stats; + private CacheStatsAdapter stats; @Before public void setUp() { cache = new CacheLIRS<>(null, MAX_WEIGHT, 1, 1, 0, null, null, null); - stats = new CacheStats(cache.asOakCache(), CACHE_NAME, null, MAX_WEIGHT); + stats = new CacheStatsAdapter(cache.asOakCache(), CACHE_NAME, null, MAX_WEIGHT); } @Test @@ -96,7 +96,7 @@ public void evictionCountIncreasesAfterCapacityEviction() { CacheLIRS smallCache = CacheLIRS.newBuilder() .maximumSize(5) .build(); - CacheStats smallStats = new CacheStats(smallCache.asOakCache(), "small", null, 5); + CacheStatsAdapter smallStats = new CacheStatsAdapter(smallCache.asOakCache(), "small", null, 5); for (int i = 0; i < 30; i++) { smallCache.put("k" + i, "v" + i); } diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapterTest.java similarity index 99% rename from oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java rename to oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapterTest.java index e33f80fb905..1811dba0cba 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapterTest.java @@ -20,7 +20,7 @@ import org.junit.Test; /** Tests for {@link CacheStatsSnapshot}. */ -public class CacheStatsTest { +public class CacheStatsAdapterTest { private CacheStatsSnapshot stats(long hits, long misses, long loadSuccess, long loadFail, long loadTime, long evictions) { diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java index 6a87b1dfb51..b70694c8ee1 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java @@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.cache.api.LoadingCache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.cache.impl.caffeine.CaffeineCacheAdapter; import org.apache.jackrabbit.oak.cache.impl.caffeine.CaffeineLoadingCacheAdapter; import org.junit.Assert; @@ -248,7 +248,7 @@ public void oakCacheStatsAdapterBridgesOakStats() { .weigher((k, v) -> k.length() + v.length()) .recordStats() .build(); - CacheStats stats = new CacheStats( + CacheStatsAdapter stats = new CacheStatsAdapter( cache, "testCache", (k, v) -> k.length() + v.length(), 100); cache.put("aa", "bbb"); diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java index 2e41d2c3feb..a97d5790f69 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java @@ -34,7 +34,7 @@ import org.apache.commons.io.FilenameUtils; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorHelper; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.plugins.document.spi.JournalPropertyService; @@ -696,7 +696,7 @@ private void initializeExtractedTextCache(BundleContext bundleContext, Configura if (extractedTextProvider != null){ registerExtractedTextProvider(extractedTextProvider); } - CacheStats stats = extractedTextCache.getCacheStats(); + CacheStatsAdapter stats = extractedTextCache.getCacheStats(); if (stats != null){ oakRegs.add(registerMBean(whiteboard, CacheStatsMBean.class, stats, diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java index 096612305c0..e5cb1a18b9b 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java @@ -21,7 +21,7 @@ import com.codahale.metrics.MetricRegistry; import com.mongodb.ConnectionString; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; import org.apache.jackrabbit.oak.commons.pio.Closer; @@ -407,7 +407,7 @@ public void reindex() throws CommitFailedException, IOException { } } ExtractedTextCache extractedTextCache = indexerProvider.getTextCache(); - CacheStats cacheStats = extractedTextCache == null ? null : extractedTextCache.getCacheStats(); + CacheStatsAdapter cacheStats = extractedTextCache == null ? null : extractedTextCache.getCacheStats(); log.info("Text extraction cache statistics: {}", cacheStats == null ? "N/A" : cacheStats.cacheInfoAsString()); progressReporter.reindexingTraversalEnd(); diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java index aae11ea72a6..ee3489f0184 100644 --- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java +++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java @@ -38,10 +38,9 @@ import java.util.concurrent.TimeoutException; import org.apache.jackrabbit.oak.api.Blob; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorHelper; @@ -87,7 +86,7 @@ public class ExtractedTextCache { private final ConcurrentHashMap timeoutMap; private final File indexDir; - private final CacheStats cacheStats; + private final CacheStatsAdapter cacheStats; private final boolean alwaysUsePreExtractedCache; private volatile ExecutorService executorService; private volatile int timeoutCount; @@ -111,7 +110,7 @@ public ExtractedTextCache(long maxWeight, long expiryTimeInSecs, boolean alwaysU .expireAfterAccess(Duration.ofSeconds(expiryTimeInSecs)) .recordStats() .build(); - cacheStats = new CacheStats(cache, "ExtractedTextCache", + cacheStats = new CacheStatsAdapter(cache, "ExtractedTextCache", EmpiricalWeigher.INSTANCE, maxWeight); } else { cache = null; @@ -250,7 +249,7 @@ public int getTimeoutCount() { } @Nullable - public CacheStats getCacheStats() { + public CacheStatsAdapter getCacheStats() { return cacheStats; } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java index 6bd79f5b38d..c6b83ddf429 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.segment.util.SafeEncode; import org.apache.jackrabbit.oak.spi.blob.BlobStore; @@ -227,12 +227,12 @@ public SegmentBlob readBlob(@NotNull RecordId id) { } @NotNull - public CacheStats getStringCacheStats() { + public CacheStatsAdapter getStringCacheStats() { return stringCache.getStats(); } @NotNull - public CacheStats getTemplateCacheStats() { + public CacheStatsAdapter getTemplateCacheStats() { return templateCache.getStats(); } } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java index 09177ea1852..36c3fa34872 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java @@ -25,10 +25,9 @@ import java.util.Arrays; import java.util.function.Function; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -58,7 +57,7 @@ public abstract class ReaderCache { private final Cache cache; @NotNull - private final CacheStats cacheStats; + private final CacheStatsAdapter cacheStats; /** * Create a new string cache. @@ -80,11 +79,11 @@ protected ReaderCache(long maxWeight, int averageWeight, .weigher(weigher::weigh) .build() .asOakCache(); - cacheStats = new CacheStats(cache, name, weigher, maxWeight); + cacheStats = new CacheStatsAdapter(cache, name, weigher, maxWeight); } @NotNull - public CacheStats getStats() { + public CacheStatsAdapter getStats() { return cacheStats; } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java index 7ed7f56aad0..34d31a7556b 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java @@ -31,7 +31,7 @@ import org.apache.jackrabbit.oak.api.jmx.FileStoreBackupRestoreMBean; import org.apache.jackrabbit.oak.backup.impl.FileStoreBackupRestoreImpl; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.blob.BlobGC; import org.apache.jackrabbit.oak.plugins.blob.BlobGCMBean; @@ -300,7 +300,7 @@ private SegmentNodeStore register() throws IOException { registerCloseable(registerMBean( CacheStatsMBean.class, segmentCacheStats, - CacheStats.TYPE, + CacheStatsAdapter.TYPE, segmentCacheStats.getName() )); @@ -310,7 +310,7 @@ private SegmentNodeStore register() throws IOException { registerCloseable(registerMBean( CacheStatsMBean.class, stringCacheStats, - CacheStats.TYPE, + CacheStatsAdapter.TYPE, stringCacheStats.getName() )); @@ -318,7 +318,7 @@ private SegmentNodeStore register() throws IOException { registerCloseable(registerMBean( CacheStatsMBean.class, templateCacheStats, - CacheStats.TYPE, + CacheStatsAdapter.TYPE, templateCacheStats.getName() )); @@ -328,7 +328,7 @@ private SegmentNodeStore register() throws IOException { registerCloseable(registerMBean( CacheStatsMBean.class, stringDeduplicationCacheStats, - CacheStats.TYPE, + CacheStatsAdapter.TYPE, stringDeduplicationCacheStats.getName() )); } @@ -338,7 +338,7 @@ private SegmentNodeStore register() throws IOException { registerCloseable(registerMBean( CacheStatsMBean.class, templateDeduplicationCacheStats, - CacheStats.TYPE, + CacheStatsAdapter.TYPE, templateDeduplicationCacheStats.getName() )); } @@ -348,7 +348,7 @@ private SegmentNodeStore register() throws IOException { registerCloseable(registerMBean( CacheStatsMBean.class, nodeDeduplicationCacheStats, - CacheStats.TYPE, + CacheStatsAdapter.TYPE, nodeDeduplicationCacheStats.getName() )); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java index 692e9a7d1e4..9668441b239 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java @@ -16,8 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.json.JsopReader; import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; import org.jetbrains.annotations.NotNull; @@ -70,7 +69,7 @@ abstract Entry newEntry(@NotNull RevisionVector from, * @return the statistics for this cache. */ @NotNull - abstract Iterable getStats(); + abstract Iterable getStats(); /** * Invalidates all the entries in the cache. diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java index fc0d83b783d..c754f052cee 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java @@ -76,8 +76,7 @@ import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.PerfLogger; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; @@ -417,7 +416,7 @@ public final class DocumentNodeStore * Key: PathRev, value: DocumentNodeState */ private final Cache nodeCache; - private final CacheStats nodeCacheStats; + private final CacheStatsAdapter nodeCacheStats; /** * Child node cache. @@ -425,7 +424,7 @@ public final class DocumentNodeStore * Key: PathRev, value: Children */ private final Cache nodeChildrenCache; - private final CacheStats nodeChildrenCacheStats; + private final CacheStatsAdapter nodeChildrenCacheStats; /** * The change log to keep track of commits for diff operations. @@ -1280,16 +1279,16 @@ public ClusterNodeInfo getClusterInfo() { return clusterNodeInfo; } - public CacheStats getNodeCacheStats() { + public CacheStatsAdapter getNodeCacheStats() { return nodeCacheStats; } - public CacheStats getNodeChildrenCacheStats() { + public CacheStatsAdapter getNodeChildrenCacheStats() { return nodeChildrenCacheStats; } @NotNull - public Iterable getDiffCacheStats() { + public Iterable getDiffCacheStats() { return diffCache.getStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java index cca5a8bf99d..3d50f9ba60b 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java @@ -38,7 +38,7 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.CacheValue; @@ -959,17 +959,17 @@ public Cache buildPrevDocumentsCache(DocumentStore do public NodeDocumentCache buildNodeDocumentCache(DocumentStore docStore, NodeDocumentLocks locks) { Cache nodeDocumentsCache = buildDocumentCache(docStore); - CacheStats nodeDocumentsCacheStats = newCacheStatsAdapter(nodeDocumentsCache, "Document-Documents", getDocumentCacheSize()); + CacheStatsAdapter nodeDocumentsCacheStats = newCacheStatsAdapter(nodeDocumentsCache, "Document-Documents", getDocumentCacheSize()); Cache prevDocumentsCache = buildPrevDocumentsCache(docStore); - CacheStats prevDocumentsCacheStats = newCacheStatsAdapter(prevDocumentsCache, "Document-PrevDocuments", getPrevDocumentCacheSize()); + CacheStatsAdapter prevDocumentsCacheStats = newCacheStatsAdapter(prevDocumentsCache, "Document-PrevDocuments", getPrevDocumentCacheSize()); return new NodeDocumentCache(nodeDocumentsCache, nodeDocumentsCacheStats, prevDocumentsCache, prevDocumentsCacheStats, locks); } @SuppressWarnings({"unchecked", "rawtypes"}) - CacheStats newCacheStatsAdapter(Cache cache, String name, long maxWeight) { - return new CacheStats((Cache) cache, name, (Weigher) weigher, maxWeight); + CacheStatsAdapter newCacheStatsAdapter(Cache cache, String name, long maxWeight) { + return new CacheStatsAdapter((Cache) cache, name, (Weigher) weigher, maxWeight); } /** diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java index fc9da99a1a3..a56a3dc9238 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java @@ -60,7 +60,7 @@ import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean; import org.apache.jackrabbit.oak.api.jmx.PersistentCacheStatsMBean; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentNodeStoreBuilder; @@ -865,7 +865,7 @@ private void registerJMXBeans(final DocumentNodeStore store, DocumentNodeStoreBu } DocumentStore ds = store.getDocumentStore(); if (ds.getCacheStats() != null) { - for (CacheStats cacheStats : ds.getCacheStats()) { + for (CacheStatsAdapter cacheStats : ds.getCacheStats()) { registerCacheStatsMBean(cacheStats); } } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java index 2bb1648c348..dbef133ee9a 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java @@ -22,7 +22,7 @@ import java.util.Set; import java.util.stream.Collectors; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Condition; import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats; import org.apache.jackrabbit.oak.plugins.document.util.Utils; @@ -431,7 +431,7 @@ T findAndUpdate(Collection collection, * @return status information about the cache */ @Nullable - Iterable getCacheStats(); + Iterable getCacheStats(); /** * @return description of the underlying storage. diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java index 4dbe51dacea..8951cb1dd4f 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.sort.StringSort; import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.document.util.StringValue; @@ -298,7 +298,7 @@ private void trackStats(Path path, @NotNull @Override - Iterable getStats() { + Iterable getStats() { return cache.getStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java index 2eecfa639b2..a149873c0b9 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java @@ -22,7 +22,7 @@ import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.commons.json.JsopReader; import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; @@ -45,11 +45,11 @@ public class LocalDiffCache extends DiffCache { private static int MAX_ENTRY_SIZE = 16 * 1024 * 1024; private final Cache diffCache; - private final CacheStats diffCacheStats; + private final CacheStatsAdapter diffCacheStats; LocalDiffCache(DocumentNodeStoreBuilder builder) { this.diffCache = builder.buildLocalDiffCache(); - this.diffCacheStats = new CacheStats(diffCache, + this.diffCacheStats = new CacheStatsAdapter(diffCache, "Document-LocalDiff", (k, v) -> builder.getWeigher().weigh(k, v), builder.getLocalDiffCacheSize()); } @@ -107,7 +107,7 @@ private boolean exceedsSize(){ @NotNull @Override - public Iterable getStats() { + public Iterable getStats() { return Collections.singleton(diffCacheStats); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java index 4565075e522..07b8a7e59bf 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java @@ -20,7 +20,7 @@ import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.plugins.document.util.StringValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -50,12 +50,12 @@ public class MemoryDiffCache extends DiffCache { * Key: PathRev, value: StringValue */ protected final Cache diffCache; - protected final CacheStats diffCacheStats; + protected final CacheStatsAdapter diffCacheStats; protected MemoryDiffCache(DocumentNodeStoreBuilder builder) { diffCache = builder.buildMemoryDiffCache(); - diffCacheStats = new CacheStats(diffCache, "Document-MemoryDiff", + diffCacheStats = new CacheStatsAdapter(diffCache, "Document-MemoryDiff", (k, v) -> builder.getWeigher().weigh(k, v), builder.getMemoryDiffCacheSize()); } @@ -96,7 +96,7 @@ public Entry newEntry(@NotNull RevisionVector from, @NotNull @Override - public Iterable getStats() { + public Iterable getStats() { return Collections.singleton(diffCacheStats); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java index 1cbab987399..4205a173223 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java @@ -18,7 +18,7 @@ import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.plugins.document.util.RevisionsKey; import org.jetbrains.annotations.NotNull; @@ -93,7 +93,7 @@ public Entry newEntry(@NotNull RevisionVector from, @NotNull RevisionVector to, @NotNull @Override - public Iterable getStats() { + public Iterable getStats() { return IterableUtils.chainedIterable(localCache.getStats(), memoryCache.getStats()); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java index 2473b759dbf..11c097edfb1 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java @@ -34,7 +34,7 @@ import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; @@ -50,7 +50,7 @@ public class NodeDocumentCache implements Closeable { private final Cache nodeDocumentsCache; - private final CacheStats nodeDocumentsCacheStats; + private final CacheStatsAdapter nodeDocumentsCacheStats; /** * The previous documents cache @@ -58,16 +58,16 @@ public class NodeDocumentCache implements Closeable { * Key: StringValue, value: NodeDocument */ private final Cache prevDocumentsCache; - private final CacheStats prevDocumentsCacheStats; + private final CacheStatsAdapter prevDocumentsCacheStats; private final NodeDocumentLocks locks; private final List changeTrackers; public NodeDocumentCache(@NotNull Cache nodeDocumentsCache, - @NotNull CacheStats nodeDocumentsCacheStats, + @NotNull CacheStatsAdapter nodeDocumentsCacheStats, @NotNull Cache prevDocumentsCache, - @NotNull CacheStats prevDocumentsCacheStats, + @NotNull CacheStatsAdapter prevDocumentsCacheStats, @NotNull NodeDocumentLocks locks) { this.nodeDocumentsCache = nodeDocumentsCache; this.nodeDocumentsCacheStats = nodeDocumentsCacheStats; @@ -319,7 +319,7 @@ public Iterable values() { return IterableUtils.chainedIterable(nodeDocumentsCache.asMap().values(), prevDocumentsCache.asMap().values()); } - public Iterable getCacheStats() { + public Iterable getCacheStats() { return Arrays.asList(nodeDocumentsCacheStats, prevDocumentsCacheStats); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java index d4b604796c7..ac7d8a43238 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java @@ -33,7 +33,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.stream.Collectors; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.properties.SystemPropertySupplier; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; @@ -444,7 +444,7 @@ public WriteConcern getWriteConcern() { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return null; } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java index 2e3e5cb86f9..e04bdffc3a7 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java @@ -43,7 +43,7 @@ import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; @@ -2085,7 +2085,7 @@ public void dispose() { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return nodesCache.getCacheStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java index 597b65ad55a..86a9d09a122 100755 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java @@ -59,9 +59,8 @@ import javax.sql.DataSource; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; import org.apache.jackrabbit.oak.commons.collections.SetUtils; @@ -837,7 +836,7 @@ private T getIfCached(Collection collection, String id, } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return nodesCache.getCacheStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java index 27340684185..4bb31a5c973 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.function.Supplier; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfo; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; @@ -213,7 +213,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return leaseChecking(delegate::getCacheStats); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java index b71357aae81..a0b327a2c94 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.Callable; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; @@ -366,7 +366,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { try { logMethod("getCacheStats"); return logResult(store::getCacheStats); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java index bc9660ae6eb..c61be694501 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; @@ -154,7 +154,7 @@ public synchronized void setReadWriteMode(String readWriteMode) { } @Override - public synchronized Iterable getCacheStats() { + public synchronized Iterable getCacheStats() { return store.getCacheStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java index 3f062859527..bdaa55ac98a 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java @@ -16,8 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.document.util; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; @@ -234,7 +233,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return store.getCacheStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java index c515d77295a..066f6d3f422 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; @@ -423,10 +423,10 @@ public void setReadWriteMode(String readWriteMode) { @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { try { long start = now(); - Iterable result = base.getCacheStats(); + Iterable result = base.getCacheStats(); updateAndLogTimes("getCacheStats", start, 0, 0); return result; } catch (Exception e) { diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java index f6e9b1ba383..b7bd403987f 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java @@ -18,7 +18,7 @@ import java.util.Collections; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -61,7 +61,7 @@ public boolean done() { @NotNull @Override - public Iterable getStats() { + public Iterable getStats() { return Collections.emptyList(); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java index 67eb5bc1453..85547a219de 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats; import org.jetbrains.annotations.NotNull; @@ -215,7 +215,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return delegate.getCacheStats(); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java index 4a6a1363acf..8e299c55814 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java @@ -18,7 +18,7 @@ import com.mongodb.client.MongoClient; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.junit.Test; import org.junit.runner.RunWith; @@ -74,11 +74,11 @@ protected DocumentMK.Builder newBuilder(MongoClient client, String dbName) throw @Test public void lazyInit() throws Exception { - Iterable cacheStats = mk.getDocumentStore().getCacheStats(); + Iterable cacheStats = mk.getDocumentStore().getCacheStats(); assertNotNull(cacheStats); assertEquals(2, IterableUtils.size(cacheStats)); - CacheStats docCacheStats = IterableUtils.get(cacheStats, 0); - CacheStats prevDocCacheStats = IterableUtils.get(cacheStats, 1); + CacheStatsAdapter docCacheStats = IterableUtils.get(cacheStats, 0); + CacheStatsAdapter prevDocCacheStats = IterableUtils.get(cacheStats, 1); assertEquals("Document-Documents", docCacheStats.getName()); assertEquals("Document-PrevDocuments", prevDocCacheStats.getName()); assertEquals(expectedDocCacheSize, docCacheStats.getMaxTotalWeight()); diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java index d37acf496e4..2fdc1a17126 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java @@ -64,7 +64,7 @@ public void buildNodeDocumentCacheStatsAreNonEmpty() { DocumentStore store = new MemoryDocumentStore(); NodeDocumentCache cache = DocumentNodeStoreBuilder.newDocumentNodeStoreBuilder() .buildNodeDocumentCache(store, new StripedNodeDocumentLocks()); - Iterable stats = cache.getCacheStats(); + Iterable stats = cache.getCacheStats(); Assert.assertNotNull(stats); Assert.assertTrue(stats.iterator().hasNext()); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java index 00612485e0e..bd1834cb5f9 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.plugins.document; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff; @@ -63,14 +63,14 @@ public void diff() throws Exception { merge(store, builder); } - Iterable stats = store.getDiffCacheStats(); - for (CacheStats cs : stats) { + Iterable stats = store.getDiffCacheStats(); + for (CacheStatsAdapter cs : stats) { cs.resetStats(); } // must not cause cache misses Diff.perform(before, after); - for (CacheStats cs : stats) { + for (CacheStatsAdapter cs : stats) { assertEquals(0, cs.getMissCount()); } } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java index da286e36e1c..c7a4060107a 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats; import org.jetbrains.annotations.NotNull; @@ -150,7 +150,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return store.getCacheStats(); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java index baa9e29047e..102f4e30c1e 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java @@ -22,7 +22,7 @@ import java.util.Map; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.plugins.document.LocalDiffCache.Diff; import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; @@ -56,7 +56,7 @@ public void simpleDiff() throws Exception{ o.reset(); DiffCache cache = store.getDiffCache(); - Iterable stats = cache.getStats(); + Iterable stats = cache.getStats(); NodeBuilder builder = store.getRoot().builder(); builder.child("a").child("a2").setProperty("foo", "bar"); @@ -118,24 +118,24 @@ private static DocumentMK create(DocumentStore ds, int clusterId){ .open(); } - private static long getHitCount(Iterable stats) { + private static long getHitCount(Iterable stats) { long hitCount = 0; - for (CacheStats cs : stats) { + for (CacheStatsAdapter cs : stats) { hitCount += cs.getHitCount(); } return hitCount; } - private static long getMissCount(Iterable stats) { + private static long getMissCount(Iterable stats) { long missCount = 0; - for (CacheStats cs : stats) { + for (CacheStatsAdapter cs : stats) { missCount += cs.getMissCount(); } return missCount; } - private static void resetStats(Iterable stats) { - for (CacheStats cs : stats) { + private static void resetStats(Iterable stats) { + for (CacheStatsAdapter cs : stats) { cs.resetStats(); } } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java index 21c500b49c9..9e0d0839739 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java @@ -18,7 +18,7 @@ import java.util.UUID; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.junit.Rule; import org.junit.Test; @@ -68,7 +68,7 @@ public void getStatsReturnsNonEmptyIterable() { DiffCache cache = new MemoryDiffCache(builderProvider.newBuilder() .setCacheSegmentCount(1) .memoryCacheDistribution(0, 0, 0, 99, 0)); - Iterable statsIterable = cache.getStats(); + Iterable statsIterable = cache.getStats(); assertNotNull(statsIterable); assertTrue(statsIterable.iterator().hasNext()); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java index c301d68aa38..cf1b8a1211f 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java @@ -25,7 +25,7 @@ import java.util.Set; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler; import org.apache.jackrabbit.oak.plugins.commit.ConflictHook; @@ -228,7 +228,7 @@ public void diffBranchBase() throws Exception { private long diffCacheRequests(DocumentNodeStore ns) { long num = 0; - for (CacheStats stats : ns.getDiffCacheStats()) { + for (CacheStatsAdapter stats : ns.getDiffCacheStats()) { num += stats.getRequestCount(); } return num; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java index 1dc85336acb..37496f1e94c 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java @@ -18,7 +18,7 @@ import java.lang.reflect.Field; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.junit.Rule; import org.junit.Test; @@ -88,7 +88,7 @@ public void newEntryExternalPopulatesMemoryCache() { @Test public void getStatsReturnsNonEmptyIterable() { TieredDiffCache cache = buildCache(); - Iterable stats = cache.getStats(); + Iterable stats = cache.getStats(); assertNotNull(stats); assertTrue(stats.iterator().hasNext()); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java index e3cde765105..a06a9104350 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java @@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; @@ -153,8 +153,8 @@ public void testOnlyExternalChanges() { private NodeDocumentCache createCache() { Cache nodeDocumentsCache = (new CacheLIRS(10)).asOakCache(); Cache prevDocumentsCache = (new CacheLIRS(10)).asOakCache(); - CacheStats nodeDocumentsCacheStats = Mockito.mock(CacheStats.class); - CacheStats prevDocumentsCacheStats = Mockito.mock(CacheStats.class); + CacheStatsAdapter nodeDocumentsCacheStats = Mockito.mock(CacheStatsAdapter.class); + CacheStatsAdapter prevDocumentsCacheStats = Mockito.mock(CacheStatsAdapter.class); NodeDocumentLocks locks = new StripedNodeDocumentLocks(); return new NodeDocumentCache(nodeDocumentsCache, nodeDocumentsCacheStats, prevDocumentsCache, prevDocumentsCacheStats, locks); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java index 95ec0567a10..47c6192a189 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.document.cache; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; @@ -126,7 +126,7 @@ public void invalidateRemovesDocumentFromCache() { @Test public void getCacheStatsReturnsNonEmptyIterable() { - Iterable statsIterable = cache.getCacheStats(); + Iterable statsIterable = cache.getCacheStats(); assertNotNull(statsIterable); assertTrue(statsIterable.iterator().hasNext()); } From 9f99ea8e39ed1320b4c93c3db8eeca5f923ac3c4 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 16 Apr 2026 15:40:52 +0530 Subject: [PATCH 04/15] OAK-12162 : reverted cachestats to CacheStatsAdapter renaming --- .../oak/plugins/blob/CachingBlobStore.java | 8 ++++---- .../jackrabbit/oak/plugins/blob/FileCache.java | 4 ++-- .../blob/datastore/DataStoreBlobStore.java | 8 ++++---- .../{CacheStatsAdapter.java => CacheStats.java} | 4 ++-- .../jackrabbit/oak/cache/api/package-info.java | 2 +- .../oak/cache/AbstractCacheStatsTest.java | 8 ++++---- ...StatsAdapterTest.java => CacheStatsTest.java} | 2 +- .../oak/cache/impl/CacheBuilderTest.java | 4 ++-- .../index/lucene/LuceneIndexProviderService.java | 4 ++-- .../document/DocumentStoreIndexerBase.java | 4 ++-- .../plugins/index/search/ExtractedTextCache.java | 8 ++++---- .../RemotePersistentCacheService.java | 7 ++++--- .../oak/segment/CachingSegmentReader.java | 6 +++--- .../jackrabbit/oak/segment/ReaderCache.java | 8 ++++---- .../oak/segment/SegmentNodeStoreRegistrar.java | 14 +++++++------- .../oak/plugins/document/DiffCache.java | 4 ++-- .../oak/plugins/document/DocumentNodeStore.java | 12 ++++++------ .../document/DocumentNodeStoreBuilder.java | 10 +++++----- .../document/DocumentNodeStoreService.java | 4 ++-- .../oak/plugins/document/DocumentStore.java | 4 ++-- .../oak/plugins/document/JournalDiffLoader.java | 4 ++-- .../oak/plugins/document/LocalDiffCache.java | 8 ++++---- .../oak/plugins/document/MemoryDiffCache.java | 8 ++++---- .../oak/plugins/document/TieredDiffCache.java | 4 ++-- .../document/cache/NodeDocumentCache.java | 12 ++++++------ .../document/memory/MemoryDocumentStore.java | 4 ++-- .../document/mongo/MongoDocumentStore.java | 4 ++-- .../plugins/document/rdb/RDBDocumentStore.java | 4 ++-- .../util/LeaseCheckDocumentStoreWrapper.java | 4 ++-- .../util/LoggingDocumentStoreWrapper.java | 4 ++-- .../util/SynchronizingDocumentStoreWrapper.java | 4 ++-- .../util/ThrottlingDocumentStoreWrapper.java | 4 ++-- .../util/TimingDocumentStoreWrapper.java | 6 +++--- .../oak/plugins/document/AmnesiaDiffCache.java | 4 ++-- .../plugins/document/CountingDocumentStore.java | 4 ++-- .../plugins/document/DocumentMKBuilderTest.java | 8 ++++---- .../document/DocumentNodeStoreBuilderTest.java | 2 +- .../document/DocumentNodeStoreDiffTest.java | 8 ++++---- .../plugins/document/DocumentStoreWrapper.java | 4 ++-- .../oak/plugins/document/LocalDiffCacheTest.java | 16 ++++++++-------- .../plugins/document/MemoryDiffCacheTest.java | 4 ++-- .../oak/plugins/document/NodeStoreDiffTest.java | 4 ++-- .../plugins/document/TieredDiffCacheTest.java | 4 ++-- .../document/cache/CacheChangesTrackerTest.java | 6 +++--- .../document/cache/NodeDocumentCacheTest.java | 4 ++-- 45 files changed, 132 insertions(+), 131 deletions(-) rename oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/{CacheStatsAdapter.java => CacheStats.java} (96%) rename oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/{CacheStatsAdapterTest.java => CacheStatsTest.java} (99%) diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java index 46a6939a531..3bbd16fb32b 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.plugins.blob; import org.apache.jackrabbit.oak.cache.CacheLIRS; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.cache.api.LoadingCache; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.StringUtils; @@ -47,7 +47,7 @@ public abstract class CachingBlobStore extends AbstractBlobStore { return (int) weight; }; - private final CacheStatsAdapter cacheStats; + private final CacheStats cacheStats; public static final String MEM_CACHE_NAME = "BlobStore-MemCache"; @@ -61,7 +61,7 @@ public CachingBlobStore(long cacheSize) { weigher(weigher::weigh). build().asOakCache(); - cacheStats = new CacheStatsAdapter(cache, MEM_CACHE_NAME, weigher, cacheSize); + cacheStats = new CacheStats(cache, MEM_CACHE_NAME, weigher, cacheSize); } public CachingBlobStore() { @@ -78,7 +78,7 @@ public long getBlobCacheSize() { return blobCacheSize; } - public CacheStatsAdapter getCacheStats() { + public CacheStats getCacheStats() { return cacheStats; } } diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java index 94fa0bfed61..8c34d663bb7 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java @@ -39,7 +39,7 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheLoader; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; @@ -423,7 +423,7 @@ private int build() { } } -class FileCacheStats extends CacheStatsAdapter implements DataStoreCacheStatsMBean { +class FileCacheStats extends CacheStats implements DataStoreCacheStatsMBean { private static final long BLOCK_SIZE = 4 * 1024; private final Weigher weigher; private final Cache cache; diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java index 9a34a3fdda7..6e858c1bcd0 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java @@ -53,7 +53,7 @@ import org.apache.jackrabbit.oak.api.blob.BlobUpload; import org.apache.jackrabbit.oak.api.blob.BlobUploadOptions; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; @@ -132,7 +132,7 @@ public int weigh(@NotNull String key, @NotNull byte[] value) { } }; - private final CacheStatsAdapter cacheStats; + private final CacheStats cacheStats; public static final String MEM_CACHE_NAME = "BlobStore-MemCache"; @@ -157,7 +157,7 @@ public DataStoreBlobStore(DataStore delegate, boolean encodeLengthInId, int cach .maximumWeight(cacheSize) .weigher(weigher::weigh) .build().asOakCache(); - this.cacheStats = new CacheStatsAdapter(cache, MEM_CACHE_NAME, weigher, cacheSize); + this.cacheStats = new CacheStats(cache, MEM_CACHE_NAME, weigher, cacheSize); } //~----------------------------------< DataStore > @@ -826,7 +826,7 @@ public DataStore getDataStore() { return delegate; } - public CacheStatsAdapter getCacheStats() { + public CacheStats getCacheStats() { return cacheStats; } diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java similarity index 96% rename from oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java rename to oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java index 760359c0709..14433f982d9 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java @@ -26,7 +26,7 @@ * Exposes a {@link Cache}'s statistics via the {@link org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean} * interface. */ -public class CacheStatsAdapter extends AbstractCacheStats { +public class CacheStats extends AbstractCacheStats { private final Cache cache; private final Weigher weigher; @@ -41,7 +41,7 @@ public class CacheStatsAdapter extends AbstractCacheStats { * @param maxWeight configured maximum weight for the cache; {@code -1} if unbounded */ @SuppressWarnings("unchecked") - public CacheStatsAdapter( + public CacheStats( @NotNull Cache cache, @NotNull String name, @Nullable Weigher weigher, diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java index ce415459ccb..4bd384ffb3e 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java @@ -19,7 +19,7 @@ * For Oak internal use only. Do not use outside Oak components. */ @Internal(since = "1.0.0") -@Version("2.0.0") +@Version("1.0.0") package org.apache.jackrabbit.oak.cache.api; import org.apache.jackrabbit.oak.commons.annotations.Internal; diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java index f48d04b7fc0..7a4c92a38ff 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java @@ -18,7 +18,7 @@ import java.util.concurrent.ExecutionException; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -34,12 +34,12 @@ public class AbstractCacheStatsTest { private static final long MAX_WEIGHT = 1000; private CacheLIRS cache; - private CacheStatsAdapter stats; + private CacheStats stats; @Before public void setUp() { cache = new CacheLIRS<>(null, MAX_WEIGHT, 1, 1, 0, null, null, null); - stats = new CacheStatsAdapter(cache.asOakCache(), CACHE_NAME, null, MAX_WEIGHT); + stats = new CacheStats(cache.asOakCache(), CACHE_NAME, null, MAX_WEIGHT); } @Test @@ -96,7 +96,7 @@ public void evictionCountIncreasesAfterCapacityEviction() { CacheLIRS smallCache = CacheLIRS.newBuilder() .maximumSize(5) .build(); - CacheStatsAdapter smallStats = new CacheStatsAdapter(smallCache.asOakCache(), "small", null, 5); + CacheStats smallStats = new CacheStats(smallCache.asOakCache(), "small", null, 5); for (int i = 0; i < 30; i++) { smallCache.put("k" + i, "v" + i); } diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapterTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java similarity index 99% rename from oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapterTest.java rename to oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java index 1811dba0cba..e33f80fb905 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapterTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java @@ -20,7 +20,7 @@ import org.junit.Test; /** Tests for {@link CacheStatsSnapshot}. */ -public class CacheStatsAdapterTest { +public class CacheStatsTest { private CacheStatsSnapshot stats(long hits, long misses, long loadSuccess, long loadFail, long loadTime, long evictions) { diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java index b70694c8ee1..6a87b1dfb51 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java @@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.cache.api.LoadingCache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.cache.impl.caffeine.CaffeineCacheAdapter; import org.apache.jackrabbit.oak.cache.impl.caffeine.CaffeineLoadingCacheAdapter; import org.junit.Assert; @@ -248,7 +248,7 @@ public void oakCacheStatsAdapterBridgesOakStats() { .weigher((k, v) -> k.length() + v.length()) .recordStats() .build(); - CacheStatsAdapter stats = new CacheStatsAdapter( + CacheStats stats = new CacheStats( cache, "testCache", (k, v) -> k.length() + v.length(), 100); cache.put("aa", "bbb"); diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java index a97d5790f69..2e41d2c3feb 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java @@ -34,7 +34,7 @@ import org.apache.commons.io.FilenameUtils; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorHelper; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.plugins.document.spi.JournalPropertyService; @@ -696,7 +696,7 @@ private void initializeExtractedTextCache(BundleContext bundleContext, Configura if (extractedTextProvider != null){ registerExtractedTextProvider(extractedTextProvider); } - CacheStatsAdapter stats = extractedTextCache.getCacheStats(); + CacheStats stats = extractedTextCache.getCacheStats(); if (stats != null){ oakRegs.add(registerMBean(whiteboard, CacheStatsMBean.class, stats, diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java index e5cb1a18b9b..096612305c0 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java @@ -21,7 +21,7 @@ import com.codahale.metrics.MetricRegistry; import com.mongodb.ConnectionString; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; import org.apache.jackrabbit.oak.commons.pio.Closer; @@ -407,7 +407,7 @@ public void reindex() throws CommitFailedException, IOException { } } ExtractedTextCache extractedTextCache = indexerProvider.getTextCache(); - CacheStatsAdapter cacheStats = extractedTextCache == null ? null : extractedTextCache.getCacheStats(); + CacheStats cacheStats = extractedTextCache == null ? null : extractedTextCache.getCacheStats(); log.info("Text extraction cache statistics: {}", cacheStats == null ? "N/A" : cacheStats.cacheInfoAsString()); progressReporter.reindexingTraversalEnd(); diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java index ee3489f0184..117a58dae74 100644 --- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java +++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java @@ -40,7 +40,7 @@ import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorHelper; @@ -86,7 +86,7 @@ public class ExtractedTextCache { private final ConcurrentHashMap timeoutMap; private final File indexDir; - private final CacheStatsAdapter cacheStats; + private final CacheStats cacheStats; private final boolean alwaysUsePreExtractedCache; private volatile ExecutorService executorService; private volatile int timeoutCount; @@ -110,7 +110,7 @@ public ExtractedTextCache(long maxWeight, long expiryTimeInSecs, boolean alwaysU .expireAfterAccess(Duration.ofSeconds(expiryTimeInSecs)) .recordStats() .build(); - cacheStats = new CacheStatsAdapter(cache, "ExtractedTextCache", + cacheStats = new CacheStats(cache, "ExtractedTextCache", EmpiricalWeigher.INSTANCE, maxWeight); } else { cache = null; @@ -249,7 +249,7 @@ public int getTimeoutCount() { } @Nullable - public CacheStatsAdapter getCacheStats() { + public CacheStats getCacheStats() { return cacheStats; } diff --git a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java index df4b1271442..3c23be525e7 100644 --- a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java +++ b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java @@ -20,6 +20,7 @@ import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.segment.spi.monitor.RoleStatisticsProvider; @@ -101,7 +102,7 @@ private PersistentCache createPersistentCache(Configuration configuration, Close Collections.emptyMap())); CacheStatsMBean diskCacheStatsMBean = persistentDiskCache.getCacheStats(); - registerCloseable(registerMBean(CacheStatsMBean.class, diskCacheStatsMBean, CacheStatsMBean.TYPE, diskCacheStatsMBean.getName())); + registerCloseable(registerMBean(CacheStatsMBean.class, diskCacheStatsMBean, CacheStats.TYPE, diskCacheStatsMBean.getName())); if (configuration.redisCacheEnabled()) { PersistentRedisCache redisCache = new PersistentRedisCache(configuration.redisCacheHost(), configuration.redisCachePort(), configuration.redisCacheExpireSeconds(), configuration.redisSocketTimeout(), configuration.redisConnectionTimeout(), @@ -110,7 +111,7 @@ private PersistentCache createPersistentCache(Configuration configuration, Close closer.register(redisCache); CacheStatsMBean redisCacheStatsMBean = redisCache.getCacheStats(); - registerCloseable(registerMBean(CacheStatsMBean.class, redisCacheStatsMBean, CacheStatsMBean.TYPE, redisCacheStatsMBean.getName())); + registerCloseable(registerMBean(CacheStatsMBean.class, redisCacheStatsMBean, CacheStats.TYPE, redisCacheStatsMBean.getName())); } return persistentDiskCache; @@ -120,7 +121,7 @@ private PersistentCache createPersistentCache(Configuration configuration, Close closer.register(redisCache); CacheStatsMBean redisCacheStatsMBean = redisCache.getCacheStats(); - registerCloseable(registerMBean(CacheStatsMBean.class, redisCacheStatsMBean, CacheStatsMBean.TYPE, redisCacheStatsMBean.getName())); + registerCloseable(registerMBean(CacheStatsMBean.class, redisCacheStatsMBean, CacheStats.TYPE, redisCacheStatsMBean.getName())); return redisCache; } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java index c6b83ddf429..6bd79f5b38d 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.segment.util.SafeEncode; import org.apache.jackrabbit.oak.spi.blob.BlobStore; @@ -227,12 +227,12 @@ public SegmentBlob readBlob(@NotNull RecordId id) { } @NotNull - public CacheStatsAdapter getStringCacheStats() { + public CacheStats getStringCacheStats() { return stringCache.getStats(); } @NotNull - public CacheStatsAdapter getTemplateCacheStats() { + public CacheStats getTemplateCacheStats() { return templateCache.getStats(); } } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java index 36c3fa34872..87d635b1ca4 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -57,7 +57,7 @@ public abstract class ReaderCache { private final Cache cache; @NotNull - private final CacheStatsAdapter cacheStats; + private final CacheStats cacheStats; /** * Create a new string cache. @@ -79,11 +79,11 @@ protected ReaderCache(long maxWeight, int averageWeight, .weigher(weigher::weigh) .build() .asOakCache(); - cacheStats = new CacheStatsAdapter(cache, name, weigher, maxWeight); + cacheStats = new CacheStats(cache, name, weigher, maxWeight); } @NotNull - public CacheStatsAdapter getStats() { + public CacheStats getStats() { return cacheStats; } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java index 34d31a7556b..7ed7f56aad0 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java @@ -31,7 +31,7 @@ import org.apache.jackrabbit.oak.api.jmx.FileStoreBackupRestoreMBean; import org.apache.jackrabbit.oak.backup.impl.FileStoreBackupRestoreImpl; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.blob.BlobGC; import org.apache.jackrabbit.oak.plugins.blob.BlobGCMBean; @@ -300,7 +300,7 @@ private SegmentNodeStore register() throws IOException { registerCloseable(registerMBean( CacheStatsMBean.class, segmentCacheStats, - CacheStatsAdapter.TYPE, + CacheStats.TYPE, segmentCacheStats.getName() )); @@ -310,7 +310,7 @@ private SegmentNodeStore register() throws IOException { registerCloseable(registerMBean( CacheStatsMBean.class, stringCacheStats, - CacheStatsAdapter.TYPE, + CacheStats.TYPE, stringCacheStats.getName() )); @@ -318,7 +318,7 @@ private SegmentNodeStore register() throws IOException { registerCloseable(registerMBean( CacheStatsMBean.class, templateCacheStats, - CacheStatsAdapter.TYPE, + CacheStats.TYPE, templateCacheStats.getName() )); @@ -328,7 +328,7 @@ private SegmentNodeStore register() throws IOException { registerCloseable(registerMBean( CacheStatsMBean.class, stringDeduplicationCacheStats, - CacheStatsAdapter.TYPE, + CacheStats.TYPE, stringDeduplicationCacheStats.getName() )); } @@ -338,7 +338,7 @@ private SegmentNodeStore register() throws IOException { registerCloseable(registerMBean( CacheStatsMBean.class, templateDeduplicationCacheStats, - CacheStatsAdapter.TYPE, + CacheStats.TYPE, templateDeduplicationCacheStats.getName() )); } @@ -348,7 +348,7 @@ private SegmentNodeStore register() throws IOException { registerCloseable(registerMBean( CacheStatsMBean.class, nodeDeduplicationCacheStats, - CacheStatsAdapter.TYPE, + CacheStats.TYPE, nodeDeduplicationCacheStats.getName() )); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java index 9668441b239..367e136a5bd 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.json.JsopReader; import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; import org.jetbrains.annotations.NotNull; @@ -69,7 +69,7 @@ abstract Entry newEntry(@NotNull RevisionVector from, * @return the statistics for this cache. */ @NotNull - abstract Iterable getStats(); + abstract Iterable getStats(); /** * Invalidates all the entries in the cache. diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java index c754f052cee..7f709229c30 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java @@ -76,7 +76,7 @@ import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.PerfLogger; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; @@ -416,7 +416,7 @@ public final class DocumentNodeStore * Key: PathRev, value: DocumentNodeState */ private final Cache nodeCache; - private final CacheStatsAdapter nodeCacheStats; + private final CacheStats nodeCacheStats; /** * Child node cache. @@ -424,7 +424,7 @@ public final class DocumentNodeStore * Key: PathRev, value: Children */ private final Cache nodeChildrenCache; - private final CacheStatsAdapter nodeChildrenCacheStats; + private final CacheStats nodeChildrenCacheStats; /** * The change log to keep track of commits for diff operations. @@ -1279,16 +1279,16 @@ public ClusterNodeInfo getClusterInfo() { return clusterNodeInfo; } - public CacheStatsAdapter getNodeCacheStats() { + public CacheStats getNodeCacheStats() { return nodeCacheStats; } - public CacheStatsAdapter getNodeChildrenCacheStats() { + public CacheStats getNodeChildrenCacheStats() { return nodeChildrenCacheStats; } @NotNull - public Iterable getDiffCacheStats() { + public Iterable getDiffCacheStats() { return diffCache.getStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java index 3d50f9ba60b..cca5a8bf99d 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java @@ -38,7 +38,7 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.CacheValue; @@ -959,17 +959,17 @@ public Cache buildPrevDocumentsCache(DocumentStore do public NodeDocumentCache buildNodeDocumentCache(DocumentStore docStore, NodeDocumentLocks locks) { Cache nodeDocumentsCache = buildDocumentCache(docStore); - CacheStatsAdapter nodeDocumentsCacheStats = newCacheStatsAdapter(nodeDocumentsCache, "Document-Documents", getDocumentCacheSize()); + CacheStats nodeDocumentsCacheStats = newCacheStatsAdapter(nodeDocumentsCache, "Document-Documents", getDocumentCacheSize()); Cache prevDocumentsCache = buildPrevDocumentsCache(docStore); - CacheStatsAdapter prevDocumentsCacheStats = newCacheStatsAdapter(prevDocumentsCache, "Document-PrevDocuments", getPrevDocumentCacheSize()); + CacheStats prevDocumentsCacheStats = newCacheStatsAdapter(prevDocumentsCache, "Document-PrevDocuments", getPrevDocumentCacheSize()); return new NodeDocumentCache(nodeDocumentsCache, nodeDocumentsCacheStats, prevDocumentsCache, prevDocumentsCacheStats, locks); } @SuppressWarnings({"unchecked", "rawtypes"}) - CacheStatsAdapter newCacheStatsAdapter(Cache cache, String name, long maxWeight) { - return new CacheStatsAdapter((Cache) cache, name, (Weigher) weigher, maxWeight); + CacheStats newCacheStatsAdapter(Cache cache, String name, long maxWeight) { + return new CacheStats((Cache) cache, name, (Weigher) weigher, maxWeight); } /** diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java index a56a3dc9238..fc9da99a1a3 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java @@ -60,7 +60,7 @@ import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean; import org.apache.jackrabbit.oak.api.jmx.PersistentCacheStatsMBean; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentNodeStoreBuilder; @@ -865,7 +865,7 @@ private void registerJMXBeans(final DocumentNodeStore store, DocumentNodeStoreBu } DocumentStore ds = store.getDocumentStore(); if (ds.getCacheStats() != null) { - for (CacheStatsAdapter cacheStats : ds.getCacheStats()) { + for (CacheStats cacheStats : ds.getCacheStats()) { registerCacheStatsMBean(cacheStats); } } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java index dbef133ee9a..2bb1648c348 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java @@ -22,7 +22,7 @@ import java.util.Set; import java.util.stream.Collectors; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Condition; import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats; import org.apache.jackrabbit.oak.plugins.document.util.Utils; @@ -431,7 +431,7 @@ T findAndUpdate(Collection collection, * @return status information about the cache */ @Nullable - Iterable getCacheStats(); + Iterable getCacheStats(); /** * @return description of the underlying storage. diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java index 8951cb1dd4f..4dbe51dacea 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.sort.StringSort; import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.document.util.StringValue; @@ -298,7 +298,7 @@ private void trackStats(Path path, @NotNull @Override - Iterable getStats() { + Iterable getStats() { return cache.getStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java index a149873c0b9..2eecfa639b2 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java @@ -22,7 +22,7 @@ import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.commons.json.JsopReader; import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; @@ -45,11 +45,11 @@ public class LocalDiffCache extends DiffCache { private static int MAX_ENTRY_SIZE = 16 * 1024 * 1024; private final Cache diffCache; - private final CacheStatsAdapter diffCacheStats; + private final CacheStats diffCacheStats; LocalDiffCache(DocumentNodeStoreBuilder builder) { this.diffCache = builder.buildLocalDiffCache(); - this.diffCacheStats = new CacheStatsAdapter(diffCache, + this.diffCacheStats = new CacheStats(diffCache, "Document-LocalDiff", (k, v) -> builder.getWeigher().weigh(k, v), builder.getLocalDiffCacheSize()); } @@ -107,7 +107,7 @@ private boolean exceedsSize(){ @NotNull @Override - public Iterable getStats() { + public Iterable getStats() { return Collections.singleton(diffCacheStats); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java index 07b8a7e59bf..4565075e522 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java @@ -20,7 +20,7 @@ import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.util.StringValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -50,12 +50,12 @@ public class MemoryDiffCache extends DiffCache { * Key: PathRev, value: StringValue */ protected final Cache diffCache; - protected final CacheStatsAdapter diffCacheStats; + protected final CacheStats diffCacheStats; protected MemoryDiffCache(DocumentNodeStoreBuilder builder) { diffCache = builder.buildMemoryDiffCache(); - diffCacheStats = new CacheStatsAdapter(diffCache, "Document-MemoryDiff", + diffCacheStats = new CacheStats(diffCache, "Document-MemoryDiff", (k, v) -> builder.getWeigher().weigh(k, v), builder.getMemoryDiffCacheSize()); } @@ -96,7 +96,7 @@ public Entry newEntry(@NotNull RevisionVector from, @NotNull @Override - public Iterable getStats() { + public Iterable getStats() { return Collections.singleton(diffCacheStats); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java index 4205a173223..1cbab987399 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java @@ -18,7 +18,7 @@ import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.plugins.document.util.RevisionsKey; import org.jetbrains.annotations.NotNull; @@ -93,7 +93,7 @@ public Entry newEntry(@NotNull RevisionVector from, @NotNull RevisionVector to, @NotNull @Override - public Iterable getStats() { + public Iterable getStats() { return IterableUtils.chainedIterable(localCache.getStats(), memoryCache.getStats()); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java index 11c097edfb1..2473b759dbf 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java @@ -34,7 +34,7 @@ import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; @@ -50,7 +50,7 @@ public class NodeDocumentCache implements Closeable { private final Cache nodeDocumentsCache; - private final CacheStatsAdapter nodeDocumentsCacheStats; + private final CacheStats nodeDocumentsCacheStats; /** * The previous documents cache @@ -58,16 +58,16 @@ public class NodeDocumentCache implements Closeable { * Key: StringValue, value: NodeDocument */ private final Cache prevDocumentsCache; - private final CacheStatsAdapter prevDocumentsCacheStats; + private final CacheStats prevDocumentsCacheStats; private final NodeDocumentLocks locks; private final List changeTrackers; public NodeDocumentCache(@NotNull Cache nodeDocumentsCache, - @NotNull CacheStatsAdapter nodeDocumentsCacheStats, + @NotNull CacheStats nodeDocumentsCacheStats, @NotNull Cache prevDocumentsCache, - @NotNull CacheStatsAdapter prevDocumentsCacheStats, + @NotNull CacheStats prevDocumentsCacheStats, @NotNull NodeDocumentLocks locks) { this.nodeDocumentsCache = nodeDocumentsCache; this.nodeDocumentsCacheStats = nodeDocumentsCacheStats; @@ -319,7 +319,7 @@ public Iterable values() { return IterableUtils.chainedIterable(nodeDocumentsCache.asMap().values(), prevDocumentsCache.asMap().values()); } - public Iterable getCacheStats() { + public Iterable getCacheStats() { return Arrays.asList(nodeDocumentsCacheStats, prevDocumentsCacheStats); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java index ac7d8a43238..d4b604796c7 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java @@ -33,7 +33,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.stream.Collectors; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.properties.SystemPropertySupplier; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; @@ -444,7 +444,7 @@ public WriteConcern getWriteConcern() { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return null; } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java index e04bdffc3a7..2e3e5cb86f9 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java @@ -43,7 +43,7 @@ import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; @@ -2085,7 +2085,7 @@ public void dispose() { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return nodesCache.getCacheStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java index 86a9d09a122..b5993c61118 100755 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java @@ -60,7 +60,7 @@ import javax.sql.DataSource; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; import org.apache.jackrabbit.oak.commons.collections.SetUtils; @@ -836,7 +836,7 @@ private T getIfCached(Collection collection, String id, } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return nodesCache.getCacheStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java index 4bb31a5c973..27340684185 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.function.Supplier; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfo; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; @@ -213,7 +213,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return leaseChecking(delegate::getCacheStats); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java index a0b327a2c94..b71357aae81 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.Callable; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; @@ -366,7 +366,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { try { logMethod("getCacheStats"); return logResult(store::getCacheStats); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java index c61be694501..bc9660ae6eb 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; @@ -154,7 +154,7 @@ public synchronized void setReadWriteMode(String readWriteMode) { } @Override - public synchronized Iterable getCacheStats() { + public synchronized Iterable getCacheStats() { return store.getCacheStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java index bdaa55ac98a..c62b6a782a8 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.document.util; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; @@ -233,7 +233,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return store.getCacheStats(); } diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java index 066f6d3f422..c515d77295a 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; @@ -423,10 +423,10 @@ public void setReadWriteMode(String readWriteMode) { @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { try { long start = now(); - Iterable result = base.getCacheStats(); + Iterable result = base.getCacheStats(); updateAndLogTimes("getCacheStats", start, 0, 0); return result; } catch (Exception e) { diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java index b7bd403987f..f6e9b1ba383 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java @@ -18,7 +18,7 @@ import java.util.Collections; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -61,7 +61,7 @@ public boolean done() { @NotNull @Override - public Iterable getStats() { + public Iterable getStats() { return Collections.emptyList(); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java index 85547a219de..67eb5bc1453 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats; import org.jetbrains.annotations.NotNull; @@ -215,7 +215,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return delegate.getCacheStats(); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java index 8e299c55814..4a6a1363acf 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java @@ -18,7 +18,7 @@ import com.mongodb.client.MongoClient; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.junit.Test; import org.junit.runner.RunWith; @@ -74,11 +74,11 @@ protected DocumentMK.Builder newBuilder(MongoClient client, String dbName) throw @Test public void lazyInit() throws Exception { - Iterable cacheStats = mk.getDocumentStore().getCacheStats(); + Iterable cacheStats = mk.getDocumentStore().getCacheStats(); assertNotNull(cacheStats); assertEquals(2, IterableUtils.size(cacheStats)); - CacheStatsAdapter docCacheStats = IterableUtils.get(cacheStats, 0); - CacheStatsAdapter prevDocCacheStats = IterableUtils.get(cacheStats, 1); + CacheStats docCacheStats = IterableUtils.get(cacheStats, 0); + CacheStats prevDocCacheStats = IterableUtils.get(cacheStats, 1); assertEquals("Document-Documents", docCacheStats.getName()); assertEquals("Document-PrevDocuments", prevDocCacheStats.getName()); assertEquals(expectedDocCacheSize, docCacheStats.getMaxTotalWeight()); diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java index 2fdc1a17126..d37acf496e4 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java @@ -64,7 +64,7 @@ public void buildNodeDocumentCacheStatsAreNonEmpty() { DocumentStore store = new MemoryDocumentStore(); NodeDocumentCache cache = DocumentNodeStoreBuilder.newDocumentNodeStoreBuilder() .buildNodeDocumentCache(store, new StripedNodeDocumentLocks()); - Iterable stats = cache.getCacheStats(); + Iterable stats = cache.getCacheStats(); Assert.assertNotNull(stats); Assert.assertTrue(stats.iterator().hasNext()); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java index bd1834cb5f9..00612485e0e 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.plugins.document; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff; @@ -63,14 +63,14 @@ public void diff() throws Exception { merge(store, builder); } - Iterable stats = store.getDiffCacheStats(); - for (CacheStatsAdapter cs : stats) { + Iterable stats = store.getDiffCacheStats(); + for (CacheStats cs : stats) { cs.resetStats(); } // must not cause cache misses Diff.perform(before, after); - for (CacheStatsAdapter cs : stats) { + for (CacheStats cs : stats) { assertEquals(0, cs.getMissCount()); } } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java index c7a4060107a..da286e36e1c 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats; import org.jetbrains.annotations.NotNull; @@ -150,7 +150,7 @@ public void setReadWriteMode(String readWriteMode) { } @Override - public Iterable getCacheStats() { + public Iterable getCacheStats() { return store.getCacheStats(); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java index 102f4e30c1e..baa9e29047e 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java @@ -22,7 +22,7 @@ import java.util.Map; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.LocalDiffCache.Diff; import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; @@ -56,7 +56,7 @@ public void simpleDiff() throws Exception{ o.reset(); DiffCache cache = store.getDiffCache(); - Iterable stats = cache.getStats(); + Iterable stats = cache.getStats(); NodeBuilder builder = store.getRoot().builder(); builder.child("a").child("a2").setProperty("foo", "bar"); @@ -118,24 +118,24 @@ private static DocumentMK create(DocumentStore ds, int clusterId){ .open(); } - private static long getHitCount(Iterable stats) { + private static long getHitCount(Iterable stats) { long hitCount = 0; - for (CacheStatsAdapter cs : stats) { + for (CacheStats cs : stats) { hitCount += cs.getHitCount(); } return hitCount; } - private static long getMissCount(Iterable stats) { + private static long getMissCount(Iterable stats) { long missCount = 0; - for (CacheStatsAdapter cs : stats) { + for (CacheStats cs : stats) { missCount += cs.getMissCount(); } return missCount; } - private static void resetStats(Iterable stats) { - for (CacheStatsAdapter cs : stats) { + private static void resetStats(Iterable stats) { + for (CacheStats cs : stats) { cs.resetStats(); } } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java index 9e0d0839739..21c500b49c9 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java @@ -18,7 +18,7 @@ import java.util.UUID; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.junit.Rule; import org.junit.Test; @@ -68,7 +68,7 @@ public void getStatsReturnsNonEmptyIterable() { DiffCache cache = new MemoryDiffCache(builderProvider.newBuilder() .setCacheSegmentCount(1) .memoryCacheDistribution(0, 0, 0, 99, 0)); - Iterable statsIterable = cache.getStats(); + Iterable statsIterable = cache.getStats(); assertNotNull(statsIterable); assertTrue(statsIterable.iterator().hasNext()); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java index cf1b8a1211f..c301d68aa38 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java @@ -25,7 +25,7 @@ import java.util.Set; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler; import org.apache.jackrabbit.oak.plugins.commit.ConflictHook; @@ -228,7 +228,7 @@ public void diffBranchBase() throws Exception { private long diffCacheRequests(DocumentNodeStore ns) { long num = 0; - for (CacheStatsAdapter stats : ns.getDiffCacheStats()) { + for (CacheStats stats : ns.getDiffCacheStats()) { num += stats.getRequestCount(); } return num; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java index 37496f1e94c..1dc85336acb 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java @@ -18,7 +18,7 @@ import java.lang.reflect.Field; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.junit.Rule; import org.junit.Test; @@ -88,7 +88,7 @@ public void newEntryExternalPopulatesMemoryCache() { @Test public void getStatsReturnsNonEmptyIterable() { TieredDiffCache cache = buildCache(); - Iterable stats = cache.getStats(); + Iterable stats = cache.getStats(); assertNotNull(stats); assertTrue(stats.iterator().hasNext()); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java index a06a9104350..e3cde765105 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java @@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; @@ -153,8 +153,8 @@ public void testOnlyExternalChanges() { private NodeDocumentCache createCache() { Cache nodeDocumentsCache = (new CacheLIRS(10)).asOakCache(); Cache prevDocumentsCache = (new CacheLIRS(10)).asOakCache(); - CacheStatsAdapter nodeDocumentsCacheStats = Mockito.mock(CacheStatsAdapter.class); - CacheStatsAdapter prevDocumentsCacheStats = Mockito.mock(CacheStatsAdapter.class); + CacheStats nodeDocumentsCacheStats = Mockito.mock(CacheStats.class); + CacheStats prevDocumentsCacheStats = Mockito.mock(CacheStats.class); NodeDocumentLocks locks = new StripedNodeDocumentLocks(); return new NodeDocumentCache(nodeDocumentsCache, nodeDocumentsCacheStats, prevDocumentsCache, prevDocumentsCacheStats, locks); } diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java index 47c6192a189..95ec0567a10 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.document.cache; -import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter; +import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; @@ -126,7 +126,7 @@ public void invalidateRemovesDocumentFromCache() { @Test public void getCacheStatsReturnsNonEmptyIterable() { - Iterable statsIterable = cache.getCacheStats(); + Iterable statsIterable = cache.getCacheStats(); assertNotNull(statsIterable); assertTrue(statsIterable.iterator().hasNext()); } From de4da8fc68114876a786674dcfb589757c0745d2 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 16 Apr 2026 16:53:03 +0530 Subject: [PATCH 05/15] OAK-12162 : moved cachestats and cachestatssnapshot in same package as that of abstractcachestats --- .../oak/plugins/blob/CachingBlobStore.java | 2 +- .../oak/plugins/blob/FileCache.java | 2 +- .../blob/datastore/DataStoreBlobStore.java | 2 +- .../oak/cache/AbstractCacheStats.java | 1 - .../oak/cache/{api => }/CacheStats.java | 5 ++-- .../cache/{api => }/CacheStatsSnapshot.java | 24 +++++++++++++++++-- .../jackrabbit/oak/cache/api/Cache.java | 1 + .../impl/caffeine/CaffeineCacheAdapter.java | 2 +- .../oak/cache/impl/lirs/LirsCacheAdapter.java | 2 +- .../oak/cache/AbstractCacheStatsTest.java | 1 - ...sTest.java => CacheStatsSnapshotTest.java} | 3 ++- .../oak/cache/impl/CacheBuilderTest.java | 4 ++-- .../caffeine/CaffeineCacheAdapterTest.java | 2 +- .../cache/impl/lirs/LirsCacheAdapterTest.java | 2 +- .../oak/cache/impl/CacheStatsMetricsTest.java | 2 +- .../lucene/LuceneIndexProviderService.java | 2 +- .../document/DocumentStoreIndexerBase.java | 2 +- .../index/search/ExtractedTextCache.java | 2 +- .../RemotePersistentCacheService.java | 2 +- .../oak/segment/CachingSegmentReader.java | 2 +- .../jackrabbit/oak/segment/ReaderCache.java | 2 +- .../jackrabbit/oak/segment/RecordCache.java | 2 +- .../oak/segment/RecordCacheStats.java | 2 +- .../jackrabbit/oak/segment/SegmentCache.java | 2 +- .../oak/segment/WriterCacheManager.java | 14 ++++------- .../oak/segment/file/PriorityCache.java | 2 +- .../persistentcache/SegmentCacheStats.java | 2 +- .../oak/plugins/document/DiffCache.java | 2 +- .../plugins/document/DocumentNodeStore.java | 2 +- .../document/DocumentNodeStoreBuilder.java | 2 +- .../document/DocumentNodeStoreService.java | 2 +- .../oak/plugins/document/DocumentStore.java | 2 +- .../plugins/document/JournalDiffLoader.java | 2 +- .../oak/plugins/document/LocalDiffCache.java | 2 +- .../oak/plugins/document/MemoryDiffCache.java | 2 +- .../oak/plugins/document/TieredDiffCache.java | 2 +- .../document/cache/NodeDocumentCache.java | 2 +- .../document/memory/MemoryDocumentStore.java | 2 +- .../document/mongo/MongoDocumentStore.java | 2 +- .../document/persistentCache/NodeCache.java | 2 +- .../document/rdb/RDBDocumentStore.java | 2 +- .../util/LeaseCheckDocumentStoreWrapper.java | 2 +- .../util/LoggingDocumentStoreWrapper.java | 2 +- .../SynchronizingDocumentStoreWrapper.java | 2 +- .../util/ThrottlingDocumentStoreWrapper.java | 2 +- .../util/TimingDocumentStoreWrapper.java | 2 +- .../plugins/document/AmnesiaDiffCache.java | 2 +- .../document/CountingDocumentStore.java | 2 +- .../document/DocumentMKBuilderTest.java | 2 +- .../document/DocumentNodeStoreDiffTest.java | 2 +- .../document/DocumentStoreWrapper.java | 2 +- .../plugins/document/LocalDiffCacheTest.java | 2 +- .../plugins/document/MemoryDiffCacheTest.java | 2 +- .../plugins/document/NodeStoreDiffTest.java | 2 +- .../plugins/document/TieredDiffCacheTest.java | 2 +- .../cache/CacheChangesTrackerTest.java | 2 +- .../document/cache/NodeDocumentCacheTest.java | 2 +- 57 files changed, 83 insertions(+), 68 deletions(-) rename oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/{api => }/CacheStats.java (94%) rename oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/{api => }/CacheStatsSnapshot.java (84%) rename oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/{CacheStatsTest.java => CacheStatsSnapshotTest.java} (98%) diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java index 3bbd16fb32b..63507522450 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.plugins.blob; import org.apache.jackrabbit.oak.cache.CacheLIRS; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.cache.api.LoadingCache; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.StringUtils; diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java index 8c34d663bb7..e1a4c9f0f21 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java @@ -39,7 +39,7 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheLoader; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java index 6e858c1bcd0..e757dec37d9 100644 --- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java +++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java @@ -53,7 +53,7 @@ import org.apache.jackrabbit.oak.api.blob.BlobUpload; import org.apache.jackrabbit.oak.api.blob.BlobUploadOptions; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java index 07fe7e09695..6fdafe264ad 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean; import org.jetbrains.annotations.NotNull; diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java similarity index 94% rename from oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java rename to oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java index 14433f982d9..78749ef3d58 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStats.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.cache.api; +package org.apache.jackrabbit.oak.cache; import java.util.Map; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.cache.api.Cache; +import org.apache.jackrabbit.oak.cache.api.Weigher; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsSnapshot.java similarity index 84% rename from oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java rename to oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsSnapshot.java index 80fbb0805e8..7fdeaed4915 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsSnapshot.java @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.cache.api; +package org.apache.jackrabbit.oak.cache; +import org.apache.jackrabbit.oak.cache.api.Cache; import org.jetbrains.annotations.NotNull; /** @@ -130,4 +131,23 @@ public CacheStatsSnapshot minus(@NotNull CacheStatsSnapshot other) { Math.max(0, evictionCount - other.evictionCount) ); } -} + + /** + * Returns the sum of this snapshot and an earlier {@code other} + * snapshot, useful for computing total deltas. + * + * @param other the earlier snapshot to add (must not be null) + * @return a new snapshot representing the total + */ + @NotNull + public CacheStatsSnapshot plus(@NotNull CacheStatsSnapshot other) { + return new CacheStatsSnapshot( + Long.sum(hitCount, other.hitCount), + Long.sum(missCount, other.missCount), + Long.sum(loadSuccessCount, other.loadSuccessCount), + Long.sum(loadFailureCount, other.loadFailureCount), + Long.sum(totalLoadTime, other.totalLoadTime), + Long.sum(evictionCount, other.evictionCount) + ); + } +} \ No newline at end of file diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java index 252383fe561..11c5c3cd2a3 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java @@ -20,6 +20,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.function.Function; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.osgi.annotation.versioning.ProviderType; diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java index cc11a8cd3a3..3aca4d0ccca 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java @@ -21,7 +21,7 @@ import java.util.function.Function; import com.github.benmanes.caffeine.cache.RemovalCause; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.jetbrains.annotations.NotNull; diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java index 02fbf7f44c9..a812c8af16c 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java @@ -24,7 +24,7 @@ import org.apache.jackrabbit.guava.common.cache.RemovalCause; import org.apache.jackrabbit.oak.cache.CacheLIRS; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.jetbrains.annotations.NotNull; diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java index 7a4c92a38ff..7afb7d601c5 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java @@ -18,7 +18,6 @@ import java.util.concurrent.ExecutionException; -import org.apache.jackrabbit.oak.cache.api.CacheStats; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java similarity index 98% rename from oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java rename to oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java index e33f80fb905..6de1e1d05c0 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java @@ -16,11 +16,12 @@ */ package org.apache.jackrabbit.oak.cache.api; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.junit.Assert; import org.junit.Test; /** Tests for {@link CacheStatsSnapshot}. */ -public class CacheStatsTest { +public class CacheStatsSnapshotTest { private CacheStatsSnapshot stats(long hits, long misses, long loadSuccess, long loadFail, long loadTime, long evictions) { diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java index 6a87b1dfb51..4e9db8b8636 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java @@ -24,11 +24,11 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.LoadingCache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.cache.impl.caffeine.CaffeineCacheAdapter; import org.apache.jackrabbit.oak.cache.impl.caffeine.CaffeineLoadingCacheAdapter; import org.junit.Assert; diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java index cda9f1ff4da..84e70b2d242 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java @@ -20,7 +20,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.RemovalCause; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.junit.Assert; import org.junit.Test; diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java index b231067c660..760964483db 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java @@ -21,7 +21,7 @@ import org.apache.jackrabbit.guava.common.cache.RemovalCause; import org.apache.jackrabbit.oak.cache.CacheLIRS; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.junit.Assert; import org.junit.Test; diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java index 9a3deb4304d..1112ad8cb07 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java @@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.jetbrains.annotations.NotNull; import org.junit.Test; diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java index 2e41d2c3feb..b4147584ea8 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java @@ -34,7 +34,7 @@ import org.apache.commons.io.FilenameUtils; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorHelper; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.plugins.document.spi.JournalPropertyService; diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java index 096612305c0..6ac22bb57f2 100644 --- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java +++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java @@ -21,7 +21,7 @@ import com.codahale.metrics.MetricRegistry; import com.mongodb.ConnectionString; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser; import org.apache.jackrabbit.oak.commons.pio.Closer; diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java index 117a58dae74..515dca76071 100644 --- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java +++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java @@ -40,7 +40,7 @@ import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorHelper; diff --git a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java index 3c23be525e7..f89d414c944 100644 --- a/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java +++ b/oak-segment-remote/src/main/java/org/apache/jackrabbit/oak/segment/remote/persistentcache/RemotePersistentCacheService.java @@ -20,7 +20,7 @@ import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.segment.spi.monitor.RoleStatisticsProvider; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java index 6bd79f5b38d..a3200eb2b51 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.segment.util.SafeEncode; import org.apache.jackrabbit.oak.spi.blob.BlobStore; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java index 87d635b1ca4..5b684edf03b 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java index 76016737431..46c5f77e695 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java @@ -24,7 +24,7 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.jetbrains.annotations.NotNull; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java index 8ddef871521..76a70e0b501 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java @@ -23,7 +23,7 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.jetbrains.annotations.NotNull; /** diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java index e36d541103e..19b683d545e 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java @@ -32,7 +32,7 @@ import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.segment.CacheWeights.SegmentCacheWeigher; import org.jetbrains.annotations.NotNull; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java index 95031b0723c..21a749f67e4 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java @@ -30,7 +30,7 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.segment.file.PriorityCache; import org.apache.jackrabbit.oak.stats.StatisticsProvider; @@ -354,17 +354,11 @@ public CacheStatsMBean getTemplateCacheStats() { private static Supplier accumulateRecordCacheStats( final Iterable> caches) { return () -> { - long hits = 0, misses = 0, loads = 0, failures = 0, loadTime = 0, evictions = 0; + CacheStatsSnapshot stats = new CacheStatsSnapshot(0, 0, 0, 0, 0, 0); for (RecordCache cache : caches) { - CacheStatsSnapshot s = cache.getStats(); - hits += s.hitCount(); - misses += s.missCount(); - loads += s.loadSuccessCount(); - failures += s.loadFailureCount(); - loadTime += s.totalLoadTime(); - evictions += s.evictionCount(); + stats = stats.plus(cache.getStats()); } - return new CacheStatsSnapshot(hits, misses, loads, failures, loadTime, evictions); + return stats; }; } diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java index 58dc75f6c37..f8fa8521a4e 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java @@ -37,7 +37,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Weigher; /** diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java index cf2ecbc79c0..6a73d534ef3 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java @@ -24,7 +24,7 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.jetbrains.annotations.NotNull; public class SegmentCacheStats extends AbstractCacheStats { diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java index 367e136a5bd..c3128cc273e 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.json.JsopReader; import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; import org.jetbrains.annotations.NotNull; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java index 7f709229c30..4666c2162c4 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java @@ -76,7 +76,7 @@ import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.PerfLogger; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java index cca5a8bf99d..14405e2c930 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java @@ -38,7 +38,7 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.CacheValue; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java index fc9da99a1a3..6bef5b2174b 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java @@ -60,7 +60,7 @@ import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean; import org.apache.jackrabbit.oak.api.jmx.PersistentCacheStatsMBean; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats; import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentNodeStoreBuilder; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java index 2bb1648c348..889446fdc8b 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java @@ -22,7 +22,7 @@ import java.util.Set; import java.util.stream.Collectors; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Condition; import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats; import org.apache.jackrabbit.oak.plugins.document.util.Utils; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java index 4dbe51dacea..3667f40ce2b 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.sort.StringSort; import org.apache.jackrabbit.oak.commons.time.Stopwatch; import org.apache.jackrabbit.oak.plugins.document.util.StringValue; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java index 2eecfa639b2..7a5d7f518bd 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java @@ -22,7 +22,7 @@ import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.commons.json.JsopReader; import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java index 4565075e522..cde4a196e82 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java @@ -20,7 +20,7 @@ import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.plugins.document.util.StringValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java index 1cbab987399..4e528dc0b58 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java @@ -18,7 +18,7 @@ import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.plugins.document.util.RevisionsKey; import org.jetbrains.annotations.NotNull; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java index 2473b759dbf..7ac1ddf5cdc 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java @@ -34,7 +34,7 @@ import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java index d4b604796c7..d28d1696022 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java @@ -33,7 +33,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.stream.Collectors; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.properties.SystemPropertySupplier; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java index 2e3e5cb86f9..6efdb453f11 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java @@ -43,7 +43,7 @@ import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java index 2811d2cb4d7..278272b6691 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java @@ -27,7 +27,7 @@ import java.util.function.Function; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java index b5993c61118..6469d8d72ec 100755 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java @@ -60,7 +60,7 @@ import javax.sql.DataSource; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; import org.apache.jackrabbit.oak.commons.collections.SetUtils; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java index 27340684185..8ffb8796b12 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.function.Supplier; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfo; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java index b71357aae81..79a2c8c3fc5 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.Callable; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java index bc9660ae6eb..8b59b5d416a 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java index c62b6a782a8..d0c6471cbdb 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.document.util; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java index c515d77295a..974ef43171b 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java index f6e9b1ba383..14f18f395a7 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java @@ -18,7 +18,7 @@ import java.util.Collections; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java index 67eb5bc1453..fe200862d7a 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats; import org.jetbrains.annotations.NotNull; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java index 4a6a1363acf..324473fabf0 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java @@ -18,7 +18,7 @@ import com.mongodb.client.MongoClient; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java index 00612485e0e..e90dcb221a6 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.plugins.document; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java index da286e36e1c..a53007342be 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats; import org.jetbrains.annotations.NotNull; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java index baa9e29047e..38ddb3040f6 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java @@ -22,7 +22,7 @@ import java.util.Map; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.plugins.document.LocalDiffCache.Diff; import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java index 21c500b49c9..a96980e08d7 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java @@ -18,7 +18,7 @@ import java.util.UUID; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.junit.Rule; import org.junit.Test; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java index c301d68aa38..c30cde3396b 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java @@ -25,7 +25,7 @@ import java.util.Set; import org.apache.jackrabbit.oak.api.CommitFailedException; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler; import org.apache.jackrabbit.oak.plugins.commit.ConflictHook; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java index 1dc85336acb..0923ca8750a 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java @@ -18,7 +18,7 @@ import java.lang.reflect.Field; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.junit.Rule; import org.junit.Test; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java index e3cde765105..bd43c91cd09 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java @@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.cache.CacheLIRS; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Collection; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java index 95ec0567a10..14f4f988506 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.oak.plugins.document.cache; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.plugins.document.Document; import org.apache.jackrabbit.oak.plugins.document.DocumentStore; import org.apache.jackrabbit.oak.plugins.document.NodeDocument; From 64628732d05e3b8e873b2c9f1683c578419e28a7 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 16 Apr 2026 16:58:08 +0530 Subject: [PATCH 06/15] OAK-12162 : read lastSnapshot with lock inside stats() --- .../org/apache/jackrabbit/oak/cache/AbstractCacheStats.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java index 6fdafe264ad..7d788de862b 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java @@ -56,7 +56,11 @@ protected AbstractCacheStats(@NotNull String name) { protected abstract CacheStatsSnapshot getCurrentStats(); private CacheStatsSnapshot stats() { - return getCurrentStats().minus(lastSnapshot); + CacheStatsSnapshot baseline; + synchronized (this) { + baseline = lastSnapshot; + } + return getCurrentStats().minus(baseline); } @Override From c7f99002a472a5045f8ef0910392aad8dbf84042 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 16 Apr 2026 17:05:56 +0530 Subject: [PATCH 07/15] OAK-12162 : moved cachestatssnapshot back to api package --- .../org/apache/jackrabbit/oak/cache/AbstractCacheStats.java | 1 + .../main/java/org/apache/jackrabbit/oak/cache/CacheStats.java | 1 + .../main/java/org/apache/jackrabbit/oak/cache/api/Cache.java | 1 - .../jackrabbit/oak/cache/{ => api}/CacheStatsSnapshot.java | 3 +-- .../oak/cache/impl/caffeine/CaffeineCacheAdapter.java | 2 +- .../jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java | 2 +- .../jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java | 1 - .../org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java | 2 +- .../oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java | 2 +- .../jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java | 2 +- .../jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java | 2 +- .../java/org/apache/jackrabbit/oak/segment/RecordCache.java | 2 +- .../org/apache/jackrabbit/oak/segment/RecordCacheStats.java | 2 +- .../java/org/apache/jackrabbit/oak/segment/SegmentCache.java | 2 +- .../org/apache/jackrabbit/oak/segment/WriterCacheManager.java | 2 +- .../org/apache/jackrabbit/oak/segment/file/PriorityCache.java | 2 +- .../spi/persistence/persistentcache/SegmentCacheStats.java | 2 +- .../oak/plugins/document/persistentCache/NodeCache.java | 2 +- 18 files changed, 16 insertions(+), 17 deletions(-) rename oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/{ => api}/CacheStatsSnapshot.java (98%) diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java index 7d788de862b..e2e90fd0732 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean; import org.jetbrains.annotations.NotNull; diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java index 78749ef3d58..d621b9c35b9 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java @@ -19,6 +19,7 @@ import java.util.Map; import org.apache.jackrabbit.oak.cache.api.Cache; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java index 11c5c3cd2a3..252383fe561 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/Cache.java @@ -20,7 +20,6 @@ import java.util.concurrent.ConcurrentMap; import java.util.function.Function; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.osgi.annotation.versioning.ProviderType; diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsSnapshot.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java similarity index 98% rename from oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsSnapshot.java rename to oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java index 7fdeaed4915..929c5026030 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsSnapshot.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java @@ -14,9 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.cache; +package org.apache.jackrabbit.oak.cache.api; -import org.apache.jackrabbit.oak.cache.api.Cache; import org.jetbrains.annotations.NotNull; /** diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java index 3aca4d0ccca..cc11a8cd3a3 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java @@ -21,7 +21,7 @@ import java.util.function.Function; import com.github.benmanes.caffeine.cache.RemovalCause; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.jetbrains.annotations.NotNull; diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java index a812c8af16c..02fbf7f44c9 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapter.java @@ -24,7 +24,7 @@ import org.apache.jackrabbit.guava.common.cache.RemovalCause; import org.apache.jackrabbit.oak.cache.CacheLIRS; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.jetbrains.annotations.NotNull; diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java index 6de1e1d05c0..4820634feca 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.cache.api; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; import org.junit.Assert; import org.junit.Test; diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java index 4e9db8b8636..ec6b6a53de8 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.LoadingCache; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java index 84e70b2d242..cda9f1ff4da 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapterTest.java @@ -20,7 +20,7 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.RemovalCause; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.junit.Assert; import org.junit.Test; diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java index 760964483db..b231067c660 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/lirs/LirsCacheAdapterTest.java @@ -21,7 +21,7 @@ import org.apache.jackrabbit.guava.common.cache.RemovalCause; import org.apache.jackrabbit.oak.cache.CacheLIRS; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.junit.Assert; import org.junit.Test; diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java index 1112ad8cb07..9a3deb4304d 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java @@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.jetbrains.annotations.NotNull; import org.junit.Test; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java index 46c5f77e695..76016737431 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java @@ -24,7 +24,7 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Weigher; import org.jetbrains.annotations.NotNull; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java index 76a70e0b501..8ddef871521 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java @@ -23,7 +23,7 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.jetbrains.annotations.NotNull; /** diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java index 19b683d545e..e36d541103e 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java @@ -32,7 +32,7 @@ import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.segment.CacheWeights.SegmentCacheWeigher; import org.jetbrains.annotations.NotNull; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java index 21a749f67e4..16d54af4992 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java @@ -30,7 +30,7 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.segment.file.PriorityCache; import org.apache.jackrabbit.oak.stats.StatisticsProvider; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java index f8fa8521a4e..58dc75f6c37 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java @@ -37,7 +37,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.Weigher; /** diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java index 6a73d534ef3..cf2ecbc79c0 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java @@ -24,7 +24,7 @@ import java.util.function.Supplier; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.jetbrains.annotations.NotNull; public class SegmentCacheStats extends AbstractCacheStats { diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java index 278272b6691..2811d2cb4d7 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java @@ -27,7 +27,7 @@ import java.util.function.Function; import org.apache.jackrabbit.oak.cache.api.Cache; -import org.apache.jackrabbit.oak.cache.CacheStatsSnapshot; +import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot; import org.apache.jackrabbit.oak.cache.api.EvictionCause; import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; From bbc99c37bd11e27363bd9b76dc42c707c48f6ee5 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 16 Apr 2026 17:35:42 +0530 Subject: [PATCH 08/15] OAK-12162 : used Math.addExact() in place of Long.sum() --- .../jackrabbit/oak/cache/api/CacheStatsSnapshot.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java index 929c5026030..c2f4a14e1f4 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java @@ -141,12 +141,12 @@ public CacheStatsSnapshot minus(@NotNull CacheStatsSnapshot other) { @NotNull public CacheStatsSnapshot plus(@NotNull CacheStatsSnapshot other) { return new CacheStatsSnapshot( - Long.sum(hitCount, other.hitCount), - Long.sum(missCount, other.missCount), - Long.sum(loadSuccessCount, other.loadSuccessCount), - Long.sum(loadFailureCount, other.loadFailureCount), - Long.sum(totalLoadTime, other.totalLoadTime), - Long.sum(evictionCount, other.evictionCount) + Math.addExact(hitCount, other.hitCount), + Math.addExact(missCount, other.missCount), + Math.addExact(loadSuccessCount, other.loadSuccessCount), + Math.addExact(loadFailureCount, other.loadFailureCount), + Math.addExact(totalLoadTime, other.totalLoadTime), + Math.addExact(evictionCount, other.evictionCount) ); } } \ No newline at end of file From 78f990d77494d2bbfd4269594d0b991a16ceede9 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Fri, 17 Apr 2026 12:35:29 +0530 Subject: [PATCH 09/15] OAK-12162 : updated package major version --- .../java/org/apache/jackrabbit/oak/cache/api/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java index 4bd384ffb3e..ce415459ccb 100644 --- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java +++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java @@ -19,7 +19,7 @@ * For Oak internal use only. Do not use outside Oak components. */ @Internal(since = "1.0.0") -@Version("1.0.0") +@Version("2.0.0") package org.apache.jackrabbit.oak.cache.api; import org.apache.jackrabbit.oak.commons.annotations.Internal; From 3cb4cc3fb9bcaf438aa44f41d601eb9c5fd669c8 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Mon, 20 Apr 2026 13:13:07 +0530 Subject: [PATCH 10/15] OAK-12162 : fixed error while picking oak-elastic-search jar --- oak-it-osgi/test-bundles.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-it-osgi/test-bundles.xml b/oak-it-osgi/test-bundles.xml index 14e87fd7d3d..509aa79320d 100644 --- a/oak-it-osgi/test-bundles.xml +++ b/oak-it-osgi/test-bundles.xml @@ -56,7 +56,7 @@ org.apache.jackrabbit:oak-segment-azure org.apache.jackrabbit:oak-jcr org.apache.jackrabbit:oak-lucene - org.apache.jackrabbit:oak-search-elastic + org.apache.jackrabbit:oak-search-elastic:jar org.apache.tika:tika-core org.apache.jackrabbit:oak-blob org.apache.jackrabbit:oak-blob-cloud-azure From 11f5c7bb0181e4b6f621f1945f83715dd1439d35 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 7 May 2026 00:12:34 +0530 Subject: [PATCH 11/15] OAK-12162 : rebased with latest trunk --- .../oak/plugins/document/DocumentNodeStoreBuilderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java index d37acf496e4..10f7c1b1415 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java @@ -21,8 +21,8 @@ import java.lang.reflect.Method; import java.util.Map; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.cache.CacheValue; -import org.apache.jackrabbit.oak.cache.AbstractCacheStats; import org.apache.jackrabbit.oak.cache.api.Cache; import org.apache.jackrabbit.oak.plugins.document.cache.NodeDocumentCache; import org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks; From a6be46d4f78a507096d0241d1e72047eb9dc9f81 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 27 Aug 2026 18:44:22 +0530 Subject: [PATCH 12/15] OAK-12162 : rebased with latest trunk --- .../jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java | 2 +- .../segment/spi/persistence/persistentcache/package-info.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java index 7ed7f56aad0..c68841b2a87 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java @@ -31,7 +31,7 @@ import org.apache.jackrabbit.oak.api.jmx.FileStoreBackupRestoreMBean; import org.apache.jackrabbit.oak.backup.impl.FileStoreBackupRestoreImpl; import org.apache.jackrabbit.oak.cache.api.CacheBuilder; -import org.apache.jackrabbit.oak.cache.api.CacheStats; +import org.apache.jackrabbit.oak.cache.CacheStats; import org.apache.jackrabbit.oak.commons.pio.Closer; import org.apache.jackrabbit.oak.plugins.blob.BlobGC; import org.apache.jackrabbit.oak.plugins.blob.BlobGCMBean; diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/package-info.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/package-info.java index 96eb50916cf..53d27bb8c8a 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/package-info.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/package-info.java @@ -15,7 +15,7 @@ * limitations under the License. */ @Internal(since = "1.0.0") -@Version("7.0.0") +@Version("8.0.0") package org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache; import org.apache.jackrabbit.oak.commons.annotations.Internal; From cef6bcde18717f6e60233b913648992d91846f26 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 27 Aug 2026 18:46:48 +0530 Subject: [PATCH 13/15] OAK-12162 : remove .DS_Store files and add to .gitignore Co-Authored-By: Claude Sonnet 5 --- .DS_Store | Bin 22532 -> 0 bytes .github/.DS_Store | Bin 6148 -> 0 bytes oak-api/.DS_Store | Bin 6148 -> 0 bytes oak-auth-external/.DS_Store | Bin 6148 -> 0 bytes oak-auth-ldap/.DS_Store | Bin 6148 -> 0 bytes oak-authorization-cug/.DS_Store | Bin 6148 -> 0 bytes oak-authorization-principalbased/.DS_Store | Bin 6148 -> 0 bytes oak-benchmarks-elastic/.DS_Store | Bin 6148 -> 0 bytes oak-benchmarks-lucene/.DS_Store | Bin 6148 -> 0 bytes oak-benchmarks/.DS_Store | Bin 6148 -> 0 bytes oak-blob-cloud-azure/.DS_Store | Bin 8196 -> 0 bytes oak-blob-cloud/.DS_Store | Bin 10244 -> 0 bytes oak-blob-cloud/src/.DS_Store | Bin 6148 -> 0 bytes oak-blob-plugins/.DS_Store | Bin 6148 -> 0 bytes oak-blob/.DS_Store | Bin 6148 -> 0 bytes oak-commons/.DS_Store | Bin 6148 -> 0 bytes oak-core-spi/.DS_Store | Bin 6148 -> 0 bytes oak-core/.DS_Store | Bin 6148 -> 0 bytes oak-examples/.DS_Store | Bin 6148 -> 0 bytes oak-exercise/.DS_Store | Bin 6148 -> 0 bytes oak-http/.DS_Store | Bin 6148 -> 0 bytes oak-it-osgi/.DS_Store | Bin 6148 -> 0 bytes oak-it/.DS_Store | Bin 6148 -> 0 bytes oak-jackrabbit-api/.DS_Store | Bin 6148 -> 0 bytes oak-jcr/.DS_Store | Bin 6148 -> 0 bytes oak-lucene/.DS_Store | Bin 6148 -> 0 bytes oak-lucene/src/.DS_Store | Bin 6148 -> 0 bytes oak-pojosr/.DS_Store | Bin 6148 -> 0 bytes oak-query-spi/.DS_Store | Bin 6148 -> 0 bytes oak-run-commons/.DS_Store | Bin 6148 -> 0 bytes oak-run-elastic/.DS_Store | Bin 6148 -> 0 bytes oak-run/.DS_Store | Bin 6148 -> 0 bytes .../java/org/apache/jackrabbit/oak/.DS_Store | Bin 6148 -> 0 bytes oak-search-elastic/.DS_Store | Bin 6148 -> 0 bytes oak-search/.DS_Store | Bin 6148 -> 0 bytes oak-security-spi/.DS_Store | Bin 6148 -> 0 bytes oak-segment-aws/.DS_Store | Bin 6148 -> 0 bytes oak-segment-azure/.DS_Store | Bin 6148 -> 0 bytes oak-segment-remote/.DS_Store | Bin 6148 -> 0 bytes oak-segment-tar/.DS_Store | Bin 6148 -> 0 bytes oak-segment-tar/src/.DS_Store | Bin 6148 -> 0 bytes .../org/apache/jackrabbit/oak/segment/.DS_Store | Bin 6148 -> 0 bytes oak-store-composite/.DS_Store | Bin 6148 -> 0 bytes oak-store-document/.DS_Store | Bin 6148 -> 0 bytes oak-store-spi/.DS_Store | Bin 6148 -> 0 bytes oak-upgrade/.DS_Store | Bin 6148 -> 0 bytes 46 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 .github/.DS_Store delete mode 100644 oak-api/.DS_Store delete mode 100644 oak-auth-external/.DS_Store delete mode 100644 oak-auth-ldap/.DS_Store delete mode 100644 oak-authorization-cug/.DS_Store delete mode 100644 oak-authorization-principalbased/.DS_Store delete mode 100644 oak-benchmarks-elastic/.DS_Store delete mode 100644 oak-benchmarks-lucene/.DS_Store delete mode 100644 oak-benchmarks/.DS_Store delete mode 100644 oak-blob-cloud-azure/.DS_Store delete mode 100644 oak-blob-cloud/.DS_Store delete mode 100644 oak-blob-cloud/src/.DS_Store delete mode 100644 oak-blob-plugins/.DS_Store delete mode 100644 oak-blob/.DS_Store delete mode 100644 oak-commons/.DS_Store delete mode 100644 oak-core-spi/.DS_Store delete mode 100644 oak-core/.DS_Store delete mode 100644 oak-examples/.DS_Store delete mode 100644 oak-exercise/.DS_Store delete mode 100644 oak-http/.DS_Store delete mode 100644 oak-it-osgi/.DS_Store delete mode 100644 oak-it/.DS_Store delete mode 100644 oak-jackrabbit-api/.DS_Store delete mode 100644 oak-jcr/.DS_Store delete mode 100644 oak-lucene/.DS_Store delete mode 100644 oak-lucene/src/.DS_Store delete mode 100644 oak-pojosr/.DS_Store delete mode 100644 oak-query-spi/.DS_Store delete mode 100644 oak-run-commons/.DS_Store delete mode 100644 oak-run-elastic/.DS_Store delete mode 100644 oak-run/.DS_Store delete mode 100644 oak-run/src/main/java/org/apache/jackrabbit/oak/.DS_Store delete mode 100644 oak-search-elastic/.DS_Store delete mode 100644 oak-search/.DS_Store delete mode 100644 oak-security-spi/.DS_Store delete mode 100644 oak-segment-aws/.DS_Store delete mode 100644 oak-segment-azure/.DS_Store delete mode 100644 oak-segment-remote/.DS_Store delete mode 100644 oak-segment-tar/.DS_Store delete mode 100644 oak-segment-tar/src/.DS_Store delete mode 100644 oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/.DS_Store delete mode 100644 oak-store-composite/.DS_Store delete mode 100644 oak-store-document/.DS_Store delete mode 100644 oak-store-spi/.DS_Store delete mode 100644 oak-upgrade/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 2dedeb507df86cd8acbe0afa6cc65ddbc1de42b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22532 zcmeHPeT-aH6~Aw0_G5Op?d(UpP(GY=!$*ZJ+e#=2Xoqc~U4?e-7Hs+2otd4^PCGMi zn3>(uHjo7+0SyX9i62obCI+-3G%r#0$1-3e0Exz{5+E)%;1lPa|kf&^?;i@b$rJ0oz zX|qs*--NgecoU)>UW@8-W#ACY%RmWeA8U}#XNi{a%t@ki?#TM5YvuIRb!%mSb_ME~ zV`VKI!LmA}EMB#a76UB?S`4%pct0`#b2lEH-PXDF-eRD|K#PGo1Lz;(@WOMVcAmG+ z(sjTaE}`*vTtdqOuH||b&T;$#&WYN2-a5lKa2S>5(8;qq;;q;(oQ=aBec~kYEKxI;T<;$yJIEp-tz9*n2WvXrTCB;-=ZJV#=wHa$2`=HXy5813u17A3| z*Jd%^quO#BXVfRS+F*=bGjvB^djF;{&mA%WMZ2W8WWr__C`;>!V8Vq?XhRD0?$Y)_JWnpYdzoVhX zH8Dl)qQwyR-*%n5eTw$0|EQ?B+QlwK>MzYu4jx979nwz}#0qge^!z+WXPly;i;B(S zVrc1g;xag|0F7x)1J}Nkk6x*9snnW)_hGS7Y!X}GY6A4DP-<1Pfa^qRp-tX<%)r>x zR+Qn#AZPR>>2XAo@of}t2BhRy%JJ08-^so4a_#;q_G?)Z<+ZT{8laY%i`?J@fx3ZlcPvuACF!D zNb5Ez#_^3$?yqH4$nQ3~M!!>By>A}`(~?D5KiGXSD^k3cp^#QfWRpnKx(adLSDf}} zjSpS;OI2gd4jqN=QndC$OkwT2>h;M%y^7Yn#W7$%WG&JLIyt$r)K`;_xl1yn;V#_i zLhMkK1CILpQxjU^bm@ZS;L0;uT@7+bLJ1%EmRy$ySx+*iUe;^<)*u}2g@ zqo~Qo;QZj2U&H~Z zDfRg=;GhVvJb0Tua`ig{KD-PqjvlC_&uF+x5i7_z>;c^h{KNP&C9O1^2?fmaOm7f; z)(mK+fs;wl$EYj|pQqsyuENm=Si5;vz^_`?5a(59Eh^TEOQCL;!_3-vUR|c)UIZGO zBu|^g7C>&{P@96C4?C!i~V#eGxQB787E2GKsRrqO(Y35VvI+?m6m)SKL8(3== ztI1q3Q1*w;w(Kr}%z*ucG`GH-$rPo%P20CuGS#i*dfQ}d zQ6*hA^Z9YJlB?#-;JuVQy435H=)EipnOvaf2v%ODOcd^(Al~zSuQ7w+05wf zYx2odCcmjTYF4Xe0VUB|+ANNjGiYgR4z3Z)&>HEcgcwSE%;I+_ai(<<6GMve&H;5* zI~zj>O9^?srDzs2(dbZOy!KP4I15I{W#S4LZF|I>;%nkw@rd}D_?>uNylHe8CmPF) zvy5|%4;yQY4aS&prI9vfjGVE<(hsRd$8kpvqXHjX8=d;Tw*Egp=p{>iVdSa1|Msch z$W?}`ZR#6?$Wve0HV{V)uC}$i7=3cCKtF{eJ_Y|Uca7s6<2sy)9BZ`52VkJkyBgi% zqu|eqAfJPGT;1i+!|_?ffR#J*YTe+|#=uXZKgYFy!}UI9L77$;NMnRxX*Sk@tRT~| zb|G3jE@7V{uNP*=yrgM6i_o(-fwX3iwyxNBp^88qQuZp#U5d7(h$Nsek~voUU2(T2 zL`Lvlwq`dC5#+ZRB0H1oYJs8bd*R!`%B9HHJb90bMgx>bdw6r2jG@7UP*IYFu<_+# zu7w$lGlM;sF=J;59GZ-gZfJAQawrq?fBCLr!oxmgAeaV2-ZO&87uUwAy%)OCUSiB! zWi=*l*O+L+5@V+Q;nmI6gEBRB_sfc@Cd#MG9i0WnWaktB5bt_dw#F}HQCUxW*Y+9f zU6VgJ7Img=L3WZOAIJXq5SV<|EU=dADPb)a*2h3f&O*5IF2L9?!+fO0*_fwgt>URm z88>$9ztyiS%H~@;BWm}8XBo6F2i2h*80J2xmRRD&0nFxXcR%l`GUoX@iFul`ML81U zC5R}Ss|)3IuRhevCJaw?1|^4f+*ung_3%mOV~e>Bwl1GTMYC#%H+w zlg-tGviaB-+7+8klux-lItz?R>)yBhR0_t>rk*dt9T9@^<&bBrbVP3fd4~+ee)}0I zwF+w>XRpJ&#sC-&*8myY&=ccP1<5BZJ)VQ)dPwYymXA@8T#u2XFkrlc z_Ut%EB=d9>k*gj<7X99Dy~>~ngFMepkp_`xEk~b!$IP?bKc=C?92`YyXN;vZ!?x{E z0i-nvisuO@`IEU5+h# z{#ExdE4V)5JxxA;Lu>D%#c&wehX99*Bt>-3ONSLAS7{rYzcfP`l0D4c=Zm|1oOf<< z--eDEcTG~vfow1aA~!w(3Q>`Qd>e}oytIN3Rh(mSBe7OUd(w>WuPuNga z?0Hj4GyLbw{Mc!aBE9mavsBA#cIYT{mtwWQAc3{FpX_tZHRDR3wQNHjhUB&-n5%0j zNAW!H#cwD)F0yt@`N=YD_ddn3;a@kxJyGy%7$2$fxfR+zc0Gs=!zP}1g<&Id6x*sV zFH^m;p-tLiezFXka9}fGe+52iq4m8mtl3@KtpxHl9fmD*gtr@!qu3Vp{mI#GOxA8U zKUsz?B7LlVNBcU6K5_1JdCpPp5}~ct^;|{5Oy2qOhrcDyH|FhkW zt2}S!`0jQ**6}~?o`GY$8{RI4)DrB3rhor0LH-7y6l}e<7-%tY{4roe)=jJ%1zd&; zwh(+Dhu0Lm@IbkFynq9)@n<~CKg9zdI^pA1{0{%^(qnEPef2)crMf5iX)1u&iHg8%>k diff --git a/.github/.DS_Store b/.github/.DS_Store deleted file mode 100644 index 7a732361cfbaf8a6a8ee9135abdfedae3b253432..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKQA)!=5S^_BQ~c?tA0m5&9za-2JVC$w5Tq?yF(JV!#lM`wD~KoY3gQVof}g(G znbyQa@k>-@VD@chXLctqA(J5@H@=yVh=xRzKpA@j3?0JjtS#xOg%@4iqoiwEX6K{H ztY~?g;WskC&u*KRG@~oJpxX1x%UZf0Jn|wcuNp=KnGzN?TV_?Goe;+)QF(_7o@za4JwgA9B%uz7sUV>x1Vox@t3Y1W% zEryeD*uDA%#Y#}Z$!YW9^kkXm~YwPB?)_UkEl!g5&!A%Gzu@u9XOYtr=3hbUIz@S(O!UC}$fk=Z5 J#=ws<@CGC$RY3p% diff --git a/oak-api/.DS_Store b/oak-api/.DS_Store deleted file mode 100644 index ee6a87a7a53ba9976a5adb29ba9aae5711e8224b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-ve05I&Qtio{Z}!01Py3kwoTqp+~{1)wb|L!(qscE1NBE3big4aCUC8}Oa) zN@E%r5rR9({_OklIiD2UM?|i?oehZwM3kd3Iv#Wgt2<3Q>dZ#RYYfNJrd~$v+NLhQ z7I^O&-Ox2n7xVW1?;bXmx~ZzkqM1OGk51m|`kZaqeV|y4mdDE1zT^{X^b|i7{Xd7z4(@|6~AnHcP%MXuUCD z3>X6+4Dk8j(HINGAQ+Dhbn%%F>_Hs`W3DAQ#w!+zK@b**lTe_9IxR7rghTJuuTTtv z5>8GF45yjb#fyvCvA&P)|JjVZXow2*$}H024k(4x&-)p2zSj6oVkI!ul8vw1+?>#5!Z(2N-w< Dz^Fx` diff --git a/oak-auth-external/.DS_Store b/oak-auth-external/.DS_Store deleted file mode 100644 index fd2d5379c3ea46f83bf72b8c2e0f3241685639f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5B>J5FKwKv=S5%4OGZih^Xi`(Q<-ZAS6Md$Z8`9y)Qt+0T2=$_drM-15r_O z0^WEA;)R70A()ZuXV1suebU+!rGRyc?v}**DhZNwVtB7-6(QD>_2P zIUUm~&6@2EEP+g7N4;7fS$O7wRY&b1lI!Ua?RNg0MiGgaRehX^G(^9D1*Q zg<=qtaB^CFIL-W4yttSh>-*?Vt`M}|7%&E!40L4L z9F;?Sl-{kMK9BEOk2XeQVZXow2*!;^0498n>_(&5J&)m6C0fwv~Ef% diff --git a/oak-auth-ldap/.DS_Store b/oak-auth-ldap/.DS_Store deleted file mode 100644 index a9dc642111758d4ca8c97ff76c2468573086e81f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5B>J5S<|rib#`^(g&a*H&~+03Bm!$2ZbW5jUb3B(iU_agNx80S_)1;NlQh? z8_z)2uuvidGm`!6`FOlfTH8ZJJUE~AiF!oTK@(&dG>E7hORg!t@vQe{8qeh%#QU#bSKUfy>|wjfs}!kPJ43y5An-17Wrw2&zu2g;EyrD?R=CE z@KJWRe)>GQYXjO5nuz#SGJs&5JOVJ0b7VIf)gELFzs#^wlvP9@!-4(~h=h3O4Ez8C EuRqO8P5=M^ diff --git a/oak-authorization-cug/.DS_Store b/oak-authorization-cug/.DS_Store deleted file mode 100644 index 62ffc5781d2291ee0f820b49d21df62e419a1a4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-ve05I)nYiqxeeqhVz08-yxZSUV#@TU3Tdsi45>1qq4A;8_sw!N|;v_|A9G zmKdE(khj;dbo;5(mW9|r*`OpF0zz!)$Fwv++f*(_OK&}L)67%&Dt z8Q}B5V=(55K`_Qy{YwjgD#w+HEK@b**lTe_9I&CqWghTJuFINnL5>8H= z52uwsnim(VBfpRCyQhK*; zydK}R9^(Xqh5Z6AAXq0q0eIkZWH%bc?s*NrTrmi87S_jbp#2C$LToYyeu05^lSD~T diff --git a/oak-authorization-principalbased/.DS_Store b/oak-authorization-principalbased/.DS_Store deleted file mode 100644 index 015179e11489d8ca485f57de8316aadc77ff1071..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5B>J5FIBGS^-5$O4n3LO|wKBE|7{2l0~7&Y9k1}PrxNO0tF{PoC8Yw^t|y5 zWK9-IgkVOppFJOs_epDeh{%m@${|soh%z)r$AcDOb*rhP&TMqN#&9yLt7X*gs_nM} z@4ZXcbVakpyt)6w=Z&SRi(_HUIbF~y z$vU`y_-t?HKIyD)$FEPEJ6WTuH#_*sC)vl*fcIfy3>X8(fHCkt8Ni**lI;mvZwwd% z#=r*yd_H(I##}K7#-jsWECGN$sH0%awFJj_#auB6!UAy;3Y1W%C5Dr5=)L;oia}7q z$!YQ7H1m7$;$n8J@1r}pT+n)Bz!*pw=*qOu_x~8bOly&!hSqg Cyh$kl diff --git a/oak-benchmarks-elastic/.DS_Store b/oak-benchmarks-elastic/.DS_Store deleted file mode 100644 index d6f557169add0065225dc103db58653a4c914068..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5Iwu5S<|rN|YvalzWBTz(h_%Ng65yNl;S6as;8bxC9Nypn(g}atwqx03~mB z2C@c2i4e?4yKg<;^^?5oAtD}L%mze#BI;lWvMd@z)QzSsa~2~@j=^|Z7ORF7zgH!D zZ_zoO(R4Xa_kVM+u@q&VPnP8bnojTXdGYdizn5BP-&j|RBr6Am(KfB=1Qq9WO6#<0 z_x9@Wqdl#Cw7+vbdWyAcIf`<#gRgwjeRS_0WFIchfHU9>I0OHa0o>Ulot~o4&VV!E z47@WS=R?2{%nU2VcywTjEda0$brh_nmynoXm>E`zus~Qtff~xzVz7ooAIvW^tQ0kz z*qRTv%5TjJ$Lh!*qC0V>=(9864AdED>0@8+{}Dc!#wNcW;!nQ?iK86GRM<5d7lQZxG47>uM C(n*#8 diff --git a/oak-benchmarks-lucene/.DS_Store b/oak-benchmarks-lucene/.DS_Store deleted file mode 100644 index c7a0ed2dad2cf6585bea46b7ddb6e09cd9adc32d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5B>J5FL{hS&1ekrLT}1EYao!X{b<0f)b>xHcA5Z9)q3>a0i6A1r-INpr+)F zXF|MWp+tzxNcOYm z`Ln=#Z_$dDG@ei6{XgAqEk&8n2jBU``)FSec^@XmfH7bU7z6vs0Pbv-^hnTp zW55_N20j_!^TDGrW{Q1 zyoZm{yLIRD_^$P6Lo^olt9Ssxxb_IZgwK)VU=+LOG5j*cN|0A!eFz8ILm&`hoiXqW G4155z6-@R3 diff --git a/oak-benchmarks/.DS_Store b/oak-benchmarks/.DS_Store deleted file mode 100644 index f1079f6114ca071135ba847ebe94cdeb220ff537..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-ve05Wb@oio}wU(T_miz*OnXkQacqs6}c>1!d2|3LSVSUV(`X39%zF@|}H9 z2LdBPa3|T{<$ipZPl_EA5f3k>1EQRWG7Lc$r9;Hr>Dtm@ak8v2C?|Eb6f2*o@3({W z-lKCmqsd~H_P<_lJXKv3<3&A&CA;#^^Owil{nR`C#=D#+tDf#5jkak;N2oZXV_KzE zv&*~kqd%>EaQ|>KdJ45$YgF~7gRf%JKCX8(fHCm@7{Hk=lI=va*%&Ye zjDdFsWPflNf?lzS7`6^f;R*ok!yE*9E(*{odc`IpJP?klz?jN<#o(9@yVE$Y*hGx! z#CrK)t^9U*;ZPmxyAV$7Bid{X7z1qvdhs!r^M8a-rt^~DPO&Frz!>;r3~;|Fiy>Z0 z&(=?`Cugn0IK&Wh5^9BF3|2p@rowwqIa~M9_d3Q7!Pn8>JUvuJn*9qZ!=&RFbo(5 z3Odh&0K{$_mJM~R17wV& z(bd>cC_^!)svd|ACA!2QDje;Oa7T1CHWaFGASxV)o|)(hg~-`4&XMjwT!ls&1`Gq8 z42asj2V&q@xu0&W-?@(#ahOWjPrsB6HGnQiA%Q?u`8!@ezuGIRjg|vmk7Z=;?}xkb zbv`-iM>5{J&i<|c_~f_oR%`Wttno@q)~+8!@&k~8hwG{Vg{*yTt=a{Z2zQCpgQz zkkLd2gjI?zOV>kI_vSS`n15VG1rMsH{3aFbT- z!+Tt3Y4xk!p}9LT`V8(4$aGf{N}0?zy}X>#Y@tP8tl0f&knkv);c1wKoGmV;$n{i4 z>r-r*js={!wR#EzJSMK4J_R->gmHzUud(KIXZEaUZsFyKtBykDlp$C-qR zl!ePL6qN<{T2uK2eQ&oRzuzTnO%OCGPXlQ0fnz&xzNCVU6q z!%uJ*9>8Dl9R49a#3skdNpg-{BA3ZkGDW^50a+m-NmPPd^N0RaJvSvuQEU65+m6>C zzdYS*Z#`sRUpaAa;@N$1$l7w$`R-BM&!_FcJ!)Wz_8jZwghiaya9m&DxCKYJA-WnH z3ULIRx&I{%Mi>U(8UtNw=3!C)f4=|U|KHmB%*2KP!@%ojfOJomC&g#Jx|%yD%;AuO u{T6o7gkM9U3_&4W#JDWS5qJJ!h`OU~uEvH!v|uwI0+I$J3YW(H>7n|U8I z@3(rp%o6~RTCZIJumHfo&Z)T{hg}+%^FGu@)XFiW1nmKO&<5&tDs_hqY3l`zfJQ(g zpb^jrXat@I1n`^9n=vM-9yJ0Q0gb>m0{s18Vdu1}XkSwC>cBx<0g&c!Sv2JF9w2Ni zMXQSTB^9RVQ{EnkG9~JYL8Lj#Ev}BVs%T$QX%0l115rB@bweRyceJyFI*_WQdejJL z1cnjdclSJ;0S7#=)A#poAeBX84QO=P%uLH;Ez~ehJo@af_kZ~DjbT4s)_wx5V3k)3 zlHEl1=CF#u@I;ZUBqTC%o^4tB4Eck%UM>DD&XAJt?7o{kyRYz_hXD8OA{w`G^kzNg zs3`fdc!X#E6-{W5LIfc=16rT&uGQLz0_E#LEAZSXE|-5HBcr(&_T`PdF=pJXud
VVkvNkK1&Rw3eD&@+#t*wGlES-JrYIDu&`s|*F3W$2a!T~wo9`7Tk zVs@Q%6%F}0iRO3HOyViLIJW=5!Etlq(BX;6iDI#Mj=y}oX&!Fb&RQqr=bUC9 z3u|7F-spsGyB^q%>vtM4y&c!xyR>N@8c@AT+qZU>7VZS7Gr6-M+`Sc2>I;8!D=QI= z8!3LNX^uxu$UJYJMQ-dee`z^FlxJhwo%L53?zoN!&jnl*Ez&STI%LyWvcu5!JG6G^ zrf0XPH|N(_9J6l2b(k+tJ}%tibUviqW$DU831X@GPQsj&j0q*lU?NQ>oT8-kT~HPL zg3o+fC{^dBq=28wQ}}ay7Zza+?!rg#F?Y zi9=S2OG4>jBzeTI$ayl72s!nLGpRTF<+UA2I`JNieD&cU4Uu@tE}itl(oE9jKH(cH zyY+hLd(7|P3P0UGi1Bq4LI)_s*%TxE)agXb=spjLcJV?c(JudwM9aja({1mjTjoJ$ zlJ46t{v1q%bm}et`oTBT@|&0OkxszJ>15LId-2W9_!vk=Jce!>0gZr0KqH_L&7*yi5b_@G^*m>i6eMyB04x${7 zRFva!!prfZ$boBRN8{x`j4<|EIAow>??8EpzXFmiPbv0H;>! Ay8r+H diff --git a/oak-blob-cloud/src/.DS_Store b/oak-blob-cloud/src/.DS_Store deleted file mode 100644 index 4599bc4cb122bab0dbe48ebe967d177711e955e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}*0S6n_Inwji=VtB5ga?8OAsmY85-3~Rw?V+@26ECSZub|@RRGtKUn3WTI* zJ^2Ut2YB^l;>DvEuilJ*f?hr8n~&vFFCL5``;wX8n|U9*@3%WUI{-imty&(y1ONk@ zz(gN*zY$>3*qhEhZ6bo%^-(Tii3#wzBBV^=rpzPQsF?s321wdhLScWb4lU3FQ#9Mb1u$=#t9 zbNHC+0X1Bsy_F;c^nmiyy@`O~$262h65_Clm`LY^EJqb|Tf5=-UpLv|s zaZdOrAOs2lgvVa`w`e>3(&O;7il)uzKdlAEb;S(C4E!|%;`@-nCeYH@Q7Ath*vTUR zVgje7pe}#?5i?=}(bCvah%+ceg(9j@qK_CvpB#t^N4ur{I|@}e5P4%D8w0*_(wp}5O*;H|CE7W8L!^R diff --git a/oak-blob-plugins/.DS_Store b/oak-blob-plugins/.DS_Store deleted file mode 100644 index 74aa0e87825bb365f842a87b2336565666513f50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-LJD5T4B)5)kCG}P0b@6z;9a|^gSm%dP*7Zw-(F!eS9~Gx` zK#RC)vitJz(H_^{I=#KipKiEzD@Ro?ckq=@ypNOK^-=%oH0zSRhV9ffDMp#c&c1y;r|X zu@RJTa@u@2t^C%!xKJJWeQ+n23EFH77z1qvdh$5n`+o;r47h$V zDssG(-mRZrkMCNKv4_FJehn`mShs!x@WAKDMlg!q^BR7cVk5{|SRcZH_9GAovB?Qd`Di$^tW=5WYf$w|= zjn&W*A-I$5&%Pg@^F^_9MC8ib*@$RJLSfXn)b`tf z_uiu$x~A!3-roPq$;MJQRW(^O6KIO(^?QB)x;|}NXFIIRtJbRfh$0%$iY}0GPM5UG zvK~Hc+1t5e^>kOhJ#y}Bjk?+F;5(meA4l?%IGKqtUvfwB8sn266^^G9B{$e}+${v&hdwY-S7?1AmMG*RRG^iHFj= zb?fo?uJvf=Xe{g(c>uvU`w75=&ynL~6uaj!{DNW>a z)QzqlMRW#|FUkBRA8fKiM6SGC)MpbDFQ0?fsAW9IC0Cs+z5v8CJ5}tLOUq;cnE{F22!j&RS9Tr*NZP+R_O!F6orE zN!Dt0{88V|oj=_imXG(GJBd*@?>qR)CfUbPKnN3Kz!)$FjDdg30N!ktY#?a8F<=ZB z18)rQ{ov6U3&kK9uMTvv1OWE290g;pCD_L+7K%X-8i*5Dptw3MF`T$#-K$-p7zD+g zoE9HWGrtxuE@nr3AI-@Xg4P=Y#z4wIPo_hD|Ht@bI*a_&#b(BUG4RJ2aQ$jhl{l2X zt)Gs^Z>>k0qOq`D-~j~V diff --git a/oak-core-spi/.DS_Store b/oak-core-spi/.DS_Store deleted file mode 100644 index 84e4d6148d12602a83322574fd8f51439a0c2086..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5Iwu5S<|r3PMOJDfbHLsF1NtMT3+JKpYf`SdJi6G(H7&B+i030xhD)Mt3o7Tc_WrMB=VqzuqL|F<2{eO;{JFY)x;toFr{7o?=dG+ej|ihpTGA;h&ghJm zN!7iZ@}s?7dwsmx&)4@-JIPVi?>qR)C)vl*3MpKi0cXG&a0dP<1GuwA2HT20I|I&u zGw{ZMoDTs*Ff(ivT diff --git a/oak-core/.DS_Store b/oak-core/.DS_Store deleted file mode 100644 index 5ce05b3f1a22df91fcbf2f999e3b7a0df80f0cc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5Iwu5S_&lSfU9X(|d<&*9sTLz>sF$RnQW55{rrwriEX34h&Z8ips z0b}5u0X`o*24kTZ1mn?xDYgK>4%AVw=3athykemk1Yv)0)nbYiU7p%fLNwuzvKk^BST_wWPQnfV2%u8GLC&-+cH1`*ZajFn|HUl@m=vBz8yBQU3>KrMCtis7^z@yO@J9&<%4 zC+9C8&adqJ4aLdom_L$qa diff --git a/oak-exercise/.DS_Store b/oak-exercise/.DS_Store deleted file mode 100644 index cf46d4c3418df1c9ebd2cd340b2dbb6da1b44f46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5B>J5FL{UZA6M78X6>DAvai}O-+#tKoYbmve^iNL_x6~C5M0ma0x^SXQ1R1 zyzvZV9TrN2U`Dc^Js*$vNo#wE$PF&0eWD%_C1{L}2MxmNM$?u$v(fPy{n4Z>mOXkwWTPtY&icXL* zr&C%*S-aOyoA!F{*Uv$&R4) z#(*(k416%a=YvOMOcg7^aCD#xB>=Dubr6iXmf#q#m?~C+ut1!I0wvUGiQyz1dar(| zVkIcyXPWQit16f{VCh1|eIrlZRR$OnZY#u0?x4Fw%{pye7UEoY#lrK94_ z&Op3iC=r4gY4@$?yMB^)Jw(LA%h`aaPed7pAj_gfMBQrYn6nsJatub(s$90D_`NFG zdzUWgoTiI;bN|=R8%tRg#bi-UpviXDyJxqL_Xkbu>>KOyw3+n*VYEdn8l&QzPH2@> z?Hr9i+MBiaU+%7or?u2ha+K9(2VeOl`{>@tK3tpuXTTY72L2}lxU)sFZAG7*0cXG& zcxOP)hkzlN8`g^P=)e?P0ALU5C|FA`Au+))H>?$5fv|=GHI%KzU=4>pm|t#KD{45g zH6Lu1-pXJ^0}NEztrV_)w7Lwqu=O@12UPtJfd@W&Y7UNI_$cqzME zKfRvZwE^Q8Lqz;)SwOH(egg0y=g3|(sy)aWez{?-C|N`w!-4)I5DD?g8TbJPUIDaT BNY?-W diff --git a/oak-it-osgi/.DS_Store b/oak-it-osgi/.DS_Store deleted file mode 100644 index 997ac39c7904434533ac3a71e62bff31c2cc097a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5S^hBiquV!Sg`aJdV^4x!;Ty9 z#vW9M29`+B8OeF}e4Qu7&JYm~?xuaB9uegjf-I935p}C+Po2fclA}MG)YT$rvHlYx zd+*RK-Oyw{OZR`U+E}W(EXVVD3{C#{a(MNyULB{_=?~V$Wt#OKVYE+6I!DDBUC=VE znyufvU+rn_)8~`x;oFncZse%y%?`fvN%xVxdZaKh28;n?z!=z32K0{3<<2oN28;n? zAZ0+#2Zte8DEf%u=)fbi0Kg3DAec)pAu&#|Q1lUDfp823#!%K4gJU@KPW=i+A2Eg# zYxBWc`LlW9P#yVQa3?Mz+S3>?2AT|X;<6|A{}7){Ym?s$v6V4k4E!?&I4eix057F? z>(=YZUF$H;Fhs=9%LIaX<0k+MIY*9yG1{HX;a4d7h>}J0AslEw0)Y^F7z4k+zz3iG BO3eTO diff --git a/oak-it/.DS_Store b/oak-it/.DS_Store deleted file mode 100644 index b1e763a544b72094c2b2a61b484a5909f3d7d344..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}N6?5T4jl7QFN#c+A0r*Sl5?^w5?R6>lUqNqeoxEvuDA(2tJ13#i#I_ z%-C*h^(dksxmc-Y-Ky?uGyYih^eXlKWbsGR^e>d>4Hk#Ryt zG|#f0++TgxH*-H<-t3fbPnX6o2KapNXpBKI3Z|n2T`B>9i|0PZTuZQzR}6|#5E_URSD?5$Eis(9W8JG=P>h1& zPELytrXpuMnR6k>&YEx4}nC8b;iICFz^n| C7D+z< diff --git a/oak-jackrabbit-api/.DS_Store b/oak-jackrabbit-api/.DS_Store deleted file mode 100644 index 2c34b01b1421707447d7be10459dfc58bfea2a03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHLJ5Iwu5S_tMWJHq=$~^+Pfw9a9QqV#Y6pAE{AoMPgC^-ULCE^;0l2hc`K_N7?@ow_%iD3Es7FLOnjp(yhsg3y)t(uPk|joeFsf&ZxY{w@ZwJ|X zMmKa#qv@o*|Fiq8W>#0#a9R(slHctg&L3Y_CvENc8|~t%6}9^UH|o-oE|76Tm$Xc> zW~I0OHV0i4+)`GKPM&VV!E z3~U&X??XTnEDRgP_~}3wO90^Jx{tBc65| zw&H^=^SXH9m>uy$G$$?;y>|wjfs}zvr#(6UQFpF?LaC9@oB?OxPcy)sYEYGUL_1qQ zJ*=Fy0qq=3MC=+FKrl`&0hq{tYDZD2`XFQ26^4zXM3MFA4)lvaB*Z&s;0G9Z2lmQG ADgXcg diff --git a/oak-jcr/.DS_Store b/oak-jcr/.DS_Store deleted file mode 100644 index 5bc5f6655e225282681fd0c1ec4866c86ae27c1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-ve05I&O%MJhwbj(!59u1ui{D@$Jh+M+TvO;rjTk~bcN4S~eU10ddmk&!3h zJKsSa5f~AIJIVf>`*psmc8-YL@O(NT>Jd?n!RUC=BCKvTZK*RG9p@N~CUv!p+FiB% zcHq5dbVe(h%xCHTUw1Z^sxHg%ydFc7U)}Z>*Uyjpsdf5|b$Oa(-MdE^ZPS{LQE^5m zv`(vLmv{J0n)bBz;myUOe0k#9jT}|I*}+#n={~ZDfD|UifH7bU7z6*50o>Uvc~{V8 zW55_N20j?z^TA^<7K%YI9vzrs3jpju9R+LdB{;?_7K%X-7KoEjpoBVYF`R@$@71qR z41y9)PMZ&>mEW5e7po(`kM86OL7R;MW1z`ECXYS7{}1q&X>IbGA@*bp7z2Nd0oN%< zl9AU7qU*H7<>&8a_9{3#TN2Az1ui;lH20_lk`WOzh4}nOCO~$|v GFz^QEeM$=e diff --git a/oak-lucene/.DS_Store b/oak-lucene/.DS_Store deleted file mode 100644 index d25064f75a24673c4547a87dea03e227382bf655..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-ve05I)liMJh-gL1HkE&^Itu7@7J4v<)glqf}5fhK%gI0UHtnJOvU9@4*YO z@}2LX4g^M2sdtk7+4tjfz9@E%h}`h17!dV|C_`g(JZKSCx0<%pnT?Lu7>uS>xro{u zwXHkw-aB+j7c`yE()~Z|uPkMi=aYFgfhH@iZ%+>Ho{v&%@rQMBo~(Kw5Juayq%kti z=!}+W)}62aC4Y;#8*7x+Y6rjhr2E)yeVx2D6Jx*_Fb0f)4PXFwHcQqM zwB8sn28@9(2KapNXpBLz7K}#+x>y1LyHH2Lm}?1+@rpsQ7K8=jBorv2PD>0Y;m~{a z3yQU%gpE@6Sl>r?azW5~W55__GSHD}pYQ);d@@!QHu!GTYo$=-?bj?6pe-bY92r^Zu|sb!sp0dG>YBx7=A&q7UWe}AH#w6BM=F(&KURy G20j2!w@How diff --git a/oak-lucene/src/.DS_Store b/oak-lucene/src/.DS_Store deleted file mode 100644 index a1062275b5ab975652a405d76841ef9e2a972563..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5Iwu5S;-R7HLvafV3PTH!zVoK{_f3L4Xp+krMi?xCj*oq2~;U3(!#WW@jK? zVNoIkGt%yxozIT_B=35Nh{w0H5z&x{N(@03rANfv>)NqkakA{OxEf6^+Gf?W$!|5u zvlrCRIo;4Qd;WQR>-w6uuBVH33R_7Jhs*ot$K%{T`_{j@?r?MWgjCes&?T*Dlhr*q zeeL?Xbzk0C%=XIZ*W38E^)iflmhHdZTSX^Zo6*ZmMnh&exS|aN!I-gu@o zhQJabn33#f&&T6DDYl1*-0*JJC+ZPVipJ=8&?2mEHSMS~8y&CFA5W`t8MGUly8K$; zy?5xAZfII8n)_d$Y%OJ#=aZtEK$8v%f4zQrI&NBL-&mJdja8EagwZao=mHrRG^bUR zb^qb?qrI8?=<)J?^!m)XqczHEyMwQMqJ12m@jgt90b{@zFb4i71GuwU(ypNO#(*(k z47@YI=YvOM%oJrg Cg+{>u diff --git a/oak-query-spi/.DS_Store b/oak-query-spi/.DS_Store deleted file mode 100644 index 141f93b88cc4cc3220f6a0f27a58b55fdb18133d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5B>J5FL{htVEL%QJI2@Dh;(+Ehh*EfFvjs*=z)%-@9-DE`f3nN-B=P8_$HS zVMB=!nUU;g&&MDM`Lt6=nz(Sn)cM0jgHqC499h~h}yMHUH&X^ z?LB&+dm7KCN&TyhrK-zvG^v^*(~{?p!LRpF<=aQ zGQj(TM`H|%jbPk5(8X&$FoQY@#{8Dx7_S%<8$nngPC|ha>hy`>BpiCLenGJjlyGwT zz;K#*{djRPJJ$Enom>#K-WV_jQU-c5?eqD6iC?Dkk)MXx%os2R{uu)(Q>!SlF-O0R-dZ5`YQsBS+CFcF$w@1;s{?S7Ch&2iip-5@MY(@Cyul04x?o AHvj+t diff --git a/oak-run-commons/.DS_Store b/oak-run-commons/.DS_Store deleted file mode 100644 index 45fb6d4801883cad5765010665c3b28c5687af82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-EW?5S}qX0)nIzs|72|11qaDT<`(%0-8i(k@G@~{k@Bj*GMI{K7*xC;Ws;@ zxz*EBL}y_4+nb-AxesplhKP7@H_eFpMAX9&WLdO`s9Q}t<}5~*J+jfHDi=|EY_{JH zQhSGPX-Sj$tXcob>DE$KMKPXNV`zGt^P`*l=ZCYVb^48UaoyN8dqNoP(uyvTaYk3P zO0q8Z4?o(QxwG|#hcAzkJK3YGwiSHklhm<}bx18P&VV!E3^)V-j{)4-BE3CDpPd0` zz!`XFK+cDNA($K1it*^c6k7mb7wRZjOD`cY!7w+h6=8v}h5|K|t;Jvshd!8JZdfa7 zII%S!Y?#{qRs!F-S zfgj+)AHa=I;0xdz(0;+*V8-@BLU%c$3VEdQvpqA;_*u4N0ARy;*azqW07oTkUB==Z zAv@`sG<44uL?*|04GF}LV=)fmHE+{l7%&WM8UwU<+mM04ox1~-{VM{r(6R6cb?1i^ ztN}D3hZ&63F8}5A@qDj%+V{pH$z&vZ_x^W$B3w6!Wjz0Saul6@|3Y8VqbDN#i#0p0 zjM{K847Q*EAM={R1d4iY>=xRqGpP9ni#*eLd=9cW$_v~6#v0AmrL8t^^KJgzI~EJC z@QZmq^k;|EdMZR5oYno{Su|OUy4UtZTKG{qnaO}CoS@6mL6nAKF%n47|fT zqwbC6((YM<-Br(8_6NK7dRE`I2dhB=xm1sta(DPjwl%`-yU@jq%ExrLjn-*ngHg`54&{2K1uv z?G4Gtq+u8^3~UYqbUs+9gpS5ip*%XUkWT=_7IsU)I{h?IjHS`hSSmyd3R9toDwOFb z22zBC4IN9O^)tb3-tvm3Hg-@We67fI+hi>if^JyL7PPtL`P$(5PML} OkAS4X6o!F+%D_*&?ySfF diff --git a/oak-run/.DS_Store b/oak-run/.DS_Store deleted file mode 100644 index 8eb272d3558a9d9647e7031508648f22d68791d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5B>J5FL{!S&1eM5(R}TM4Ossi8c}?QZ4{VP!P(p5rp0sfGbdN5gLRz29#7B zfj6E3ys%Ir1T&KTY|qbr(%L&j00@ajNQHx}_ppw2)`ragZDhxlX~i~PEa&5QwK;Eyrj z+Qq0C;86OuemWk%wH|FBjfL$34Y I4Ez8CFVAjBUH||9 diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/.DS_Store b/oak-run/src/main/java/org/apache/jackrabbit/oak/.DS_Store deleted file mode 100644 index f974af47642caebd11c52bcf13f448f257764ce7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-ve05I!dbg38blF?nG^Nc0Ut6`r7CMW_S{D1QP~V$4ghcHtR#1jKtFBqSzw z7QVAh8#h#J6+(B?`E$;9_T|gZ*+irUleACNBcce(7;K{XL3o_CC4sYS0hO8KE*tlU zXJuZse8uoL8Q^EPMpsl&O6TN1zu@G+AI-}o8D-@N*68#4?Qv)Ne7NY5{^C(xHr|ln z1L3qm6=gJ`vB~4sdxwJVe%qs&$KL&J@$mA*c`VG6m-AefdwKbU8q-inH^`>&@>suk zosTrvKc2pS^Wfr|>$XR|^&Rb46KxaFHdr5-v9sr diff --git a/oak-search-elastic/.DS_Store b/oak-search-elastic/.DS_Store deleted file mode 100644 index 81619ea261c4de3447ece64b11521923ac2ec2fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-ve05Wb@oip0_p7UY$&ZxE`K8L2M-ZJ;1EN(5!k3-COwYz#;|1QX&382Qe3 zPzMSlLU1S9pM5_*=aXXlh=@m5<&bDVL>ZbO%V3R&daY^0oW;np#&9yLt0ro9%=X(s z_THmQx}e!&p6>s#T3M>PD5i^g3Qe|mb9(;rbhn>c%WtgBS+eTxA;M^rmUN7ab2_1A znw4+w4?fz{++}^;jGtrf&Kgy{+QC;o=|1>Dw&CIoI0MdrGw@Ftz@06UZ7F*13^)VM zz&itSJ_Izu+^|)QM+drC0s#9^N5NQX35f}YxnZja3xqWksG)2n25UI|wjfi43*oet#wALExr3f&LaR5IY+jmQSCv-@XHNbMOj7kF&yX*fk=pV&cF{a@CpC~ BN=*O& diff --git a/oak-search/.DS_Store b/oak-search/.DS_Store deleted file mode 100644 index 4db272e6e9d4ab347fdd0d3e61b131da5baec74d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5Iwu5S<|rSfYu9gebQ~RJnnP%n4FJX_BB&*f@gF`vkPmBXJYNJt(O-0&jK( zVh2Ns5X?xsZ$01jlf3I8A|74OhC~A*N-zXj79Aq$PSb`ti;*SAa6GNbMbz$??YD#M zy+>DcNz-E9-2d(I%2HNYHYutJG|ASpm|tpGD{45g zH6Lu1-P04X;xE7K$80wxIxMT{*74Kx-N_uwpu8*l(hPQja< zfq21CA_Ozi?px1y{Uq;th{%Pj`Iu-#L>UI7<3*3Ky4SR!&TMp?V?3GFRTH(lYWwZL zdmqpxUC?Z~=^?57j#Oi zq-t5*eYAILKQ-4OygYL4Bu7=Rckq=@vX9#mDNKw3W55_N2L34nxU*TZZ9$uj0b{@z zcxQmm2amy+E4G61=)e?P0N@bnC|GkZ!7*MjS8N4gfj9{TN~qHo!$~;wUj1^#R#3vp zY4hQ<@>}!bVs+&A(Vbi_XtOb345SPU76f}Dl*F&t<=0+A4#jDa6u;1yE% BM>7Bb diff --git a/oak-segment-aws/.DS_Store b/oak-segment-aws/.DS_Store deleted file mode 100644 index 9df0be426e71d0045b6e761899794f7e8bd2ae31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5B>J5S?KovPL?_P!*NwEf_3eSA-@)6 z?HOIt1&!y^bp7|Y8&6qzKblt~Sn|D_)$H}*?kM$6zVR;3lUcK8q|r7l=@b>GbVkdx zYVYZK=c7NZeQ@R2KZe?kIm&9Yg0EuIb@W~iWgRBQfH7bU7z6*40i4+)`L3e%#(*(k z47@WS`-4LhEF#v5Ve3E_uKB@I{87mC&!1I9p;flP;8IscFG%d|f7n<+Lj28@9}#sGKx&=2rY z@ofF{d2-e|v=cNDiK|6{KyO?EFpzy@KRDIzL`Pf^u~w8>#2(Utb`c1KSZ56U00VEb CcuAZ9 diff --git a/oak-segment-azure/.DS_Store b/oak-segment-azure/.DS_Store deleted file mode 100644 index fd9a73946d25227dfc3bc3e4194916c22ef0afcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKu}%Xq47F)hoj{;2NJw4s33P$=sE!?}KLBk}8G2j=WxpTbEBF?~7cj9g@(m0; z+kxi9!H5vpQt}czj&m=%I3Xe)-OPqWeIm+G1X&s_BI;JtMjR|gmN|ywX;m&&yBTf2 z9c1ktx~40dF6Qa_4|ms=vMP$nqMAUH4Q}@@@1F0EQtRv+>+&L*b^8Qv)T0%hA>y3Q zX_ZFhok#3R)1JnDI(Y3BFAoyCF-KXgSMb%CbR9g9{dRE%oB?OR8Th9RAZLqYTZUdc z1I~am@WFtb4*^9mk60V((Sb^z0KhKPDroE75*S1Q%p=x@&_LK+f#%BbiNWR$eTd`o zh_#`)6KiD56C=MrUO3)tIp}cW+|X-hz!_*V(6Me`^8Yb@rPfD&)5UwvfHUyN7~pO( zE=KsMm|H)6p5)qqa*84%<7#O@(AHE8)KrX)oFjW`G<%RX?0Ll6P-YRmx&!?ppoDnk I4Ez8CZ(==0vj6}9 diff --git a/oak-segment-remote/.DS_Store b/oak-segment-remote/.DS_Store deleted file mode 100644 index d0f861a97dd24fc6d3de68c0ecfaecb2f9a6098b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5B>J5S<}Wv=U89N?##8#U?B#$ORw?3P@RP1ffDg+tE^SCB!Y#AP^^@hUL_E5j4T$#e1%iej>;CeUP$y{og==lfyPI{U`DJZ-GnK@?GsR&|wjfs_HQMyW6N{~>;v)*?R*@tHH=4E!+$xLb^i5kAW9 z)=!@&cWppBLK6|cS_Tk|lScq1a*pgpquPUv;g=iMin5C6V>r+s0+A5!oPi%;;0;Qx BOMn0X diff --git a/oak-segment-tar/.DS_Store b/oak-segment-tar/.DS_Store deleted file mode 100644 index 58afdf1c24279486e0d940fc09461f4b0b3109d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-ve05I)lgMPlj5z~DDPofuf$5=Is>vOrr@BpRiHcF!~L0w7+18Ht^D;VJme zcTficBSLT|*`IwsKIfBS`-sSmR?`7dpNMiaM#qB=VRffzL!H^^c#T0hsjEfQ?yBv# z1Mj^@*K|db`7GW4$!cw>>Y^CW>oGL>-qX#|&i(T+wNAgWE-sQ)hXG-OR$K^+Rn)~5$|MB1@=5DP~)$1L6<&*9syS?Lmm>2`bfH7bU{7(jOXS3v6g4P=Y z#(**K&H$ee9*r?5HiGf!Ko?5@Ua@gg5)Qprzo6I% zN;o+!KAdKLD_&g8j`e+XCl>^*HwKJ>HUmAG_WAxl#4poXGSxm^=PMPEbQ0t0D^Jr5r7GwBiqp^cF$w@1;s{?S7Ch&2iij*5@MY(@B<9I E0xsc5K>z>% diff --git a/oak-segment-tar/src/.DS_Store b/oak-segment-tar/src/.DS_Store deleted file mode 100644 index ae5846cde3ad32f9fe9a3fff0e056af8b7486921..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5Iwu5S;}VmS`eG0ixN88h7b1k?E0g0SJj8QXEGj^u7cqprGIg)SQ4Da1!3z zS%_CylnB9$wEJe~vtvKWyB-m7qq}J#G7ym*gXpOA2+h5&tr$$F;~tCaVtm!qtDa4M ztBKE^NiCN$mu2$&hkKK*uWqVpvS?__PwtE5!`sVg>Ysk=U)^-LIXXuw>aJxbx3W&^ z?!G>CecigxkHbyfm|HiSx_$nn?!htZnivDdfH7bU{BH(uXH)VWMVpNQW55{rWPs;` z#~_vwTg7m6UQ_qb+N^8nhv{pua@W&W%Sv9Ukc&T`|etA9K vwI1UFgTlC$3Iuxc6MzNJk^SIQzo(A4GGeR9U1$&KK>HC0gxF*Z`~U;*mX=4V diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/.DS_Store b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/.DS_Store deleted file mode 100644 index 9eff97ca3dcfbbcd32883b144631a04874de1be1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-veG47S@2kznYEnC=z&2BD+_a~CFrO8Ju#r2~kCAy2|npstL(7N38hIT0}; zMD6PC^V#Qf@L;LqrROjui9oau*hFE$+J)B zhVH4R>+Jc9*XO>kX{%~gw=39+?bBj={PKR1``17EH+Ma54iiF=_kmjc>MZZ*^sVpf z=RLnT+vWAxrrqTo@@IL+@|{D1fnXpQ2nP0?0n}`f;=nNaU?3O>2EG`O{UM7xoh_ zC!J1Q8b%)s1Oqt(V;fGT{x9%X8ocD^Au$RDf`Na=08grAHOEVNZTqLP-*HR4BQjCG@BS-2qe-a)3(y=p?Rm860z&HpfA<+c`zrer;5@|%i diff --git a/oak-store-composite/.DS_Store b/oak-store-composite/.DS_Store deleted file mode 100644 index 3896e81e4b5cdde0aecba41303b36501cb790e73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKu}%Xq40UJ)C$Usah$#yn(3L5aV@K)_KwDIX9#^33_YwR6V&?;3M*IW=V&o6l zc#hrn0tX{PU`xqMVmtOd>5`a;T<>z!CF&4ShQ{c4&>+0rs9I5DRyy9J+aH$2G_JN) z_uGMUZ_x#v({M7b=YRFQ)D&f&4<_XRE7{Z8&gsp|!){$W`bIlFsqMOU05@8t866?w zn2u?dMBTXG{;03VzP*0C+k1WF*vTG6xy;}znqb1mn?xE|vhm#d9BHt|i#VD+a|%5E_URSD?5$Eis(9W8JG= zP^<*SotzdQP9x8Y7Z;;re;>`s1wreL0b?L#pe54|-~apgWg3h8)Wv4TfHCmL7;x>p zpZD-ldbfW1Jico^+94VX+f_V(V4OSxFyV7#Gb%;zc?`RtSPAkjydK?w_7I4KSZ56U G00Zye)=M4$ diff --git a/oak-store-document/.DS_Store b/oak-store-document/.DS_Store deleted file mode 100644 index f637c3e1e3b7791d68367f2ef9381d8e966d19fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5Iwu5S=9v1VNFK(j6UAasXt4sh~iFk^=HkKuT~FlHM1f;{u3N&*-M9fysXo5G_9=b!#`?W5y^+ue7+_sl(d@pJ|AV$$oVZU(##6Jx*_Fa{RI0D3k{X-&{Z zW55_N1||&f_aT5XhKh-x|8!vRM*v_EW-plYS%Px{#ZWO3ga_gz6)34rj~GtUVGlGe zR7?aVotz#%oK|*vLUF!2?jQJYa-pD&#(*)9WuPFJW$yob^Uwd;B)c*OjDdf}fGbAz zsD>?RZ_RCvdu;$cg|cv5A~;FG#J6I^ax30|dVxLQ2{2Sl1Yv>LkASDa24i5M4157$ CWNs1w diff --git a/oak-store-spi/.DS_Store b/oak-store-spi/.DS_Store deleted file mode 100644 index 329180566fb95e9e1fd6d49a42da997a65893d3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5T3O~0t)uv!ISJO^a+e%dl!0Ew5?RIF-7Y=@8UCfFNpXa9(@E)ezP;u ztVWN;pBdQwHuJMH`5?O)B67v;q)*f%q6~x4@uEdo-D=uUXEr+Cqdy#1O(-g3gd}O6Rml zvhKc~e6%-nZy!G#6faMlJK3YGRuz2Zlhm<)#C4b$1IB=7$6(AAYr%MQV2UjOunTn*thtxq7_XQs)`GA=oP+`;)M<<1BpiCLez{^T zDBoHC-SlF-T1qAElCjbw8j_gIF*gdb|mn+tSybJ4NIM99sA|W;z18ZR5 E4Pib=A^-pY diff --git a/oak-upgrade/.DS_Store b/oak-upgrade/.DS_Store deleted file mode 100644 index c083321e1e7af6b6e8cee8967dbf8102a3810899..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5B>J5FL{!T7@PO1yso52Dtz-(Sj)GaskLkp~$ik3H>(o+<}^7AX<7P3QA7F zd$v)$uuvidGm`!6`FOlfT8}LvW^gs>i}XY!Ln9gv8ieXb(?)cr(Qu9aa9kD(uic8a z-wxb+OO|pe zi&zB=;bMGdtP?Z8KVFQ_4!!m6Vq8G&l>ud-&Oj?nd#wM5_+=U&`SlQ;DFe#DA7j9@ z^I<-~N5$Iu>GN1?E!rs>g?<$W5R7Y=08Ds}?093aTaMx9B31#p3iUo5s22fGh<3`r H4>0fsw{u8j From ed969b352004bccaaab39fe187a412a730652c4c Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 27 Aug 2026 18:54:49 +0530 Subject: [PATCH 14/15] OAK-12162 : addressed AI review comments on cachestats cleanup Add plus() coverage in CacheStatsSnapshotTest, fix stale CacheStatsAdapter references in CacheBuilderTest, and remove the dangling CacheStatsAdapter.class entry from oak-lucene's Embed-Dependency inline list. Co-Authored-By: Claude Sonnet 5 --- .gitignore | 1 + .../oak/cache/api/CacheStatsSnapshotTest.java | 23 +++++++++++++++++++ .../oak/cache/impl/CacheBuilderTest.java | 4 ++-- oak-lucene/pom.xml | 2 +- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4e52444dd99..fdfec805b1c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ derby.log .java-version oak-shaded-guava/dependency-reduced-pom.xml pom.xml.versionsBackup +.DS_Store diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java index 4820634feca..0052414fe01 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java @@ -92,6 +92,29 @@ public void minusClampsNegativeValuesToZero() { Assert.assertEquals(0, delta.evictionCount()); } + /** Verifies that {@code plus()} produces the correct per-field sum of two snapshots. */ + @Test + public void plusProducesSum() { + CacheStatsSnapshot first = stats(6, 3, 2, 0, 400, 1); + CacheStatsSnapshot second = stats(4, 2, 2, 1, 600, 2); + CacheStatsSnapshot sum = first.plus(second); + + Assert.assertEquals(10, sum.hitCount()); + Assert.assertEquals(5, sum.missCount()); + Assert.assertEquals(4, sum.loadSuccessCount()); + Assert.assertEquals(1, sum.loadFailureCount()); + Assert.assertEquals(1000, sum.totalLoadTime()); + Assert.assertEquals(3, sum.evictionCount()); + } + + /** Verifies that {@code plus()} throws when the sum of a field overflows a {@code long}. */ + @Test(expected = ArithmeticException.class) + public void plusThrowsOnOverflow() { + CacheStatsSnapshot first = stats(Long.MAX_VALUE, 0, 0, 0, 0, 0); + CacheStatsSnapshot second = stats(1, 0, 0, 0, 0, 0); + first.plus(second); + } + /** Verifies that all record accessors return the values supplied to the canonical constructor. */ @Test public void accessorsReturnConstructorValues() { diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java index ec6b6a53de8..a0bcb8bd7a4 100644 --- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java +++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java @@ -240,9 +240,9 @@ public void buildRejectsInvalidConfigurations() { } } - /** CacheStatsAdapter exposes stats and live weight estimates from a Cache. */ + /** CacheStats exposes stats and live weight estimates from a Cache. */ @Test - public void oakCacheStatsAdapterBridgesOakStats() { + public void oakCacheStatsBridgesOakStats() { Cache cache = CacheBuilder.newBuilder() .maximumWeight(100) .weigher((k, v) -> k.length() + v.length()) diff --git a/oak-lucene/pom.xml b/oak-lucene/pom.xml index 1329bf8d329..4d8e518d41a 100644 --- a/oak-lucene/pom.xml +++ b/oak-lucene/pom.xml @@ -129,7 +129,7 @@ oak-search;scope=compile|runtime;inline=true, lucene-*;inline=true, - oak-core-spi;inline="org/apache/jackrabbit/oak/cache/AbstractCacheStats.class|org/apache/jackrabbit/oak/cache/CacheStats.class|org/apache/jackrabbit/oak/cache/api/Cache.class|org/apache/jackrabbit/oak/cache/api/CacheBuilder.class|org/apache/jackrabbit/oak/cache/api/CacheLoader.class|org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.class|org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.class|org/apache/jackrabbit/oak/cache/api/EvictionCause.class|org/apache/jackrabbit/oak/cache/api/EvictionListener.class|org/apache/jackrabbit/oak/cache/api/LoadingCache.class|org/apache/jackrabbit/oak/cache/api/Weigher.class|org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.class|org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter$1.class|org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineLoadingCacheAdapter.class|org/apache/jackrabbit/oak/cache/impl/CacheMaintenanceExecutor.class|org/apache/jackrabbit/oak/cache/impl/CacheMaintenanceExecutor$Holder.class|org/apache/jackrabbit/oak/cache/impl/CacheMaintenanceExecutor$LoggingCallerRunsPolicy.class" + oak-core-spi;inline="org/apache/jackrabbit/oak/cache/AbstractCacheStats.class|org/apache/jackrabbit/oak/cache/CacheStats.class|org/apache/jackrabbit/oak/cache/api/Cache.class|org/apache/jackrabbit/oak/cache/api/CacheBuilder.class|org/apache/jackrabbit/oak/cache/api/CacheLoader.class|org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.class|org/apache/jackrabbit/oak/cache/api/EvictionCause.class|org/apache/jackrabbit/oak/cache/api/EvictionListener.class|org/apache/jackrabbit/oak/cache/api/LoadingCache.class|org/apache/jackrabbit/oak/cache/api/Weigher.class|org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.class|org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter$1.class|org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineLoadingCacheAdapter.class|org/apache/jackrabbit/oak/cache/impl/CacheMaintenanceExecutor.class|org/apache/jackrabbit/oak/cache/impl/CacheMaintenanceExecutor$Holder.class|org/apache/jackrabbit/oak/cache/impl/CacheMaintenanceExecutor$LoggingCallerRunsPolicy.class" From eb8273675b6961e996aa5eb0b922325f9cfabe18 Mon Sep 17 00:00:00 2001 From: rishabhdaim Date: Thu, 27 Aug 2026 19:03:42 +0530 Subject: [PATCH 15/15] OAK-12162 : remove blast-radius json files Co-Authored-By: Claude Sonnet 5 --- blast-radius-companions.json | 448 ------- blast-radius-osgi-downstream.json | 1985 ----------------------------- 2 files changed, 2433 deletions(-) delete mode 100644 blast-radius-companions.json delete mode 100644 blast-radius-osgi-downstream.json diff --git a/blast-radius-companions.json b/blast-radius-companions.json deleted file mode 100644 index af6cdc6b0bb..00000000000 --- a/blast-radius-companions.json +++ /dev/null @@ -1,448 +0,0 @@ -{ - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java": [], - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java": [], - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java": [ - "_companion_repos/com.adobe.granite.repository/src/test/java/com/adobe/granite/repository/impl/GraniteInstallTest.java", - "_companion_repos/oak-repository-service/client/src/test/java/org/apache/jackrabbit/oak/jcr/AddBinaryPropertyTest.java", - "_companion_repos/oak-repository-service/service-jcr-tests/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryServiceStub.java", - "_companion_repos/oak-repository-service/service-quarkus-tests/src/main/java/org/apache/jackrabbit/repositoryservice/testing/LongevityTestExecutor.java", - "_companion_repos/oak-repository-service/service-quarkus-tests/src/main/java/org/apache/jackrabbit/repositoryservice/testing/NodeStoreProvider.java", - "_companion_repos/oak-repository-service/service-quarkus/src/main/java/org/apache/jackrabbit/repositoryservice/remote/service/rest/BlobStoreProvider.java", - "_companion_repos/oak-repository-service/service-quarkus/src/main/java/org/apache/jackrabbit/repositoryservice/remote/service/rest/RepositoryService.java", - "_companion_repos/oak-repository-service/service-quarkus/src/test/java/org/apache/jackrabbit/repositoryservice/remote/service/ArchiveCloseTest.java", - "_companion_repos/oak-repository-service/service-quarkus/src/test/java/org/apache/jackrabbit/repositoryservice/remote/service/SegmentQueueBackpressureTest.java", - "_companion_repos/oak-repository-service/service-quarkus/src/test/java/org/apache/jackrabbit/repositoryservice/remote/service/aeron/TestRepositoryService.java", - "_companion_repos/oak-repository-service/service-quarkus/src/test/java/org/apache/jackrabbit/repositoryservice/remote/service/aeron/support/ResourcesManager.java", - "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/AzureBlobStoreProvider.java", - "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RepositoryServiceRemoteService.java", - "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/DurableRepositoryServiceRemoteServiceInitializationRetriesTest.java", - "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RemoteRepositoryTest.java", - "_companion_repos/oak-repository-service/store-tools/src/main/java/com/adobe/granite/pike/tool/Main.java", - "_companion_repos/oak-repository-service/store-tools/src/main/java/com/adobe/granite/pike/tool/commands/InitCmd.java", - "_companion_repos/oak-repository-service/store-tools/src/test/java/com/adobe/granite/pike/tool/commands/InitCmdTest.java", - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/serializer/FSBlobSerializer.java", - "oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/BlobGCTest.java", - "oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreStatsTest.java", - "oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java", - "oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreUtils.java", - "oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferenceBinaryIT.java", - "oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java", - "oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneWritesOnSegmentStatsTest.java", - "oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/BlobStoreFixture.java", - "oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java", - "oak-segment-aws/src/test/java/org/apache/jackrabbit/oak/segment/spi/persistence/split/SplitPersistenceBlobTest.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ExternalBlobIT.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ReadOnlyStoreBlobReferencesTest.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentDataStoreBlobGCIT.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreServiceTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedBlobStoreGCTest.java" - ], - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java": [ - "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetrics.java", - "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RemoteRepository.java", - "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RepositoryServiceRemoteService.java", - "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetricsTest.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCacheTest.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCacheTest.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/PersistentCacheStatsTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java" - ], - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java": [ - "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetricsTest.java", - "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetrics.java", - "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RepositoryServiceRemoteService.java", - "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RemoteRepository.java", - "_companion_repos/oak-repository-service/service-quarkus/src/test/java/org/apache/jackrabbit/repositoryservice/remote/service/ArchiveCloseTest.java", - "_companion_repos/oak-repository-service/service-quarkus/src/test/java/org/apache/jackrabbit/repositoryservice/remote/service/SegmentQueueBackpressureTest.java", - "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/RemoteRepositoryTest.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java" - ], - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/EmpiricalWeigherTest.java" - ], - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java": [], - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshotTest.java" - ], - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java": [ - "oak-blob-cloud/pom.xml", - "oak-core-spi/pom.xml", - "oak-lucene/pom.xml" - ], - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java": [], - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java": [ - "_companion_repos/oak-repository-service/oakrs-online-migration-bundle/pom.xml", - "oak-core-spi/pom.xml", - "oak-lucene/pom.xml" - ], - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java": [], - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java": [], - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java": [], - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java": [], - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java": [ - "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetrics.java", - "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetricsTest.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCacheTest.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java" - ], - "oak-it-osgi/test-bundles.xml": [], - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java": [], - "oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java": [], - "oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java": [ - "_companion_repos/aem-sites-dataplane/bundles/dataplane/src/test/java/com/adobe/aem/wcm/dataplane/backend/impl/builder/sql2/OakLuceneQueryIndexTest.java", - "oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCacheTest.java", - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java", - "oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java", - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java", - "oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticIndexImporterSupport.java", - "oak-run-elastic/src/main/java/org/apache/jackrabbit/oak/index/ElasticOutOfBandIndexer.java", - "oak-run/src/main/java/org/apache/jackrabbit/oak/index/ExtendedIndexHelper.java", - "oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticReindexTest.java", - "oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestRepositoryBuilder.java", - "oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFacetSearchTest.java", - "oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithGlobalIndexSearchTest.java", - "oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticFullTextWithoutGlobalIndexSearchTest.java", - "oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTIndexedContentAvailability.java", - "oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyFTSeparatedIndexedContentAvailability.java", - "oak-benchmarks-elastic/src/main/java/org/apache/jackrabbit/oak/benchmark/ElasticPropertyTextSearchTest.java", - "oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java" - ], - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java": [ - "_companion_repos/oak-repository-service/client/pom.xml", - "_companion_repos/oak-repository-service/server/src/main/java/org/apache/jackrabbit/oak/segment/aeron/AeronSegmentWriter.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java" - ], - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java": [ - "_companion_repos/oak-repository-service/client/pom.xml" - ], - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java": [ - "_companion_repos/oak-repository-service/client/pom.xml" - ], - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java": [ - "_companion_repos/oak-repository-service/client/pom.xml", - "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetrics.java", - "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetricsTest.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCacheTest.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java" - ], - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java": [ - "_companion_repos/oak-repository-service/client-bundle/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/client/osgi/RemoteNodeStoreService.java", - "_companion_repos/oak-repository-service/client/pom.xml", - "_companion_repos/oak-repository-service/client/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/client/RemoteNodeStoreBuilder.java" - ], - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java": [ - "_companion_repos/oak-repository-service/client/pom.xml", - "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/OverlayWriterCacheManager.java", - "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/OverlayWriterCacheManagerTest.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java" - ], - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java": [ - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ConcurrentPriorityCacheTest.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreRegistrar.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java" - ], - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java": [ - "_companion_repos/oak-repository-service/service/src/main/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetrics.java", - "_companion_repos/oak-repository-service/service/src/test/java/org/apache/jackrabbit/oak/repositoryservice/remote/service/CacheMetricsTest.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCacheTest.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStatsMBeanWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java" - ], - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java": [], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java": [ - "_companion_repos/com.adobe.granite.repository/src/test/java/com/adobe/granite/repository/impl/GraniteInstallTest.java", - "_companion_repos/com.adobe.granite.repository/src/test/java/com/adobe/granite/repository/impl/hc/PanicOnLeaseFailureTest.java", - "_companion_repos/oak-repository-service/oakrs-online-migration-bundle/src/test/java/org/apache/jackrabbit/oak/repositoryservice/migration/MigrationNodeStoreCrossStoreTest.java", - "_companion_repos/oak-repository-service/oakrs-online-migration-bundle/src/test/java/org/apache/jackrabbit/oak/repositoryservice/migration/MigrationNodeStoreObserverTest.java", - "_companion_repos/oak-repository-service/oakrs-online-migration-bundle/src/test/java/org/apache/jackrabbit/oak/repositoryservice/migration/MigrationNodeStoreTest.java", - "_companion_repos/oak-repository-service/oakrs-online-migration-bundle/src/test/java/org/apache/jackrabbit/oak/repositoryservice/migration/osgi/MigrationNodeStoreServiceTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java": [ - "_companion_repos/oak-repository-service/oakrs-online-migration-bundle/src/test/java/org/apache/jackrabbit/oak/repositoryservice/migration/osgi/MigrationNodeStoreServiceTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java": [ - "_companion_repos/com.adobe.granite.maintenance.oak/src/test/java/com/adobe/granite/maintenance/crx/impl/DocumentNodeStoreRGCTest.java", - "_companion_repos/com.adobe.granite.maintenance.oak/src/test/java/com/adobe/granite/repository/hc/impl/ContinuousRGCHealthCheckTest.java", - "_companion_repos/com.adobe.granite.operations.ui.core/src/main/java/com/adobe/granite/operations/ui/core/internal/reporters/NodeDataStoreReporter.java", - "_companion_repos/com.adobe.granite.operations.ui.core/src/test/java/com/adobe/granite/operations/ui/core/internal/reporters/NodeDataStoreReporterTest.java", - "_companion_repos/com.adobe.granite.repository/src/test/java/com/adobe/granite/repository/impl/hc/MongoDBDiskFullPanicTest.java", - "_companion_repos/com.adobe.granite.repository/src/test/java/com/adobe/granite/repository/impl/hc/PanicOnLeaseFailureTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java": [ - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java": [ - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheCompatibilityTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java": [ - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java": [ - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java": [ - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" - ], - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" - ], - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java": [ - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" - ], - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" - ], - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java": [], - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java": [], - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java": [], - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PreviousDocCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java" - ], - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java": [], - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java": [], - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java": [], - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java": [], - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java": [], - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java": [], - "specs/guava-cache-removal/TASKS.md": [] -} diff --git a/blast-radius-osgi-downstream.json b/blast-radius-osgi-downstream.json deleted file mode 100644 index 450971ea9c6..00000000000 --- a/blast-radius-osgi-downstream.json +++ /dev/null @@ -1,1985 +0,0 @@ -{ - "schema_version": 2, - "total_downstream": 32, - "generated_at": "2026-08-23T08:46:07.558Z", - "downstream": { - "https://github.com/Adobe-AEM-CPSS/oak-repository-service": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.api", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.api", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-blob-plugins", - "exported_package": "org.apache.jackrabbit.oak.plugins.blob", - "changed_files": [ - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java", - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-blob-plugins", - "exported_package": "org.apache.jackrabbit.oak.plugins.blob", - "changed_files": [ - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java", - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-blob-plugins", - "exported_package": "org.apache.jackrabbit.oak.plugins.blob.datastore", - "changed_files": [ - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-blob-plugins", - "exported_package": "org.apache.jackrabbit.oak.plugins.blob.datastore", - "changed_files": [ - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.cache", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.memory", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.mongo", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.rdb", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.util", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.file", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.file", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oak-repository-service-client-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "org.apache.jackrabbit.oakrs-online-migration-bundle", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" - ], - "dependency_type": "compile" - } - ] - }, - "https://git.corp.adobe.com/CQ/dam": { - "skipped": true, - "reason": "Command failed: git clone --bare --depth 1 https://git.corp.adobe.com/CQ/dam /Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/dam.git\nCloning into bare repository '/Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/dam.git'...\nerror: RPC failed; curl 56 Recv failure: Connection reset by peer\nerror: 28 bytes of body are still expected\nfatal: expected flush after ref listing\n", - "entries": [ - { - "importing_bundle": "com.adobe.cq.dam.cq-dam-processor-nui", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.adobe.cq.dam.cq-dam-processor-nui", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "cq-dam-repository-insights-agent", - "exporting_bundle": "org.apache.jackrabbit.oak-blob-plugins", - "exported_package": "org.apache.jackrabbit.oak.plugins.blob", - "changed_files": [ - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java", - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "cq-dam-repository-insights-agent", - "exporting_bundle": "org.apache.jackrabbit.oak-blob-plugins", - "exported_package": "org.apache.jackrabbit.oak.plugins.blob.datastore", - "changed_files": [ - "oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.day.cq.dam.cq-dam-similaritysearch", - "exporting_bundle": "org.apache.jackrabbit.oak-lucene", - "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", - "changed_files": [ - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "cq-dam-repository-insights-agent", - "exporting_bundle": "org.apache.jackrabbit.oak-lucene", - "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", - "changed_files": [ - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "cq-dam-repository-insights-agent", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "cq-dam-repository-insights-agent", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "cq-dam-repository-insights-agent", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.file", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "cq-dam-repository-insights-agent", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" - ], - "dependency_type": "test" - } - ] - }, - "https://git.corp.adobe.com/CQ/asset-metadata-restriction-provider": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.cq.dam.asset-metadata-restriction-provider", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.cq.dam.asset-metadata-restriction-provider", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.api", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.cq.dam.asset-metadata-restriction-provider", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.cq.dam.asset-metadata-restriction-provider", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.cq.dam.asset-metadata-restriction-provider", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" - ], - "dependency_type": "compile" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.maintenance.oak": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.granite.maintenance.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.maintenance.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.api", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.maintenance.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.maintenance.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.maintenance.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.maintenance.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.maintenance.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.cache", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.maintenance.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.memory", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.maintenance.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.mongo", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.maintenance.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.rdb", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.maintenance.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.util", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.maintenance.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-lucene", - "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", - "changed_files": [ - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" - ], - "dependency_type": "compile" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.repository": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.api", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.cache", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.memory", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.mongo", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.rdb", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.util", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-lucene", - "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", - "changed_files": [ - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.file", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" - ], - "dependency_type": "compile" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.security.user": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.granite.security.user", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.security.user", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.api", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.security.user", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.security.user", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.security.user", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" - ], - "dependency_type": "compile" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.auth.authhandler": { - "skipped": true, - "reason": "Command failed: git --git-dir /Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/Granite/com.adobe.granite.auth.authhandler.git fetch --prune --depth 1 origin\nerror: RPC failed; curl 56 Recv failure: Connection reset by peer\nerror: 57 bytes of body are still expected\nfatal: expected flush after ref listing\n", - "entries": [ - { - "importing_bundle": "com.day.cq.cq-authhandler", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.cq-authhandler", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.api", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.cq-authhandler", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.cq-authhandler", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.cq-authhandler", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" - ], - "dependency_type": "compile" - } - ] - }, - "https://github.com/apache/sling-org-apache-sling-discovery-commons": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "org.apache.sling.discovery.commons", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java", - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "org.apache.sling.discovery.commons", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.api", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java", - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "org.apache.sling.discovery.commons", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "org.apache.sling.discovery.commons", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "org.apache.sling.discovery.commons", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl.caffeine", - "changed_files": [ - "oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java" - ], - "dependency_type": "provided" - } - ] - }, - "https://github.com/Adobe-AEM-Foundation/com.adobe.granite.workflow.console": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.granite.workflow.console", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.workflow.console", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.workflow.console", - "exporting_bundle": "org.apache.jackrabbit.oak-lucene", - "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", - "changed_files": [ - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" - ], - "dependency_type": "compile" - } - ] - }, - "https://git.corp.adobe.com/CQ/integration-analytics": { - "skipped": true, - "reason": "Command failed: git clone --bare --depth 1 https://git.corp.adobe.com/CQ/integration-analytics /Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/integration-analytics.git\nCloning into bare repository '/Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/integration-analytics.git'...\nerror: RPC failed; curl 56 Recv failure: Connection reset by peer\nerror: 13658 bytes of body are still expected\nfetch-pack: unexpected disconnect while reading sideband packet\nfatal: early EOF\nfatal: fetch-pack: invalid index-pack output\n", - "entries": [ - { - "importing_bundle": "com.adobe.cq.cq-analytics-integration", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "com.adobe.cq.cq-analytics-integration", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "com.adobe.cq.cq-analytics-integration", - "exporting_bundle": "org.apache.jackrabbit.oak-lucene", - "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", - "changed_files": [ - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" - ], - "dependency_type": "provided" - } - ] - }, - "https://git.corp.adobe.com/CQ/integration-target": { - "skipped": true, - "reason": "Command failed: git --git-dir /Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/integration-target.git fetch --prune --depth 1 origin\nfatal: unable to access 'https://git.corp.adobe.com/CQ/integration-target/': Recv failure: Connection reset by peer\n", - "entries": [ - { - "importing_bundle": "com.adobe.cq.cq-target-integration", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "com.adobe.cq.cq-target-integration", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "com.adobe.cq.cq-target-integration", - "exporting_bundle": "org.apache.jackrabbit.oak-lucene", - "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", - "changed_files": [ - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" - ], - "dependency_type": "provided" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.crypto.keystore": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.granite.crypto.keystore", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.adobe.granite.crypto.keystore", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.adobe.granite.crypto.keystore", - "exporting_bundle": "org.apache.jackrabbit.oak-lucene", - "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", - "changed_files": [ - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.adobe.granite.crypto.keystore", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.adobe.granite.crypto.keystore", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.adobe.granite.crypto.keystore", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.file", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.adobe.granite.crypto.keystore", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" - ], - "dependency_type": "test" - } - ] - }, - "https://github.com/Adobe-AEM-Foundation/com.adobe.granite.repository.indexdefs": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.granite.repository.indexdefs", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository.indexdefs", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.repository.indexdefs", - "exporting_bundle": "org.apache.jackrabbit.oak-lucene", - "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", - "changed_files": [ - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" - ], - "dependency_type": "compile" - } - ] - }, - "https://github.com/Adobe-AEM-Sites/msm": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.day.cq.wcm.cq-msm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-msm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-msm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-lucene", - "exported_package": "org.apache.jackrabbit.oak.plugins.index.lucene", - "changed_files": [ - "oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-msm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-msm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-msm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.file", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-msm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" - ], - "dependency_type": "test" - } - ] - }, - "https://git.corp.adobe.com/CQ/wcm": { - "skipped": true, - "reason": "Command failed: git clone --bare --depth 1 https://git.corp.adobe.com/CQ/wcm /Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/wcm.git\nCloning into bare repository '/Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/CQ/wcm.git'...\nerror: RPC failed; curl 56 Recv failure: Connection reset by peer\nerror: 84 bytes of body are still expected\nfatal: expected flush after ref listing\n", - "entries": [ - { - "importing_bundle": "com.day.cq.wcm.cq-wcm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-wcm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-wcm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-wcm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.cache", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java", - "oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-wcm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.memory", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-wcm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.mongo", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-wcm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.rdb", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-wcm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-store-document", - "exported_package": "org.apache.jackrabbit.oak.plugins.document.util", - "changed_files": [ - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java", - "oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-wcm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-remote", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-wcm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java", - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-wcm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.file", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java", - "oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.day.cq.wcm.cq-wcm-core", - "exporting_bundle": "org.apache.jackrabbit.oak-segment-tar", - "exported_package": "org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache", - "changed_files": [ - "oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java" - ], - "dependency_type": "compile" - } - ] - }, - "https://github.com/OneAdobe/aem-sites-dataplane": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.aem.sites-dataplane", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "com.adobe.aem.sites-dataplane", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - } - ] - }, - "https://github.com/Adobe-AEM-Sites/aem-sites-eventing": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.aem.sites-eventing", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.adobe.aem.sites-eventing", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - } - ] - }, - "https://git.corp.adobe.com/CQ/dam-delivery": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.cq.dam.cq-scene7-imaging", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.cq.dam.cq-scene7-imaging", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - } - ] - }, - "https://git.corp.adobe.com/CQ/unified-shell-integration": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.cq.unifiedshell.unified-shell-integration", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.cq.unifiedshell.unified-shell-integration", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.auth.saml": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.granite.auth.saml", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "com.adobe.granite.auth.saml", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.auth.saml.hooks.migration": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.granite.auth.saml.migration", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "com.adobe.granite.auth.saml.migration", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.auth.sso": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.granite.auth.sso", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "com.adobe.granite.auth.sso", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.oauth.server": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.granite.oauth.server", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "com.adobe.granite.oauth.server", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.operations.ui.core": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.granite.operations.ui.core", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - }, - { - "importing_bundle": "com.adobe.granite.operations.ui.core", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "compile" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.repository.hc.impl": { - "skipped": true, - "reason": "Command failed: git clone --bare --depth 1 https://git.corp.adobe.com/Granite/com.adobe.granite.repository.hc.impl /Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/Granite/com.adobe.granite.repository.hc.impl.git\nCloning into bare repository '/Users/diam/workspace/jackrabbit-oak-workspace/jackrabbit-oak/.blast-radius-checkouts/.server-repo-cache/git.corp.adobe.com/Granite/com.adobe.granite.repository.hc.impl.git'...\nerror: RPC failed; curl 56 Recv failure: Connection reset by peer\nfatal: expected flush after ref listing\n", - "entries": [ - { - "importing_bundle": "com.adobe.granite.repository.hc.impl", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "com.adobe.granite.repository.hc.impl", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.security.ui": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.adobe.granite.security.ui", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "com.adobe.granite.security.ui", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.replication.core": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.day.cq.cq-replication", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.day.cq.cq-replication", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - } - ] - }, - "https://git.corp.adobe.com/CQ/reporting": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.day.cq.cq-reporting", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "com.day.cq.cq-reporting", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - } - ] - }, - "https://git.corp.adobe.com/Granite/com.adobe.granite.crx-auth-token": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "com.day.crx.sling.crx-auth-token", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "com.day.crx.sling.crx-auth-token", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - } - ] - }, - "https://github.com/apache/sling-org-apache-sling-discovery-oak": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "org.apache.sling.discovery.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "org.apache.sling.discovery.oak", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - } - ] - }, - "https://github.com/apache/sling-org-apache-sling-jcr-repoinit": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "org.apache.sling.jcr.repoinit", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - }, - { - "importing_bundle": "org.apache.sling.jcr.repoinit", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "provided" - } - ] - }, - "https://github.com/apache/sling-org-apache-sling-jcr-resource": { - "skipped": false, - "reason": null, - "entries": [ - { - "importing_bundle": "org.apache.sling.jcr.resource", - "exporting_bundle": "org.apache.jackrabbit.oak-core", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - }, - { - "importing_bundle": "org.apache.sling.jcr.resource", - "exporting_bundle": "org.apache.jackrabbit.oak-core-spi", - "exported_package": "org.apache.jackrabbit.oak.cache.impl", - "changed_files": [ - "oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java", - "oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java", - "oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java" - ], - "dependency_type": "test" - } - ] - } - } -} \ No newline at end of file