galenwarren commented on a change in pull request #15599: URL: https://github.com/apache/flink/pull/15599#discussion_r783116184
########## File path: flink-filesystems/flink-gs-fs-hadoop/src/test/java/org/apache/flink/fs/gs/utils/BlobUtilsTest.java ########## @@ -0,0 +1,125 @@ +/* + * 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.flink.fs.gs.utils; + +import org.apache.flink.configuration.Configuration; +import org.apache.flink.fs.gs.GSFileSystemOptions; +import org.apache.flink.fs.gs.storage.GSBlobIdentifier; + +import org.junit.Test; + +import java.net.URI; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; + +/** Test {@link BlobUtils}. */ +public class BlobUtilsTest { + + @Test + public void shouldParseValidUri() { + GSBlobIdentifier blobIdentifier = BlobUtils.parseUri(URI.create("gs://bucket/foo/bar")); + assertEquals("bucket", blobIdentifier.bucketName); + assertEquals("foo/bar", blobIdentifier.objectName); + } + + @Test(expected = IllegalArgumentException.class) + public void shouldFailToParseUriBadScheme() { + BlobUtils.parseUri(URI.create("s3://bucket/foo/bar")); + } + + @Test(expected = IllegalArgumentException.class) + public void shouldFailToParseUriMissingBucketName() { + BlobUtils.parseUri(URI.create("gs:///foo/bar")); + } + + @Test(expected = IllegalArgumentException.class) + public void shouldFailToParseUriMissingObjectName() { + BlobUtils.parseUri(URI.create("gs://bucket/")); + } + + @Test + public void shouldUseTemporaryBucketNameIfSpecified() { + Configuration flinkConfig = new Configuration(); + flinkConfig.setString("gs.writer.temporary.bucket.name", "temp"); + GSFileSystemOptions options = new GSFileSystemOptions(flinkConfig); + GSBlobIdentifier identifier = new GSBlobIdentifier("foo", "bar"); + + String bucketName = BlobUtils.getTemporaryBucketName(identifier, options); + assertEquals("temp", bucketName); + } + + @Test + public void shouldUseIdentifierBucketNameNameIfTemporaryBucketNotSpecified() { + Configuration flinkConfig = new Configuration(); + GSFileSystemOptions options = new GSFileSystemOptions(flinkConfig); + GSBlobIdentifier identifier = new GSBlobIdentifier("foo", "bar"); + + String bucketName = BlobUtils.getTemporaryBucketName(identifier, options); + assertEquals("foo", bucketName); + } + + @Test + public void shouldProperlyConstructTemporaryObjectPartialName() { + GSBlobIdentifier identifier = new GSBlobIdentifier("foo", "bar"); + + String partialName = BlobUtils.getTemporaryObjectPartialName(identifier); + assertEquals(".inprogress/foo/bar/", partialName); + } + + @Test + public void shouldProperlyConstructTemporaryObjectName() { + GSBlobIdentifier identifier = new GSBlobIdentifier("foo", "bar"); + UUID temporaryObjectId = UUID.fromString("f09c43e5-ea49-4537-a406-0586f8f09d47"); + + String partialName = BlobUtils.getTemporaryObjectName(identifier, temporaryObjectId); + assertEquals(".inprogress/foo/bar/f09c43e5-ea49-4537-a406-0586f8f09d47", partialName); + } + + @Test + public void shouldProperlyConstructTemporaryBlobIdentifierWithDefaultBucket() { + Configuration flinkConfig = new Configuration(); + GSFileSystemOptions options = new GSFileSystemOptions(flinkConfig); + GSBlobIdentifier identifier = new GSBlobIdentifier("foo", "bar"); + UUID temporaryObjectId = UUID.fromString("f09c43e5-ea49-4537-a406-0586f8f09d47"); + + GSBlobIdentifier temporaryBlobIdentifier = + BlobUtils.getTemporaryBlobIdentifier(identifier, temporaryObjectId, options); + assertEquals("foo", temporaryBlobIdentifier.bucketName); + assertEquals( + ".inprogress/foo/bar/f09c43e5-ea49-4537-a406-0586f8f09d47", + temporaryBlobIdentifier.objectName); + } + + @Test + public void shouldProperlyConstructTemporaryBlobIdentifierWithTemporaryBucket() { + Configuration flinkConfig = new Configuration(); + flinkConfig.setString("gs.writer.temporary.bucket.name", "temp"); Review comment: Fixed in [5821321](https://github.com/apache/flink/pull/15599/commits/5821321ce92a5d827b53ef882d6214dd6ed9bad5). ########## File path: flink-filesystems/flink-gs-fs-hadoop/src/test/java/org/apache/flink/fs/gs/writer/GSRecoverableWriterTest.java ########## @@ -0,0 +1,176 @@ +/* + * 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.flink.fs.gs.writer; + +import org.apache.flink.configuration.Configuration; +import org.apache.flink.core.fs.Path; +import org.apache.flink.fs.gs.GSFileSystemOptions; +import org.apache.flink.fs.gs.storage.GSBlobIdentifier; +import org.apache.flink.fs.gs.storage.MockBlobStorage; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.UUID; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +/** Test {@link GSRecoverableWriter}. */ +@RunWith(Parameterized.class) +public class GSRecoverableWriterTest { + + @Parameterized.Parameter(value = 0) + public long position = 16; + + @Parameterized.Parameter(value = 1) + public boolean closed = false; + + @Parameterized.Parameter(value = 2) + public int componentCount; + + @Parameterized.Parameters(name = "position={0}, closed={1}, componentCount={2}") + public static Collection<Object[]> data() { + return Arrays.asList( + new Object[][] { + // position 0, not closed, component count = 0 + {0, false, 0}, + // position 16, not closed, component count = 2 + {16, false, 2}, + // position 0, closed, component count = 0 + {0, true, 0}, + // position 16, closed, component count = 2 + {16, true, 2}, + }); + } + + private GSFileSystemOptions options; + + private GSRecoverableWriter writer; + + private List<UUID> componentObjectIds; + + private GSResumeRecoverable resumeRecoverable; + + private GSCommitRecoverable commitRecoverable; + + private GSBlobIdentifier blobIdentifier; + + @Before + public void before() { + MockBlobStorage storage = new MockBlobStorage(); + blobIdentifier = new GSBlobIdentifier("foo", "bar"); + + Configuration flinkConfig = new Configuration(); + options = new GSFileSystemOptions(flinkConfig); + writer = new GSRecoverableWriter(storage, options); + + componentObjectIds = new ArrayList<UUID>(); + for (int i = 0; i < componentCount; i++) { + componentObjectIds.add(UUID.randomUUID()); + } + + resumeRecoverable = + new GSResumeRecoverable(blobIdentifier, componentObjectIds, position, closed); + commitRecoverable = new GSCommitRecoverable(blobIdentifier, componentObjectIds); + } + + @Test + public void testRequiresCleanupOfRecoverableState() { + assertFalse(writer.requiresCleanupOfRecoverableState()); + } + + @Test + public void testSupportsResume() { + assertTrue(writer.supportsResume()); + } + + @Test + public void testOpen() throws IOException { + Path path = new Path("gs://foo/bar"); + GSRecoverableFsDataOutputStream stream = + (GSRecoverableFsDataOutputStream) writer.open(path); + assertEquals("foo", stream.finalBlobIdentifier.bucketName); + assertEquals("bar", stream.finalBlobIdentifier.objectName); + assertEquals(options, stream.options); Review comment: Done in [5821321](https://github.com/apache/flink/pull/15599/commits/5821321ce92a5d827b53ef882d6214dd6ed9bad5). -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
