madrob commented on a change in pull request #120: URL: https://github.com/apache/solr/pull/120#discussion_r668144323
########## File path: solr/contrib/blob-repository/src/java/org/apache/solr/blob/client/S3OutputStream.java ########## @@ -0,0 +1,250 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.solr.blob.client; + +import com.amazonaws.AmazonClientException; +import com.amazonaws.event.ProgressEvent; +import com.amazonaws.event.SyncProgressListener; +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.model.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.lang.invoke.MethodHandles; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; + +/** + * Implementation is adapted from https://github.com/confluentinc/kafka-connect-storage-cloud/blob/master/kafka-connect-s3/src/main/java/io/confluent/connect/s3/storage/S3OutputStream.java Review comment: Yes, please add to the javadocs, along with a perma-link to the version/commit/release that we were based on. ########## File path: solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3BackupRepository.java ########## @@ -255,40 +255,31 @@ public void copyIndexFileFrom(Directory sourceDir, String sourceFileName, URI de String blobPath = getS3Path(filePath); Instant start = Instant.now(); if (log.isDebugEnabled()) { - log.debug("Upload started to blob'{}'", blobPath); + log.debug("Upload started to S3 '{}'", blobPath); } - IndexInput indexInput = null; - OutputStream outputStream = null; - try { + try (IndexInput indexInput = sourceDir.openInput(sourceFileName, IOContext.DEFAULT)) { client.createDirectory(getS3Path(dest)); - indexInput = sourceDir.openInput(sourceFileName, IOContext.DEFAULT); - outputStream = client.pushStream(blobPath); + try (OutputStream outputStream = client.pushStream(blobPath)) { - byte[] buffer = new byte[CHUNK_SIZE]; - int bufferLen; - long remaining = indexInput.length(); + byte[] buffer = new byte[CHUNK_SIZE]; + int bufferLen; + long remaining = indexInput.length(); - while (remaining > 0) { - bufferLen = remaining >= CHUNK_SIZE ? CHUNK_SIZE : (int) remaining; + while (remaining > 0) { + bufferLen = remaining >= CHUNK_SIZE ? CHUNK_SIZE : (int) remaining; - indexInput.readBytes(buffer, 0, bufferLen); - outputStream.write(buffer, 0, bufferLen); - remaining -= bufferLen; - } - outputStream.flush(); - } finally { - if (indexInput != null) { - indexInput.close(); - } - if (outputStream != null) { - outputStream.close(); + indexInput.readBytes(buffer, 0, bufferLen); + outputStream.write(buffer, 0, bufferLen); + remaining -= bufferLen; + } + outputStream.flush(); Review comment: do we get an implicit flush on close? if yes, delete; if not, please document that this is needed explicitly. ########## File path: solr/contrib/s3-repository/src/java/org/apache/solr/s3/S3BackupRepositoryConfig.java ########## @@ -40,9 +38,8 @@ private final int proxyPort; private final boolean s3mock; - @SuppressWarnings({"rawtypes", "unchecked"}) - public S3BackupRepositoryConfig(NamedList args) { - NamedList<String> config = args.clone(); + public S3BackupRepositoryConfig(NamedList<?> args) { + NamedList<?> config = args.clone(); Review comment: Is this necessary? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
