Skip to content

Commit 734a804

Browse files
committed
Try slightly different resource close semantics
1 parent 4a676a4 commit 734a804

File tree

1 file changed

+22
-16
lines changed

1 file changed

+22
-16
lines changed

src/test/java/io/tiledb/java/api/ArrayTest.java

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ public void insertArbitraryValuesVarSize(
8989
query.submit();
9090
query.finalizeQuery();
9191
}
92-
array.close();
9392
}
9493

9594
public void insertArbitraryValuesMeth(Array array, NativeArray a_data) throws TileDBError {
@@ -98,19 +97,18 @@ public void insertArbitraryValuesMeth(Array array, NativeArray a_data) throws Ti
9897
query.setLayout(TILEDB_ROW_MAJOR).setBuffer(attributeName, a_data);
9998
query.submit();
10099
}
101-
array.close();
102100
}
103101

104102
public void insertArbitraryValues(NativeArray a_data) throws TileDBError {
105-
Array array = new Array(ctx, arrayURI, TILEDB_WRITE);
106-
insertArbitraryValuesMeth(array, a_data);
107-
array.close();
103+
try (Array array = new Array(ctx, arrayURI, TILEDB_WRITE)) {
104+
insertArbitraryValuesMeth(array, a_data);
105+
}
108106
}
109107

110108
public void insertArbitraryValuesEncrypted(NativeArray a_data) throws TileDBError {
111-
Array array = new Array(ctx, arrayURI, TILEDB_WRITE, EncryptionType.TILEDB_AES_256_GCM, key);
112-
insertArbitraryValuesMeth(array, a_data);
113-
array.close();
109+
try (Array array = new Array(ctx, arrayURI, TILEDB_WRITE, EncryptionType.TILEDB_AES_256_GCM, key)) {
110+
insertArbitraryValuesMeth(array, a_data);
111+
}
114112
}
115113

116114
public long[] readArray(Array array) throws TileDBError {
@@ -297,8 +295,10 @@ public void testArrayGetNonEmptyDomainVarSizeFromIndex() throws Exception {
297295
Array.create(arrayURI, schemaStringDimsCreate(ArrayType.TILEDB_SPARSE));
298296
NativeArray data = new NativeArray(ctx, "aabbccddee", TILEDB_STRING_ASCII);
299297
NativeArray offsets = new NativeArray(ctx, new long[] {0, 2, 4, 6}, TILEDB_UINT64);
300-
insertArbitraryValuesVarSize(
301-
new Array(ctx, arrayURI, TILEDB_WRITE), dimName, data, offsets, TILEDB_UNORDERED);
298+
try (Array array = new Array(ctx, arrayURI, TILEDB_WRITE)) {
299+
insertArbitraryValuesVarSize(
300+
array, dimName, data, offsets, TILEDB_UNORDERED);
301+
}
302302

303303
try (Array array = new Array(ctx, arrayURI, TILEDB_READ)) {
304304

@@ -314,8 +314,10 @@ public void testArrayGetNonEmptyDomainVarSizeFromName() throws Exception {
314314
Array.create(arrayURI, schemaStringDimsCreate(ArrayType.TILEDB_SPARSE));
315315
NativeArray data = new NativeArray(ctx, "aabbccddee", TILEDB_STRING_ASCII);
316316
NativeArray offsets = new NativeArray(ctx, new long[] {0, 2, 4, 6}, TILEDB_UINT64);
317-
insertArbitraryValuesVarSize(
318-
new Array(ctx, arrayURI, TILEDB_WRITE), dimName, data, offsets, TILEDB_UNORDERED);
317+
try (Array array = new Array(ctx, arrayURI, TILEDB_WRITE)) {
318+
insertArbitraryValuesVarSize(
319+
array, dimName, data, offsets, TILEDB_UNORDERED);
320+
}
319321

320322
try (Array array = new Array(ctx, arrayURI, TILEDB_READ)) {
321323

@@ -331,8 +333,10 @@ public void testArrayGetNonEmptyDomainVarFromIndex() throws Exception {
331333
Array.create(arrayURI, schemaStringDimsCreate(ArrayType.TILEDB_SPARSE));
332334
NativeArray data = new NativeArray(ctx, "aabbccddee", TILEDB_STRING_ASCII);
333335
NativeArray offsets = new NativeArray(ctx, new long[] {0, 2, 4, 6}, TILEDB_UINT64);
334-
insertArbitraryValuesVarSize(
335-
new Array(ctx, arrayURI, TILEDB_WRITE), dimName, data, offsets, TILEDB_UNORDERED);
336+
try (Array array = new Array(ctx, arrayURI, TILEDB_WRITE)) {
337+
insertArbitraryValuesVarSize(
338+
array, dimName, data, offsets, TILEDB_UNORDERED);
339+
}
336340

337341
try (Array array = new Array(ctx, arrayURI, TILEDB_READ)) {
338342

@@ -352,8 +356,10 @@ public void testArrayGetNonEmptyDomainVarFromName() throws Exception {
352356
Array.create(arrayURI, schemaStringDimsCreate(ArrayType.TILEDB_SPARSE));
353357
NativeArray data = new NativeArray(ctx, "aabbccddee", TILEDB_STRING_ASCII);
354358
NativeArray offsets = new NativeArray(ctx, new long[] {0, 2, 4, 6}, TILEDB_UINT64);
355-
insertArbitraryValuesVarSize(
356-
new Array(ctx, arrayURI, TILEDB_WRITE), dimName, data, offsets, TILEDB_UNORDERED);
359+
try (Array array = new Array(ctx, arrayURI, TILEDB_WRITE)) {
360+
insertArbitraryValuesVarSize(
361+
array, dimName, data, offsets, TILEDB_UNORDERED);
362+
}
357363

358364
try (Array array = new Array(ctx, arrayURI, TILEDB_READ)) {
359365

0 commit comments

Comments
 (0)