Skip to content

Arrow/AWS/Core/Hive: Fix ErrorProne warnings #5212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RussellSpitzer merged 1 commit into from
Jul 7, 2022
Merged

Arrow/AWS/Core/Hive: Fix ErrorProne warnings #5212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arrow/src/main/java/org/apache/iceberg/arrow/vectorized/ArrowReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ private static final class VectorizedCombinedScanIterator implements CloseableIt
.map(entry -> EncryptedFiles.encryptedInput(io.newInputFile(entry.getKey()), entry.getValue()));

// decrypt with the batch call to avoid multiple RPCs to a key server, if possible
@SuppressWarnings("StreamToIterable")
Iterable<InputFile> decryptedFiles = encryptionManager.decrypt(encrypted::iterator);

Map<String, InputFile> files = Maps.newHashMapWithExpectedSize(fileTasks.size());
Expand Down
2 changes: 1 addition & 1 deletion aws/src/integration/java/org/apache/iceberg/aws/glue/TestGlueCatalogTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ public void testTablePropsDefinedAtCatalogLevel() {
NestedField.required(4, "data", Types.StringType.get())
);

org.apache.iceberg.Table table = glueCatalog.buildTable(tableIdent, schema)
Table table = glueCatalog.buildTable(tableIdent, schema)
.withProperty("key2", "table-key2")
.withProperty("key3", "table-key3")
.withProperty("key5", "table-key5")
Expand Down
2 changes: 1 addition & 1 deletion aws/src/main/java/org/apache/iceberg/aws/glue/GlueTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ protected void doCommit(TableMetadata base, TableMetadata metadata) {
} catch (software.amazon.awssdk.services.glue.model.AlreadyExistsException e) {
throw new AlreadyExistsException(e,
"Cannot commit %s because its Glue table already exists when trying to create one", tableName());
} catch (software.amazon.awssdk.services.glue.model.EntityNotFoundException e) {
} catch (EntityNotFoundException e) {
throw new NotFoundException(e,
"Cannot commit %s because Glue cannot find the requested entity", tableName());
} catch (software.amazon.awssdk.services.glue.model.AccessDeniedException e) {
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/apache/iceberg/util/ZOrderByteUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ static byte[] interleaveBits(byte[][] columnsBinary, int interleavedSize) {
* @param interleavedSize the number of bytes to use in the output
* @return the columnbytes interleaved
*/
@SuppressWarnings("ByteBufferBackingArray")
// NarrowingCompoundAssignment is intended here. See https://github.com/apache/iceberg/pull/5200#issuecomment-1176226163
Copy link
Contributor

@kbendick kbendick Jul 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Member

@RussellSpitzer RussellSpitzer Jul 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only reason I don't have this documented more is that I was hoping we can get a better implementation in :)

I think we should write in some optimized versions for 2, 3, 4 columns since I think most cases will benefit in that range. Having more than that many Z order dimensions is probably a waste

@SuppressWarnings({"ByteBufferBackingArray", "NarrowingCompoundAssignment"})
public static byte[] interleaveBits(byte[][] columnsBinary, int interleavedSize, ByteBuffer reuse) {
byte[] interleavedBytes = reuse.array();
Arrays.fill(interleavedBytes, 0, interleavedSize, (byte) 0x00);
Expand Down
1 change: 1 addition & 0 deletions hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@ private StorageDescriptor storageDescriptor(TableMetadata metadata, boolean hive
return storageDescriptor;
}

@SuppressWarnings("ReverseDnsLookup")
@VisibleForTesting
long acquireLock() throws UnknownHostException, TException, InterruptedException {
final LockComponent lockComponent = new LockComponent(LockType.EXCLUSIVE, LockLevel.TABLE, database);
Expand Down