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 to...@apache.org on 2019/09/09 10:29:46 UTC
svn commit: r1866675 -
/jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java
Author: tomekr
Date: Mon Sep 9 10:29:46 2019
New Revision: 1866675
URL: http://svn.apache.org/viewvc?rev=1866675&view=rev
Log:
OAK-8610: Pass the full blob name to the IOMonitor for Azure
Modified:
jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java
Modified: jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java?rev=1866675&r1=1866674&r2=1866675&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java Mon Sep 9 10:29:46 2019
@@ -86,17 +86,18 @@ public class AzureSegmentArchiveWriter i
private void doWriteEntry(AzureSegmentArchiveEntry indexEntry, byte[] data, int offset, int size) throws IOException {
long msb = indexEntry.getMsb();
long lsb = indexEntry.getLsb();
- ioMonitor.beforeSegmentWrite(pathAsFile(), msb, lsb, size);
+ String segmentName = getSegmentFileName(indexEntry);
+ CloudBlockBlob blob = getBlob(segmentName);
+ ioMonitor.beforeSegmentWrite(new File(blob.getName()), msb, lsb, size);
Stopwatch stopwatch = Stopwatch.createStarted();
try {
- CloudBlockBlob blob = getBlob(getSegmentFileName(indexEntry));
blob.setMetadata(AzureBlobMetadata.toSegmentMetadata(indexEntry));
blob.uploadFromByteArray(data, offset, size);
blob.uploadMetadata();
} catch (StorageException e) {
throw new IOException(e);
}
- ioMonitor.afterSegmentWrite(pathAsFile(), msb, lsb, size, stopwatch.elapsed(TimeUnit.NANOSECONDS));
+ ioMonitor.afterSegmentWrite(new File(blob.getName()), msb, lsb, size, stopwatch.elapsed(TimeUnit.NANOSECONDS));
}
@Override
@@ -196,10 +197,6 @@ public class AzureSegmentArchiveWriter i
return AzureUtilities.getName(archiveDirectory);
}
- private File pathAsFile() {
- return new File(archiveDirectory.getUri().getPath());
- }
-
private CloudBlockBlob getBlob(String name) throws IOException {
try {
return archiveDirectory.getBlockBlobReference(name);