Re: svn commit: r1806894 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java

2017-09-01 Thread Amit Jain 
Yes +1 for backporting.

Thanks
Amit

On Fri, Sep 1, 2017 at 2:15 PM, Tomek Rekawek 
wrote:

> Hi Amit,
>
> thanks for noticing this. I’ve used the native S3DataStore#close() method.
> Also, I think it’s a good backport candidate (there were customers
> complaining on the Jackrabbit S3DataStore used in oak-upgrade). WDYT?
>
> Regards,
> Tomek
>
> --
> Tomek Rękawek | Adobe Research | www.adobe.com
> reka...@adobe.com
>
> > On 1 Sep 2017, at 10:17, Amit Jain  wrote:
> >
> > Just saw that you already did that.
> >
> > Thanks
> > Amit
> >
> > On Fri, Sep 1, 2017 at 1:46 PM, Amit Jain  wrote:
> >
> >> Hi Tomek,
> >>
> >> The {{asCloseable}} should also be changed to not take in the
> >> CachingDataStore but either the AbstractSharedCachingDataStore or
> >> S3DataStore instead and subsequently the import for CachingDataStore
> also
> >> removed.
> >>
> >> Thanks
> >> Amit
> >>
> >> On Fri, Sep 1, 2017 at 1:00 PM,  wrote:
> >>
> >>> Author: tomekr
> >>> Date: Fri Sep  1 07:30:49 2017
> >>> New Revision: 1806894
> >>>
> >>> URL: https://na01.safelinks.protection.outlook.com/?url=
> http%3A%2F%2Fsvn.apache.org%2Fviewvc%3Frev%3D1806894%
> 26view%3Drev=02%7C01%7C%7C867bccc313a6432c02d308d4f111ea3d%
> 7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C636398506629039415=
> 1337smywMXYTFMUYsuyv1or7oTA5IZ9s6iaU8pTqe3c%3D=0
> >>> Log:
> >>> OAK-6604: Oak Blob Cloud is not used by oak-upgrade
> >>>
> >>> Modified:
> >>>jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/
> >>> jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java
> >>>
> >>> Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/
> >>> jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java
> >>> URL: https://na01.safelinks.protection.outlook.com/?url=
> http%3A%2F%2Fsvn.apache.org%2Fviewvc%2Fjackrabbit%2Foak%
> 2Ftrunk%2Foak-upgrad=02%7C01%7C%7C867bccc313a6432c02d308d4f111ea3d%
> 7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C636398506629039415=
> M4l0HNGNjGyt7P3jH3KpxBRr0in3jpcqHFITrnkCLeQ%3D=0
> >>> e/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/
> >>> blob/S3DataStoreFactory.java?rev=1806894=1806893=
> 1806894=diff
> >>> 
> >>> ==
> >>> --- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/
> >>> jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java (original)
> >>> +++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/
> >>> jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java Fri Sep  1
> >>> 07:30:49 2017
> >>> @@ -31,7 +31,7 @@ import org.apache.commons.io.FileUtils;
> >>> import org.apache.commons.io.IOUtils;
> >>> import org.apache.jackrabbit.core.data.CachingDataStore;
> >>> import org.apache.jackrabbit.core.data.DataStoreException;
> >>> -import org.apache.jackrabbit.oak.blob.cloud.aws.s3.S3DataStore;
> >>> +import org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStore;
> >>> import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBl
> >>> obStore;
> >>> import org.apache.jackrabbit.oak.spi.blob.BlobStore;
> >>> import org.slf4j.Logger;
> >>>
> >>>
> >>>
> >>
>
>

Re: svn commit: r1806894 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java

2017-09-01 Thread Amit Jain 
Just saw that you already did that.

Thanks
Amit

On Fri, Sep 1, 2017 at 1:46 PM, Amit Jain  wrote:

> Hi Tomek,
>
> The {{asCloseable}} should also be changed to not take in the
> CachingDataStore but either the AbstractSharedCachingDataStore or
> S3DataStore instead and subsequently the import for CachingDataStore also
> removed.
>
> Thanks
> Amit
>
> On Fri, Sep 1, 2017 at 1:00 PM,  wrote:
>
>> Author: tomekr
>> Date: Fri Sep  1 07:30:49 2017
>> New Revision: 1806894
>>
>> URL: http://svn.apache.org/viewvc?rev=1806894=rev
>> Log:
>> OAK-6604: Oak Blob Cloud is not used by oak-upgrade
>>
>> Modified:
>> jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/
>> jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java
>>
>> Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/
>> jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java
>> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrad
>> e/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/
>> blob/S3DataStoreFactory.java?rev=1806894=1806893=1806894=diff
>> 
>> ==
>> --- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/
>> jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java (original)
>> +++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/
>> jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java Fri Sep  1
>> 07:30:49 2017
>> @@ -31,7 +31,7 @@ import org.apache.commons.io.FileUtils;
>>  import org.apache.commons.io.IOUtils;
>>  import org.apache.jackrabbit.core.data.CachingDataStore;
>>  import org.apache.jackrabbit.core.data.DataStoreException;
>> -import org.apache.jackrabbit.oak.blob.cloud.aws.s3.S3DataStore;
>> +import org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStore;
>>  import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBl
>> obStore;
>>  import org.apache.jackrabbit.oak.spi.blob.BlobStore;
>>  import org.slf4j.Logger;
>>
>>
>>
>

Re: svn commit: r1806894 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java

2017-09-01 Thread Amit Jain 
Hi Tomek,

The {{asCloseable}} should also be changed to not take in the
CachingDataStore but either the AbstractSharedCachingDataStore or
S3DataStore instead and subsequently the import for CachingDataStore also
removed.

Thanks
Amit

On Fri, Sep 1, 2017 at 1:00 PM,  wrote:

> Author: tomekr
> Date: Fri Sep  1 07:30:49 2017
> New Revision: 1806894
>
> URL: http://svn.apache.org/viewvc?rev=1806894=rev
> Log:
> OAK-6604: Oak Blob Cloud is not used by oak-upgrade
>
> Modified:
> jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/
> apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java
>
> Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/
> apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java
> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-
> upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/
> cli/blob/S3DataStoreFactory.java?rev=1806894=1806893&
> r2=1806894=diff
> 
> ==
> --- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/
> apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java (original)
> +++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/
> apache/jackrabbit/oak/upgrade/cli/blob/S3DataStoreFactory.java Fri Sep  1
> 07:30:49 2017
> @@ -31,7 +31,7 @@ import org.apache.commons.io.FileUtils;
>  import org.apache.commons.io.IOUtils;
>  import org.apache.jackrabbit.core.data.CachingDataStore;
>  import org.apache.jackrabbit.core.data.DataStoreException;
> -import org.apache.jackrabbit.oak.blob.cloud.aws.s3.S3DataStore;
> +import org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStore;
>  import org.apache.jackrabbit.oak.plugins.blob.datastore.
> DataStoreBlobStore;
>  import org.apache.jackrabbit.oak.spi.blob.BlobStore;
>  import org.slf4j.Logger;
>
>
>