You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by pc...@apache.org on 2019/01/24 06:08:05 UTC
[arrow] branch master updated: ARROW-4236: [java] Distinct plasma
client create exceptions
This is an automated email from the ASF dual-hosted git repository.
pcmoritz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 3405cd4 ARROW-4236: [java] Distinct plasma client create exceptions
3405cd4 is described below
commit 3405cd43477f6724c3784cf97237862ec09409e0
Author: yl187661 <yl...@antfin.com>
AuthorDate: Wed Jan 23 22:07:49 2019 -0800
ARROW-4236: [java] Distinct plasma client create exceptions
when ray puts an object in plasma store, there are 2 exceptions may be thrown, one is "An object with this ID already exists in the plasma store" and the other is "The plasma store ran out of memory and could not create this object", distinct them rather than let them both be the same java class
@raulchen please help review
Author: yl187661 <yl...@antfin.com>
Author: lynn <yu...@ali-187661.local>
Closes #3306 from bibabolynn/dev_plasmaClientException and squashes the following commits:
3e512b63c <yl187661> add assert
88e1702ba <yl187661> cpp lint
5586036ac <yl187661> cpp lint
c4fe54fd3 <yl187661> cpp lint
10ff110f4 <yl187661> plasmaClientTest catch duplicate object exception
acc7c0669 <yl187661> indentation
5699eff38 <yl187661> blank line
4710d5940 <yl187661> fix
f3d12a6e5 <lynn> distinct plasma client create exception
---
.../org_apache_arrow_plasma_PlasmaClientJNI.cc | 12 ++++-----
.../org/apache/arrow/plasma/ObjectStoreLink.java | 6 ++++-
.../java/org/apache/arrow/plasma/PlasmaClient.java | 18 ++++----------
.../org/apache/arrow/plasma/PlasmaClientJNI.java | 6 ++++-
.../exceptions/DuplicateObjectException.java | 29 ++++++++++++++++++++++
.../exceptions/PlasmaOutOfMemoryException.java | 29 ++++++++++++++++++++++
.../org/apache/arrow/plasma/PlasmaClientTest.java | 11 ++++++--
7 files changed, 88 insertions(+), 23 deletions(-)
diff --git a/cpp/src/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc b/cpp/src/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc
index d552994..1988742 100644
--- a/cpp/src/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc
+++ b/cpp/src/plasma/lib/java/org_apache_arrow_plasma_PlasmaClientJNI.cc
@@ -104,15 +104,15 @@ JNIEXPORT jobject JNICALL Java_org_apache_arrow_plasma_PlasmaClientJNI_create(
std::shared_ptr<Buffer> data;
Status s = client->Create(oid, size, md, md_size, &data);
if (s.IsPlasmaObjectExists()) {
- jclass Exception = env->FindClass("java/lang/Exception");
- env->ThrowNew(Exception,
- "An object with this ID already exists in the plasma store.");
+ jclass exceptionClass =
+ env->FindClass("org/apache/arrow/plasma/exceptions/DuplicateObjectException");
+ env->ThrowNew(exceptionClass, oid.hex().c_str());
return nullptr;
}
if (s.IsPlasmaStoreFull()) {
- jclass Exception = env->FindClass("java/lang/Exception");
- env->ThrowNew(Exception,
- "The plasma store ran out of memory and could not create this object.");
+ jclass exceptionClass =
+ env->FindClass("org/apache/arrow/plasma/exceptions/PlasmaOutOfMemoryException");
+ env->ThrowNew(exceptionClass, "");
return nullptr;
}
ARROW_CHECK(s.ok());
diff --git a/java/plasma/src/main/java/org/apache/arrow/plasma/ObjectStoreLink.java b/java/plasma/src/main/java/org/apache/arrow/plasma/ObjectStoreLink.java
index 8d6eec0..f933c85 100644
--- a/java/plasma/src/main/java/org/apache/arrow/plasma/ObjectStoreLink.java
+++ b/java/plasma/src/main/java/org/apache/arrow/plasma/ObjectStoreLink.java
@@ -19,6 +19,9 @@ package org.apache.arrow.plasma;
import java.util.List;
+import org.apache.arrow.plasma.exceptions.DuplicateObjectException;
+import org.apache.arrow.plasma.exceptions.PlasmaOutOfMemoryException;
+
/**
* Object store interface, which provides the capabilities to put and get raw byte array, and serves.
*/
@@ -42,7 +45,8 @@ public interface ObjectStoreLink {
* @param value The value to put in the object store.
* @param metadata encodes whatever metadata the user wishes to encode.
*/
- void put(byte[] objectId, byte[] value, byte[] metadata);
+ void put(byte[] objectId, byte[] value, byte[] metadata)
+ throws DuplicateObjectException, PlasmaOutOfMemoryException;
/**
* Get a buffer from the PlasmaStore based on the <tt>objectId</tt>.
diff --git a/java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClient.java b/java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClient.java
index d69b54d..a708f41 100644
--- a/java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClient.java
+++ b/java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClient.java
@@ -19,9 +19,10 @@ package org.apache.arrow.plasma;
import java.nio.ByteBuffer;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
+import org.apache.arrow.plasma.exceptions.DuplicateObjectException;
+import org.apache.arrow.plasma.exceptions.PlasmaOutOfMemoryException;
/**
* The PlasmaClient is used to interface with a plasma store and manager.
@@ -45,18 +46,9 @@ public class PlasmaClient implements ObjectStoreLink {
// interface methods --------------------
@Override
- public void put(byte[] objectId, byte[] value, byte[] metadata) {
- ByteBuffer buf = null;
- try {
- buf = PlasmaClientJNI.create(conn, objectId, value.length, metadata);
- } catch (Exception e) {
- System.err.println("ObjectId " + objectId + " error at PlasmaClient put");
- e.printStackTrace();
- }
- if (buf == null) {
- return;
- }
-
+ public void put(byte[] objectId, byte[] value, byte[] metadata)
+ throws DuplicateObjectException, PlasmaOutOfMemoryException {
+ ByteBuffer buf = PlasmaClientJNI.create(conn, objectId, value.length, metadata);
buf.put(value);
PlasmaClientJNI.seal(conn, objectId);
PlasmaClientJNI.release(conn, objectId);
diff --git a/java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClientJNI.java b/java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClientJNI.java
index 4f7598e..7f8cf82 100644
--- a/java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClientJNI.java
+++ b/java/plasma/src/main/java/org/apache/arrow/plasma/PlasmaClientJNI.java
@@ -19,6 +19,9 @@ package org.apache.arrow.plasma;
import java.nio.ByteBuffer;
+import org.apache.arrow.plasma.exceptions.DuplicateObjectException;
+import org.apache.arrow.plasma.exceptions.PlasmaOutOfMemoryException;
+
/**
* JNI static methods for PlasmaClient.
*/
@@ -28,7 +31,8 @@ public class PlasmaClientJNI {
public static native void disconnect(long conn);
- public static native ByteBuffer create(long conn, byte[] objectId, int size, byte[] metadata);
+ public static native ByteBuffer create(long conn, byte[] objectId, int size, byte[] metadata)
+ throws DuplicateObjectException, PlasmaOutOfMemoryException;
public static native byte[] hash(long conn, byte[] objectId);
diff --git a/java/plasma/src/main/java/org/apache/arrow/plasma/exceptions/DuplicateObjectException.java b/java/plasma/src/main/java/org/apache/arrow/plasma/exceptions/DuplicateObjectException.java
new file mode 100644
index 0000000..464d54d
--- /dev/null
+++ b/java/plasma/src/main/java/org/apache/arrow/plasma/exceptions/DuplicateObjectException.java
@@ -0,0 +1,29 @@
+/*
+ * 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.plasma.exceptions;
+
+public class DuplicateObjectException extends RuntimeException {
+
+ public DuplicateObjectException(String objectId) {
+ super("An object with ID " + objectId + " already exists in the plasma store.");
+ }
+
+ public DuplicateObjectException(String objectId, Throwable t) {
+ super("An object with ID " + objectId + " already exists in the plasma store.", t);
+ }
+}
diff --git a/java/plasma/src/main/java/org/apache/arrow/plasma/exceptions/PlasmaOutOfMemoryException.java b/java/plasma/src/main/java/org/apache/arrow/plasma/exceptions/PlasmaOutOfMemoryException.java
new file mode 100644
index 0000000..831a4ca
--- /dev/null
+++ b/java/plasma/src/main/java/org/apache/arrow/plasma/exceptions/PlasmaOutOfMemoryException.java
@@ -0,0 +1,29 @@
+/*
+ * 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.plasma.exceptions;
+
+public class PlasmaOutOfMemoryException extends RuntimeException {
+
+ public PlasmaOutOfMemoryException() {
+ super("The plasma store ran out of memory.");
+ }
+
+ public PlasmaOutOfMemoryException(Throwable t) {
+ super("The plasma store ran out of memory.", t);
+ }
+}
diff --git a/java/plasma/src/test/java/org/apache/arrow/plasma/PlasmaClientTest.java b/java/plasma/src/test/java/org/apache/arrow/plasma/PlasmaClientTest.java
index 70e277a..3f326d3 100644
--- a/java/plasma/src/test/java/org/apache/arrow/plasma/PlasmaClientTest.java
+++ b/java/plasma/src/test/java/org/apache/arrow/plasma/PlasmaClientTest.java
@@ -23,6 +23,9 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+import org.apache.arrow.plasma.exceptions.DuplicateObjectException;
+import org.junit.Assert;
+
public class PlasmaClientTest {
private String storeSuffix = "/tmp/store";
@@ -142,8 +145,12 @@ public class PlasmaClientTest {
assert Arrays.equals(values.get(0), value1);
assert Arrays.equals(values.get(1), value2);
System.out.println("Plasma java client get multi-object test success.");
- pLink.put(id1, value1, null);
- System.out.println("Plasma java client put same object twice exception test success.");
+ try {
+ pLink.put(id1, value1, null);
+ Assert.fail("Fail to throw DuplicateObjectException when put an object into plasma store twice.");
+ } catch (DuplicateObjectException e) {
+ System.out.println("Plasma java client put same object twice exception test success.");
+ }
byte[] id1Hash = pLink.hash(id1);
assert id1Hash != null;
System.out.println("Plasma java client hash test success.");