Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
3 changes: 2 additions & 1 deletion c/src/main/cpp/jni_wrapper.cc
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,9 @@ void TryCopyLastError(JNIEnv* env, InnerPrivateData* private_data) {
return;
}

jsize error_bytes_len = env->GetArrayLength(arr);
char* error_str = reinterpret_cast<char*>(error_bytes);
private_data->last_error_ = std::string(error_str, std::strlen(error_str));
private_data->last_error_ = std::string(error_str, error_bytes_len);

env->ReleaseByteArrayElements(arr, error_bytes, JNI_ABORT);
}
Expand Down
172 changes: 172 additions & 0 deletions c/src/test/java/org/apache/arrow/c/ExceptionTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
/*
* 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.arrow.c;

import static org.assertj.core.api.Assertions.assertThat;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.VectorLoader;
import org.apache.arrow.vector.VectorSchemaRoot;
import org.apache.arrow.vector.VectorUnloader;
import org.apache.arrow.vector.dictionary.Dictionary;
import org.apache.arrow.vector.dictionary.DictionaryProvider;
import org.apache.arrow.vector.ipc.ArrowReader;
import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.Schema;
import org.junit.jupiter.api.Test;

final class ExceptionTest {
@Test
public void testException() throws IOException {
Comment thread
lidavidm marked this conversation as resolved.
final Schema schema =
new Schema(Collections.singletonList(Field.nullable("ints", new ArrowType.Int(32, true))));
final List<Object> batches = new ArrayList<>();

try (BufferAllocator allocator = new RootAllocator();
VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
final IntVector ints = (IntVector) root.getVector(0);
VectorUnloader unloader = new VectorUnloader(root);

root.allocateNew();
ints.setSafe(0, 1);
ints.setSafe(1, 2);
ints.setSafe(2, 4);
ints.setSafe(3, 8);
root.setRowCount(4);
batches.add(unloader.getRecordBatch());

final String exceptionMessage = "java.lang.RuntimeException: Error occurred while getting next schema root.\n\tat org.apache.arrow.adapter.jdbc.ArrowVectorIterator.next(ArrowVectorIterator.java:205)\n\tat com.oceanbase.external.jdbc.JdbcScanner.loadNextBatch(JdbcScanner.java:73)\n\tat org.apache.arrow.c.ArrayStreamExporter$ExportedArrayStreamPrivateData.getNext(ArrayStreamExporter.java:72)\nCaused by: java.lang.RuntimeException: Error occurred while consuming data.\n\tat org.apache.arrow.adapter.jdbc.ArrowVectorIterator.consumeData(ArrowVectorIterator.java:127)\n\tat org.apache.arrow.adapter.jdbc.ArrowVectorIterator.load(ArrowVectorIterator.java:178)\n\tat org.apache.arrow.adapter.jdbc.ArrowVectorIterator.next(ArrowVectorIterator.java:198)\n\t... 2 more\nCaused by: java.lang.OutOfMemoryError: Java heap space\n";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Um, this is a little excessive. Can we just use a short canary string?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

fixed


RuntimeException ex = new RuntimeException(exceptionMessage);
batches.add(ex);

ArrowReader source = new ExceptionMemoryArrowReader(allocator, schema, batches);

try (final ArrowArrayStream stream = ArrowArrayStream.allocateNew(allocator);
final VectorSchemaRoot importRoot = VectorSchemaRoot.create(schema, allocator)) {
final VectorLoader loader = new VectorLoader(importRoot);
Data.exportArrayStream(allocator, source, stream);

try (final ArrowReader reader = Data.importArrayStream(allocator, stream)) {
assertThat(reader.getVectorSchemaRoot().getSchema()).isEqualTo(schema);

for (Object batch : batches) {
try {
reader.loadNextBatch();
} catch (Exception e) {
Throwable exToCheck = e;
while (exToCheck != null && !(exToCheck instanceof RuntimeException)) {
exToCheck = exToCheck.getCause();
}
if (exToCheck != null) {
assertThat(exToCheck.getMessage()).isEqualTo(exceptionMessage);
}
continue;
}
loader.load((ArrowRecordBatch) batch);

assertThat(reader.getVectorSchemaRoot().getRowCount()).isEqualTo(root.getRowCount());
}
}
}
}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We need to assert that we did indeed get an exception.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

DONE

}

static class ExceptionMemoryArrowReader extends ArrowReader {
private final Schema schema;
private final List<Object> batches; // set ArrowRecordBatch or Exception
private final DictionaryProvider provider;
private int nextBatch;

ExceptionMemoryArrowReader(
BufferAllocator allocator,
Schema schema,
List<Object> batches) {
super(allocator);
this.schema = schema;
this.batches = batches;
this.provider = new CDataDictionaryProvider();
this.nextBatch = 0;
}

@Override
public Dictionary lookup(long id) {
return provider.lookup(id);
}

@Override
public Set<Long> getDictionaryIds() {
return provider.getDictionaryIds();
}

@Override
public Map<Long, Dictionary> getDictionaryVectors() {
return getDictionaryIds().stream()
.collect(Collectors.toMap(Function.identity(), this::lookup));
}

@Override
public boolean loadNextBatch() throws IOException {
if (nextBatch < batches.size()) {
Object object = batches.get(nextBatch++);
if (object instanceof RuntimeException) {
throw (RuntimeException) object;
}
VectorLoader loader = new VectorLoader(getVectorSchemaRoot());
loader.load((ArrowRecordBatch) object);
return true;
}
return false;
}

@Override
public long bytesRead() {
return 0;
}

@Override
protected void closeReadSource() throws IOException {
try {
for (Object object : batches) {
if (object instanceof ArrowRecordBatch) {
ArrowRecordBatch batch = (ArrowRecordBatch) object;
batch.close();
}
}
} catch (Exception e) {
throw new IOException(e);
}
}

@Override
protected Schema readSchema() {
return schema;
}
}
}
Loading