You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2026/03/25 08:29:57 UTC

(jackrabbit-oak) branch OAK-8840 updated (ce0fb8abd9 -> 052c120609)

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a change to branch OAK-8840
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


    from ce0fb8abd9 OAK-8840: copy jackrabbit-data into Oak: add Jackrabbit tests (move core.fs)
     add 052c120609 OAK-8840: copy jackrabbit-data into Oak: add Jackrabbit tests (move core.data to oak.spi.blb.data)

No new revisions were added by this update.

Summary of changes:
 .../blobstorage/AbstractAzureBlobStoreBackend.java |  6 +-
 .../blobstorage/AbstractAzureDataStoreService.java |  4 +-
 .../blobstorage/AzureBlobContainerProvider.java    |  3 +-
 .../azure/blobstorage/AzureBlobStoreBackend.java   |  7 +-
 .../cloud/azure/blobstorage/AzureDataStore.java    |  6 +-
 .../oak/blob/cloud/azure/blobstorage/Utils.java    |  2 +-
 .../v8/AzureBlobContainerProviderV8.java           |  2 +-
 .../blobstorage/v8/AzureBlobStoreBackendV8.java    |  6 +-
 .../blob/cloud/azure/blobstorage/v8/UtilsV8.java   |  2 +-
 .../AzureBlobContainerProviderTest.java            |  4 +-
 .../blobstorage/AzureBlobStoreBackendTest.java     |  6 +-
 .../AzureDataRecordAccessProviderCDNTest.java      |  2 +-
 .../AzureDataRecordAccessProviderIT.java           |  8 +-
 .../AzureDataRecordAccessProviderTest.java         |  9 +--
 .../azure/blobstorage/AzureDataStoreTest.java      |  6 +-
 .../azure/blobstorage/AzureDataStoreUtils.java     |  2 +-
 .../blob/cloud/azure/blobstorage/TestAzureDS.java  |  2 +-
 .../blobstorage/TestAzureDSWithSmallCache.java     |  4 +-
 .../azure/blobstorage/TestAzureDsCacheOff.java     |  3 +-
 .../blob/cloud/azure/blobstorage/UtilsTest.java    |  2 +-
 ...eBlobContainerProviderV8AuthenticationTest.java |  2 +-
 ...ContainerProviderV8ContainerOperationsTest.java |  4 +-
 ...BlobContainerProviderV8ErrorConditionsTest.java |  3 +-
 .../v8/AzureBlobContainerProviderV8Test.java       |  4 +-
 .../v8/AzureBlobStoreBackendV8Test.java            | 87 ++++++++++----------
 .../cloud/azure/blobstorage/v8/UtilsV8Test.java    |  2 +-
 .../blob/cloud/s3/AbstractS3DataStoreService.java  |  4 +-
 .../jackrabbit/oak/blob/cloud/s3/S3Backend.java    |  6 +-
 .../jackrabbit/oak/blob/cloud/s3/S3DataStore.java  |  6 +-
 .../cloud/s3/S3DataRecordAccessProviderIT.java     |  8 +-
 .../cloud/s3/S3DataRecordAccessProviderTest.java   |  8 +-
 .../oak/blob/cloud/s3/S3DataStoreUtils.java        |  2 +-
 .../oak/blob/cloud/s3/TestS3DSWithSmallCache.java  |  4 +-
 .../oak/blob/cloud/s3/TestS3DataStore.java         |  4 +-
 .../jackrabbit/oak/blob/cloud/s3/TestS3Ds.java     |  6 +-
 .../oak/blob/cloud/s3/TestS3DsCacheOff.java        |  3 +-
 .../blob/AbstractSharedCachingDataStore.java       | 10 +--
 .../blob/ConsolidatedDataStoreCacheStats.java      |  2 +-
 .../plugins/blob/DataStoreCacheUpgradeUtils.java   | 11 ++-
 .../plugins/blob/ExtendedBlobStatsCollector.java   |  5 +-
 .../plugins/blob/MarkSweepGarbageCollector.java    |  4 +-
 .../oak/plugins/blob/SharedDataStore.java          |  6 +-
 .../oak/plugins/blob/UploadStagingCache.java       |  2 +-
 .../blob/datastore/AbstractDataStoreService.java   |  4 +-
 .../oak/plugins/blob/datastore/BlobIdTracker.java  |  2 +-
 .../plugins/blob/datastore/DataStoreBlobStore.java | 12 +--
 .../oak/plugins/blob/datastore/FSBackend.java      |  8 +-
 .../blob/datastore/FileDataStoreService.java       |  2 +-
 .../plugins/blob/datastore/InMemoryDataRecord.java |  6 +-
 .../plugins/blob/datastore/OakFileDataStore.java   | 10 +--
 .../blob/datastore/SharedDataStoreUtils.java       |  2 +-
 .../oak/plugins/blob/datastore/TypedDataStore.java |  7 +-
 .../directaccess/DataRecordAccessProvider.java     |  6 +-
 .../directaccess/DataRecordUploadToken.java        |  3 +-
 .../blob/datastore/directaccess/package-info.java  |  2 +-
 .../plugins/blob/serializer/FSBlobSerializer.java  |  4 +-
 .../oak/plugins/blob/blobstore.properties          |  4 +-
 .../plugins/blob/AbstractDataStoreCacheTest.java   |  6 +-
 .../oak/plugins/blob/CachingDataStoreTest.java     |  6 +-
 .../blob/ConsolidatedDataStoreStatsTest.java       |  4 +-
 ...aredDataStoreMarkSweepGarbageCollectorTest.java |  6 +-
 .../oak/plugins/blob/SharedDataStoreUtilsTest.java |  6 +-
 .../oak/plugins/blob/TimeLapsedDataStore.java      | 10 +--
 .../oak/plugins/blob/UploadStagingCacheTest.java   |  2 +-
 .../blob/datastore/AbstractDataStoreTest.java      | 13 +--
 .../datastore/BlobIdTrackerClusterSharedTest.java  |  2 +-
 .../plugins/blob/datastore/BlobIdTrackerTest.java  |  4 +-
 .../BlobStoreStatsTestableFileDataStore.java       |  6 +-
 .../blob/datastore/CachingFileDataStoreTest.java   |  4 +-
 .../datastore/DataStoreBlobStoreStatsTest.java     |  8 +-
 .../blob/datastore/DataStoreBlobStoreTest.java     |  8 +-
 .../blob/datastore/DataStoreServiceTest.java       |  4 +-
 .../oak/plugins/blob/datastore/DataStoreUtils.java |  6 +-
 .../oak/plugins/blob/datastore/FSBackendIT.java    |  8 +-
 .../blob/datastore/InMemoryDataRecordTest.java     |  2 +-
 .../blob/datastore/OakFileDataStoreTest.java       |  4 +-
 .../blob/datastore/SharedDataStoreTest.java        |  8 +-
 .../AbstractDataRecordAccessProviderIT.java        |  8 +-
 .../AbstractDataRecordAccessProviderTest.java      |  8 +-
 oak-blob/pom.xml                                   |  6 +-
 .../oak/spi/blob/AbstractDataRecord.java           |  4 +-
 .../oak/spi/blob/AbstractSharedBackend.java        |  4 +-
 .../jackrabbit/oak/spi/blob/SharedBackend.java     | 10 +--
 .../spi/blob}/data/AbstractBackend.java            |  4 +-
 .../spi/blob}/data/AbstractDataRecord.java         |  2 +-
 .../spi/blob}/data/AbstractDataStore.java          |  2 +-
 .../spi/blob}/data/AsyncTouchCallback.java         |  2 +-
 .../spi/blob}/data/AsyncTouchResult.java           |  2 +-
 .../spi/blob}/data/AsyncUploadCache.java           |  2 +-
 .../spi/blob}/data/AsyncUploadCacheResult.java     |  2 +-
 .../spi/blob}/data/AsyncUploadCallback.java        |  2 +-
 .../spi/blob}/data/AsyncUploadResult.java          |  2 +-
 .../{core => oak/spi/blob}/data/Backend.java       |  2 +-
 .../spi/blob}/data/BackendResourceAbortable.java   |  2 +-
 .../spi/blob}/data/CachingDataRecord.java          |  2 +-
 .../spi/blob}/data/CachingDataStore.java           |  5 +-
 .../{core => oak/spi/blob}/data/CachingFDS.java    |  2 +-
 .../spi/blob}/data/DataIdentifier.java             |  2 +-
 .../{core => oak/spi/blob}/data/DataRecord.java    |  2 +-
 .../{core => oak/spi/blob}/data/DataStore.java     |  2 +-
 .../spi/blob}/data/DataStoreException.java         |  2 +-
 .../{core => oak/spi/blob}/data/FSBackend.java     |  2 +-
 .../spi/blob}/data/FileDataRecord.java             |  2 +-
 .../{core => oak/spi/blob}/data/FileDataStore.java |  4 +-
 .../spi/blob}/data/LazyFileInputStream.java        |  2 +-
 .../{core => oak/spi/blob}/data/LocalCache.java    |  2 +-
 .../spi/blob}/data/MultiDataStore.java             |  6 +-
 .../spi/blob}/data/MultiDataStoreAware.java        |  4 +-
 .../{core => oak/spi/blob}/data/package-info.java  |  2 +-
 .../spi/blob}/data/util/NamedThreadFactory.java    |  2 +-
 .../spi/blob}/data/util/package-info.java          |  2 +-
 .../oak/spi/blob/stats/BlobStatsCollector.java     | 41 +++++-----
 .../spi/blob}/data/InMemoryBackend.java            |  2 +-
 .../spi/blob}/data/InMemoryDataStore.java          |  5 +-
 .../spi/blob}/data/RandomInputStream.java          |  2 +-
 .../spi/blob}/data/TestCachingFDS.java             |  2 +-
 .../spi/blob}/data/TestCachingFDSCacheOff.java     |  2 +-
 .../{core => oak/spi/blob}/data/TestCaseBase.java  |  3 +-
 .../spi/blob}/data/TestFileDataStore.java          |  2 +-
 .../{core => oak/spi/blob}/data/TestInMemDs.java   |  2 +-
 .../spi/blob}/data/TestInMemDsCacheOff.java        |  2 +-
 .../spi/blob}/data/TestLocalCache.java             |  4 +-
 .../index/datastore/DataStoreTextWriterTest.java   |  4 +-
 .../oak/jcr/binary/AbstractBinaryAccessIT.java     |  2 +-
 .../oak/jcr/binary/BinaryAccessDSGCIT.java         |  2 +-
 .../fixtures/datastore/AzureDataStoreFixture.java  |  4 +-
 .../fixtures/datastore/DataStoreFixture.java       |  3 +-
 .../fixtures/datastore/FileDataStoreFixture.java   |  4 +-
 .../fixtures/datastore/S3DataStoreFixture.java     |  4 +-
 .../nodestore/DocumentMemoryNodeStoreFixture.java  |  2 +-
 .../nodestore/DocumentMongoNodeStoreFixture.java   |  2 +-
 .../nodestore/SegmentMemoryNodeStoreFixture.java   |  2 +-
 .../ActiveDeletedBlobCollectorFactory.java         |  2 +-
 .../plugins/index/lucene/LuceneBlobCacheTest.java  |  6 +-
 .../lucene/LuceneWritesOnSegmentStatsTest.java     |  2 +-
 .../directory/AbstractActiveDeletedBlobTest.java   |  6 +-
 .../directory/ActiveDeletedBlobCollectionIT.java   |  2 +-
 .../directory/ActiveDeletedBlobCollectorTest.java  |  2 +-
 .../lucene/directory/OakDirectoryTestBase.java     |  2 +-
 .../jackrabbit/oak/fixture/BlobStoreFixture.java   |  4 +-
 .../jackrabbit/oak/fixture/DataStoreUtils.java     |  4 +-
 .../jackrabbit/oak/fixture/SegmentTarFixture.java  |  2 +-
 .../oak/run/cli/BlobStoreFixtureProvider.java      |  6 +-
 .../jackrabbit/oak/run/cli/DummyDataStore.java     | 10 +--
 .../oak/run/cli/ReadOnlyBlobStoreWrapperTest.java  |  2 +-
 .../jackrabbit/oak/run/DataStoreCommand.java       |  2 +-
 .../java/org/apache/jackrabbit/oak/run/Utils.java  |  4 +-
 .../apache/jackrabbit/oak/fixture/repository.xml   |  2 +-
 .../jackrabbit/oak/run/DataStoreCheckTest.java     |  3 +-
 .../oak/run/DataStoreCommandMetadataTest.java      |  4 +-
 .../jackrabbit/oak/run/DataStoreCommandTest.java   |  4 +-
 .../run/query/BinaryStorageWithBlobStoreTest.java  |  2 +-
 .../IndexRegexPropertyWithBinaryExcludedTest.java  |  2 +-
 .../oak/segment/BinariesInlineThresholdIT.java     |  2 +-
 .../jackrabbit/oak/segment/ExternalBlobIT.java     |  2 +-
 .../oak/segment/SegmentNodeStoreServiceTest.java   |  2 +-
 .../segment/standby/StandbySegmentBlobTestIT.java  |  2 +-
 .../standby/client/RemoteBlobProcessorTest.java    |  2 +-
 .../oak/segment/test/TemporaryBlobStore.java       |  4 +-
 .../plugins/document/SharedBlobStoreGCTest.java    |  2 +-
 .../oak/upgrade/cli/MigrationFactory.java          | 93 +++++++++++++++++++++-
 .../upgrade/cli/blob/AzureDataStoreFactory.java    |  2 +-
 .../oak/upgrade/cli/blob/FileDataStoreFactory.java |  2 +-
 .../oak/upgrade/cli/blob/S3DataStoreFactory.java   |  2 +-
 .../upgrade/cli/blob/SafeDataStoreBlobStore.java   |  8 +-
 165 files changed, 474 insertions(+), 395 deletions(-)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/AbstractBackend.java (97%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/AbstractDataRecord.java (98%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/AbstractDataStore.java (99%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/AsyncTouchCallback.java (96%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/AsyncTouchResult.java (96%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/AsyncUploadCache.java (99%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/AsyncUploadCacheResult.java (97%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/AsyncUploadCallback.java (96%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/AsyncUploadResult.java (97%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/Backend.java (99%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/BackendResourceAbortable.java (97%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/CachingDataRecord.java (97%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/CachingDataStore.java (99%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/CachingFDS.java (97%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/DataIdentifier.java (97%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/DataRecord.java (97%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/DataStore.java (99%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/DataStoreException.java (97%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/FSBackend.java (99%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/FileDataRecord.java (97%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/FileDataStore.java (99%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/LazyFileInputStream.java (98%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/LocalCache.java (99%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/MultiDataStore.java (99%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/MultiDataStoreAware.java (92%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/package-info.java (94%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/util/NamedThreadFactory.java (96%)
 rename oak-blob/src/main/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/util/package-info.java (94%)
 rename oak-blob/src/test/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/InMemoryBackend.java (99%)
 rename oak-blob/src/test/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/InMemoryDataStore.java (91%)
 rename oak-blob/src/test/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/RandomInputStream.java (98%)
 rename oak-blob/src/test/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/TestCachingFDS.java (98%)
 rename oak-blob/src/test/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/TestCachingFDSCacheOff.java (97%)
 rename oak-blob/src/test/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/TestCaseBase.java (99%)
 rename oak-blob/src/test/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/TestFileDataStore.java (97%)
 rename oak-blob/src/test/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/TestInMemDs.java (96%)
 rename oak-blob/src/test/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/TestInMemDsCacheOff.java (96%)
 rename oak-blob/src/test/java/org/apache/jackrabbit/{core => oak/spi/blob}/data/TestLocalCache.java (99%)