[fix]byte buffer refer error (#31631)

Fix and reopen java tests closed in #31375 Co-authored-by: Marcus Zhang <zxl265370@antgroup.com>
ray-project · Jan 12, 2023 · c86f2f8 · c86f2f8
1 parent ee07818
commit c86f2f8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/java/runtime/src/main/java/io/ray/runtime/context/NativeWorkerContext.java b/java/runtime/src/main/java/io/ray/runtime/context/NativeWorkerContext.java
@@ -22,7 +22,7 @@ public UniqueId getCurrentWorkerId() {
 
   @Override
   public JobId getCurrentJobId() {
-    return JobId.fromByteBuffer(nativeGetCurrentJobId());
+    return JobId.fromBytes(nativeGetCurrentJobId());
   }
 
   @Override
@@ -62,7 +62,7 @@ public RuntimeEnv getCurrentRuntimeEnv() {
 
   private static native ByteBuffer nativeGetCurrentTaskId();
 
-  private static native ByteBuffer nativeGetCurrentJobId();
+  private static native byte[] nativeGetCurrentJobId();
 
   private static native ByteBuffer nativeGetCurrentWorkerId();
 

diff --git a/java/test/src/main/java/io/ray/test/RayJavaLoggingTest.java b/java/test/src/main/java/io/ray/test/RayJavaLoggingTest.java
@@ -29,8 +29,6 @@ public boolean log() {
     }
   }
 
-  // TODO(MisterLin1995 ): Fix JobConfig related Java test.
-  @Test(enabled = false)
   public void testJavaLoggingRotate() {
     ActorHandle<HeavyLoggingActor> loggingActor =
         Ray.actor(HeavyLoggingActor::new)

diff --git a/java/test/src/main/java/io/ray/test/RuntimeContextTest.java b/java/test/src/main/java/io/ray/test/RuntimeContextTest.java
@@ -32,8 +32,6 @@ public void setUp() {
     System.setProperty("ray.job.id", JOB_ID.toString());
   }
 
-  // TODO(MisterLin1995 ): Fix JobConfig related Java test.
-  @Test(enabled = false)
   public void testRuntimeContextInDriver() {
     Assert.assertEquals(JOB_ID, Ray.getRuntimeContext().getCurrentJobId());
     Assert.assertNotEquals(Ray.getRuntimeContext().getCurrentTaskId(), TaskId.NIL);
@@ -60,8 +58,6 @@ public String testRuntimeContext(ActorId actorId) {
     }
   }
 
-  // TODO(MisterLin1995 ): Fix JobConfig related Java test.
-  @Test(enabled = false)
   public void testRuntimeContextInActor() {
     ActorHandle<RuntimeContextTester> actor = Ray.actor(RuntimeContextTester::new).remote();
     Assert.assertEquals(

diff --git a/src/ray/core_worker/lib/java/io_ray_runtime_context_NativeWorkerContext.cc b/src/ray/core_worker/lib/java/io_ray_runtime_context_NativeWorkerContext.cc
@@ -41,12 +41,12 @@ Java_io_ray_runtime_context_NativeWorkerContext_nativeGetCurrentTaskId(JNIEnv *e
   return IdToJavaByteBuffer<TaskID>(env, task_id);
 }
 
-JNIEXPORT jobject JNICALL
+JNIEXPORT jbyteArray JNICALL
 Java_io_ray_runtime_context_NativeWorkerContext_nativeGetCurrentJobId(JNIEnv *env,
                                                                       jclass) {
   const auto job_id =
       CoreWorkerProcess::GetCoreWorker().GetWorkerContext().GetCurrentJobID();
-  return IdToJavaByteBuffer<JobID>(env, job_id);
+  return IdToJavaByteArray<JobID>(env, job_id);
 }
 
 JNIEXPORT jobject JNICALL

diff --git a/src/ray/core_worker/lib/java/io_ray_runtime_context_NativeWorkerContext.h b/src/ray/core_worker/lib/java/io_ray_runtime_context_NativeWorkerContext.h
@@ -41,9 +41,9 @@ Java_io_ray_runtime_context_NativeWorkerContext_nativeGetCurrentTaskId(JNIEnv *,
 /*
  * Class:     io_ray_runtime_context_NativeWorkerContext
  * Method:    nativeGetCurrentJobId
- * Signature: ()Ljava/nio/ByteBuffer;
+ * Signature: ()[B
  */
-JNIEXPORT jobject JNICALL
+JNIEXPORT jbyteArray JNICALL
 Java_io_ray_runtime_context_NativeWorkerContext_nativeGetCurrentJobId(JNIEnv *, jclass);
 
 /*