This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch reschke/experiment/jackrabbit-data in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit e370d833ae5ff78530e68d43bec2644500fc868b Merge: d57ce7b085 649235f663 Author: Julian Reschke <[email protected]> AuthorDate: Mon Oct 13 15:45:09 2025 +0100 Merge branch 'trunk' into reschke/experiment/jackrabbit-data .../jackrabbit/oak/blob/cloud/s3/S3Backend.java | 5 +- .../oak/plugins/blob/UploadStagingCache.java | 7 +- .../plugins/blob/AbstractDataStoreCacheTest.java | 3 +- .../oak/plugins/blob/datastore/FSBackendIT.java | 4 +- .../authentication/token/TokenProviderImpl.java | 9 +- .../jackrabbit/oak/jcr/delegate/NodeDelegate.java | 3 +- .../indexer/document/tree/store/PageFile.java | 6 +- .../indexer/document/tree/store/PageFileTest.java | 12 ++ .../oak/spi/security/ConfigurationParameters.java | 27 +++ .../jackrabbit/oak/spi/security/package-info.java | 2 +- .../spi/security/ConfigurationParametersTest.java | 45 ++++- oak-segment-tar/pom.xml | 16 +- .../oak/segment/CheckpointCompactor.java | 194 ++++++++++----------- .../apache/jackrabbit/oak/segment/Compactor.java | 61 +++++++ ...mpactor.java => LegacyCheckpointCompactor.java} | 27 ++- .../segment/file/AbstractCompactionStrategy.java | 17 +- .../segment/standby/client/StandbyClientSync.java | 4 +- .../oak/segment/standby/server/StandbyServer.java | 6 +- .../segment/AbstractCompactorExternalBlobTest.java | 32 ++-- .../oak/segment/AbstractCompactorTest.java | 59 ++++--- .../CheckpointCompactorExternalBlobTest.java | 4 +- .../oak/segment/CheckpointCompactorTest.java | 4 +- .../segment/CompactToDifferentNodeStoreTest.java | 145 +++++++++++++++ .../jackrabbit/oak/segment/CompactorTestUtils.java | 16 +- ...est.java => LegacyCheckpointCompactorTest.java} | 14 +- .../segment/ParallelCompactorExternalBlobTest.java | 17 +- .../oak/segment/ParallelCompactorTest.java | 10 +- 27 files changed, 537 insertions(+), 212 deletions(-) diff --cc oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java index 8638211184,db5c759845..58b3e549ef --- a/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java +++ b/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java @@@ -46,6 -46,10 +46,7 @@@ import com.amazonaws.services.s3.model. import com.amazonaws.services.s3.model.GetObjectRequest; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; + import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.apache.jackrabbit.core.data.DataIdentifier; -import org.apache.jackrabbit.core.data.DataRecord; -import org.apache.jackrabbit.core.data.DataStoreException; import org.apache.jackrabbit.oak.commons.PropertiesUtil; import org.apache.jackrabbit.oak.commons.collections.IterableUtils; import org.apache.jackrabbit.oak.commons.collections.ListUtils; diff --cc oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java index f661ea6b8f,6df2eb8140..2ec447d64f --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/AbstractDataStoreCacheTest.java @@@ -46,6 -46,10 +46,7 @@@ import java.util.concurrent.TimeUnit import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; + import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.apache.jackrabbit.core.data.DataIdentifier; -import org.apache.jackrabbit.core.data.DataRecord; -import org.apache.jackrabbit.core.data.DataStoreException; import org.apache.jackrabbit.guava.common.cache.CacheLoader; import org.apache.jackrabbit.guava.common.util.concurrent.AbstractListeningExecutorService; import org.apache.jackrabbit.guava.common.util.concurrent.FutureCallback;
