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 am...@apache.org on 2018/10/25 03:00:23 UTC
svn commit: r1844802 - in /jackrabbit/oak/branches/1.8: ./
oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/
oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/
oak-it/src/test/java/org/apache/jackrabbit/oak/plugi...
Author: amitj
Date: Thu Oct 25 03:00:23 2018
New Revision: 1844802
URL: http://svn.apache.org/viewvc?rev=1844802&view=rev
Log:
OAK-7858: S3#getAllIdentifiers may trim listing when filtering out metadata objects
Merge r1844728 from trunk
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java
jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedS3DataStoreUtilsTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 25 03:00:23 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157
-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840574,1841314,1841352,1842677,1843222,1843231,1843398,1843618,1843652,1843911
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157
-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840574,1841314,1841352,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844728
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java?rev=1844802&r1=1844801&r2=1844802&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java (original)
+++ jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Backend.java Thu Oct 25 03:00:23 2018
@@ -596,6 +596,11 @@ public class S3Backend extends AbstractS
loadBatch();
}
+ while (queue.isEmpty() && prevObjectListing.getNextMarker() != null) {
+ LOG.debug("Queue is empty, but there is more data in the S3 bucket");
+ loadBatch();
+ }
+
if (!queue.isEmpty()) {
return transformer.apply(queue.remove());
}
@@ -611,7 +616,13 @@ public class S3Backend extends AbstractS
// initialize the listing the first time
if (prevObjectListing == null) {
- prevObjectListing = s3service.listObjects(bucket);
+ ListObjectsRequest listReq = new ListObjectsRequest();
+ listReq.withBucketName(bucket);
+ if (properties.containsKey(S3Constants.MAX_KEYS)) {
+ listReq.setMaxKeys(Integer.valueOf(properties.getProperty(S3Constants.MAX_KEYS)));
+ }
+
+ prevObjectListing = s3service.listObjects(listReq);
} else if (prevObjectListing.isTruncated()) { //already initialized more objects available
prevObjectListing = s3service.listNextBatchOfObjects(prevObjectListing);
} else { // no more available
Modified: jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java?rev=1844802&r1=1844801&r2=1844802&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java (original)
+++ jackrabbit/oak/branches/1.8/oak-blob-cloud/src/main/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3Constants.java Thu Oct 25 03:00:23 2018
@@ -108,6 +108,11 @@ public final class S3Constants {
public static final String PROXY_HOST = "proxyHost";
/**
+ * Constant to set max list keys.
+ */
+ public static final String MAX_KEYS = "maxKeys";
+
+ /**
* Constant to set proxy port.
*/
public static final String PROXY_PORT = "proxyPort";
Modified: jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java?rev=1844802&r1=1844801&r2=1844802&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/SharedDataStoreUtilsTest.java Thu Oct 25 03:00:23 2018
@@ -215,6 +215,40 @@ public class SharedDataStoreUtilsTest {
}
@Test
+ public void testGetAllRecordsWithMeta() throws Exception {
+ File rootFolder = folder.newFolder();
+ dataStore = getBlobStore(rootFolder);
+ int number = 2;
+ Set<String> added = newHashSet();
+ for (int i = 0; i < number; i++) {
+ String rec = dataStore.addRecord(randomStream(i, 16516))
+ .getIdentifier().toString();
+ added.add(rec);
+ }
+
+ if (dataStore.getType() == SharedDataStore.Type.SHARED) {
+ dataStore.addMetadataRecord(new ByteArrayInputStream(new byte[0]), "1meta");
+ dataStore.addMetadataRecord(new ByteArrayInputStream(new byte[0]), "2meta");
+ dataStore.addMetadataRecord(new ByteArrayInputStream(new byte[0]), "ameta1");
+ dataStore.addMetadataRecord(new ByteArrayInputStream(new byte[0]), "bmeta2");
+ }
+
+ for (int i = 0; i < number; i++) {
+ String rec = dataStore.addRecord(randomStream(100+i, 16516))
+ .getIdentifier().toString();
+ added.add(rec);
+ }
+
+ Set<String> retrieved = newHashSet(Iterables.transform(newHashSet(dataStore.getAllRecords()),
+ new Function<DataRecord, String>() {
+ @Nullable @Override public String apply(@Nullable DataRecord input) {
+ return input.getIdentifier().toString();
+ }
+ }));
+ assertEquals(added, retrieved);
+ }
+
+ @Test
public void testStreamFromGetAllRecords() throws Exception {
File rootFolder = folder.newFolder();
dataStore = getBlobStore(rootFolder);
Modified: jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedS3DataStoreUtilsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedS3DataStoreUtilsTest.java?rev=1844802&r1=1844801&r2=1844802&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedS3DataStoreUtilsTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/SharedS3DataStoreUtilsTest.java Thu Oct 25 03:00:23 2018
@@ -66,6 +66,7 @@ public class SharedS3DataStoreUtilsTest
bucket = rootFolder.getName();
props.setProperty(S3Constants.S3_BUCKET, bucket);
props.setProperty("cacheSize", "0");
+ props.setProperty(S3Constants.MAX_KEYS, "2");
return new DataStoreBlobStore(
S3DataStoreUtils.getS3DataStore(s3Class, props, rootFolder.getAbsolutePath()));
}