alibaba · zhanglei1949 · May 29, 2024 · Jun 3, 2024 · Jun 3, 2024 · Jun 3, 2024
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,20 +1,18 @@
-
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
 // README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
 {
-	"name": "GraphScope",
+	"name": "GraphScope-Giraph",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
 	"image": "registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:latest",
-
 	// Features to add to the dev container. More info: https://containers.dev/features.
-    "features": {
-        "ghcr.io/devcontainers/features/common-utils:2":{
-            "installZsh": "true",
+	"features": {
+		"ghcr.io/devcontainers/features/common-utils:2": {
+			"installZsh": "true",
 			"configureZshAsDefaultShell": "true",
 			"installOhMyZsh": true,
-            "upgradePackages": "false"
-        }
-    },
+			"upgradePackages": "false"
+		}
+	},
 	// Configure tool-specific properties.
 	"customizations": {
 		// Configure properties specific to VS Code.
@@ -28,20 +26,15 @@
 			]
 		}
 	},
-
 	// Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "graphscope",
-
 	// Use 'postCreateCommand' to run commands before the container is created.
 	"initializeCommand": "sudo docker pull registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:latest",
-
 	// Uncomment this to enable C++ and Rust debugging in containers
 	// "capAdd": ["SYS_PTRACE"],
 	// "securityOpt": ["seccomp=unconfined"],
-
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [3000],
-
 	// Use 'portsAttributes' to set default properties for specific forwarded ports.
 	// More info: https://containers.dev/implementors/json_reference/#port-attributes
 	// "portsAttributes": {
@@ -50,23 +43,21 @@
 	// 		"onAutoForward": "notify"
 	// 	}
 	// },
-
 	// Use 'postCreateCommand' to run commands after the container is created.
 	// "postCreateCommand": "yarn install"
-
 	// Improve performance
-
 	// Uncomment these to mount a folder to a volume
 	// https://code.visualstudio.com/remote/advancedcontainers/improve-performance#_use-a-targeted-named-volume
-	// "mounts": [
-    // 	"source=${localWorkspaceFolderBasename}-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume"
-	// ],
+	"mounts": [
+		"source=/mnt/zhanglei/dev_mounts,target=/home/graphscope/dev_mounts,type=bind,consistency=cached"
+	],
+	"runArgs": [
+		"--network=host",
+	],
 	// "postCreateCommand": "sudo chown graphscope node_modules"
-
-
 	// Uncomment these to use a named volume for your entire source tree
 	// https://code.visualstudio.com/remote/advancedcontainers/improve-performance#_use-a-named-volume-for-your-entire-source-tree
 	// "workspaceMount": "source=gs,target=/workspaces,type=volume",
 	// "workspaceFolder": "/workspaces"
 	"postCreateCommand": "sudo chown -R graphscope /workspaces && bash pre-commit/install-hook.sh && bash pre-commit/prepare-commit-msg"
-}
+}
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.28.0
+0.27.0
diff --git a/analytical_engine/CMakeLists.txt b/analytical_engine/CMakeLists.txt
@@ -354,63 +354,63 @@ endif ()
 
 # An executable workaround for graphx pregel.
 if (ENABLE_JAVA_SDK)
-    add_executable(graphx_runner core/java/graphx_runner.cc core/java/javasdk.cc)
-    target_include_directories(graphx_runner PRIVATE core utils apps)
-    target_compile_definitions(graphx_runner PUBLIC ENABLE_JAVA_SDK)
-    target_link_libraries(graphx_runner PRIVATE ${CMAKE_DL_LIBS} gs_proto ${VINEYARD_LIBRARIES} ${Boost_LIBRARIES} ${GFLAGS_LIBRARIES} ${JNI_LIBRARIES})
-
-    if (${LIBUNWIND_FOUND})
-        target_link_libraries(graphx_runner PRIVATE ${LIBUNWIND_LIBRARIES})
-    endif()
+    # add_executable(graphx_runner core/java/graphx_runner.cc core/java/javasdk.cc)
+    # target_include_directories(graphx_runner PRIVATE core utils apps)
+    # target_compile_definitions(graphx_runner PUBLIC ENABLE_JAVA_SDK)
+    # target_link_libraries(graphx_runner PRIVATE ${CMAKE_DL_LIBS} gs_proto ${VINEYARD_LIBRARIES} ${Boost_LIBRARIES} ${GFLAGS_LIBRARIES} ${JNI_LIBRARIES})
+
+    # if (${LIBUNWIND_FOUND})
+    #     target_link_libraries(graphx_runner PRIVATE ${LIBUNWIND_LIBRARIES})
+    # endif()
 endif()
 
 
 # Test targets
 if (BUILD_TESTS)
-    add_executable(run_app test/run_app.cc core/object/dynamic.cc)
-    target_include_directories(run_app PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps utils apps)
-    target_link_libraries(run_app ${LIBGRAPELITE_LIBRARIES} ${GFLAGS_LIBRARIES} ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${VINEYARD_LIBRARIES})
-    target_link_libraries(run_app OpenMP::OpenMP_CXX)
+    # add_executable(run_app test/run_app.cc core/object/dynamic.cc)
+    # target_include_directories(run_app PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps utils apps)
+    # target_link_libraries(run_app ${LIBGRAPELITE_LIBRARIES} ${GFLAGS_LIBRARIES} ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${VINEYARD_LIBRARIES})
+    # target_link_libraries(run_app OpenMP::OpenMP_CXX)
 
     if (ENABLE_JAVA_SDK)
         add_executable(run_java_app test/run_java_app.cc core/java/javasdk.cc core/object/dynamic.cc)
         target_include_directories(run_java_app PRIVATE core utils apps)
         target_compile_definitions(run_java_app PUBLIC ENABLE_JAVA_SDK)
         target_link_libraries(run_java_app gs_proto ${GFLAGS_LIBRARIES} ${MPI_CXX_LIBRARIES} ${JNI_LIBRARIES} ${Boost_LIBRARIES}
-                                       ${CMAKE_DL_LIBS} ${GLOG_LIBRARIES} ${VINEYARD_LIBRARIES})
+                                       ${CMAKE_DL_LIBS} ${GLOG_LIBRARIES} ${VINEYARD_LIBRARIES} ${JAVA_JVM_LIBRARY})
 
-        # java app benchmark
-        add_executable(property_graph_java_app_benchmarks benchmarks/property_graph_java_app_benchmarks.cc core/java/javasdk.cc core/object/dynamic.cc)
-        target_include_directories(property_graph_java_app_benchmarks PRIVATE core utils apps)
-        target_compile_definitions(property_graph_java_app_benchmarks PUBLIC ENABLE_JAVA_SDK)
-        target_link_libraries(property_graph_java_app_benchmarks gs_proto ${JNI_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS}  ${VINEYARD_LIBRARIES})
+        # # java app benchmark
+        # add_executable(property_graph_java_app_benchmarks benchmarks/property_graph_java_app_benchmarks.cc core/java/javasdk.cc core/object/dynamic.cc)
+        # target_include_directories(property_graph_java_app_benchmarks PRIVATE core utils apps)
+        # target_compile_definitions(property_graph_java_app_benchmarks PUBLIC ENABLE_JAVA_SDK)
+        # target_link_libraries(property_graph_java_app_benchmarks gs_proto ${JNI_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS}  ${VINEYARD_LIBRARIES})
 
-        # giraph runner
+        # # giraph runner
         add_executable(giraph_runner test/giraph_runner.cc core/java/javasdk.cc)
         target_include_directories(giraph_runner PRIVATE core utils apps)
         target_compile_definitions(giraph_runner PUBLIC ENABLE_JAVA_SDK)
         target_link_libraries(giraph_runner ${CMAKE_DL_LIBS} gs_proto ${VINEYARD_LIBRARIES} ${Boost_LIBRARIES} ${GFLAGS_LIBRARIES}  ${JNI_LIBRARIES})
 
-        # graphx related test
-        add_executable(projected_fragment_mapper_test test/projected_fragment_mapper_test.cc)
-        target_include_directories(projected_fragment_mapper_test PRIVATE core utils apps)
-        target_link_libraries(projected_fragment_mapper_test ${CMAKE_DL_LIBS} ${VINEYARD_LIBRARIES} ${Boost_LIBRARIES} ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES})
+        # # graphx related test
+        # add_executable(projected_fragment_mapper_test test/projected_fragment_mapper_test.cc)
+        # target_include_directories(projected_fragment_mapper_test PRIVATE core utils apps)
+        # target_link_libraries(projected_fragment_mapper_test ${CMAKE_DL_LIBS} ${VINEYARD_LIBRARIES} ${Boost_LIBRARIES} ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES})
 
-        add_executable(graphx_loader_test test/graphx_loader_test.cc)
-        target_include_directories(graphx_loader_test PRIVATE core utils apps)
-        target_compile_definitions(graphx_loader_test PUBLIC ENABLE_JAVA_SDK)
-        target_link_libraries(graphx_loader_test ${CMAKE_DL_LIBS} ${VINEYARD_LIBRARIES} ${Boost_LIBRARIES} ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES})
+        # add_executable(graphx_loader_test test/graphx_loader_test.cc)
+        # target_include_directories(graphx_loader_test PRIVATE core utils apps)
+        # target_compile_definitions(graphx_loader_test PUBLIC ENABLE_JAVA_SDK)
+        # target_link_libraries(graphx_loader_test ${CMAKE_DL_LIBS} ${VINEYARD_LIBRARIES} ${Boost_LIBRARIES} ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES})
 
-        add_executable(run_java_string_app test/run_java_string_app.cc core/java/javasdk.cc)
-        target_include_directories(run_java_string_app PRIVATE core utils apps)
-        target_compile_definitions(run_java_string_app PUBLIC ENABLE_JAVA_SDK)
-        target_link_libraries(run_java_string_app ${CMAKE_DL_LIBS} ${VINEYARD_LIBRARIES} ${Boost_LIBRARIES} ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES} ${JNI_LIBRARIES})
+        # add_executable(run_java_string_app test/run_java_string_app.cc core/java/javasdk.cc)
+        # target_include_directories(run_java_string_app PRIVATE core utils apps)
+        # target_compile_definitions(run_java_string_app PUBLIC ENABLE_JAVA_SDK)
+        # target_link_libraries(run_java_string_app ${CMAKE_DL_LIBS} ${VINEYARD_LIBRARIES} ${Boost_LIBRARIES} ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES} ${JNI_LIBRARIES})
 
         if (${LIBUNWIND_FOUND})
             target_link_libraries(run_java_app ${LIBUNWIND_LIBRARIES})
-            target_link_libraries(property_graph_java_app_benchmarks ${LIBUNWIND_LIBRARIES})
+            # target_link_libraries(property_graph_java_app_benchmarks ${LIBUNWIND_LIBRARIES})
             target_link_libraries(giraph_runner ${LIBUNWIND_LIBRARIES})
-            target_link_libraries(projected_fragment_mapper_test ${LIBUNWIND_LIBRARIES})
+            # target_link_libraries(projected_fragment_mapper_test ${LIBUNWIND_LIBRARIES})
         endif ()
     endif()
 
@@ -428,43 +428,43 @@ if (BUILD_TESTS)
         target_link_libraries(${target} OpenMP::OpenMP_CXX)
     endmacro()
 
-    add_vineyard_app(run_vy_app SRCS test/run_vy_app.cc)
-    add_vineyard_app(run_vy_app_compact SRCS test/run_vy_app_compact.cc)
-    add_vineyard_app(run_vy_app_local_vm SRCS test/run_vy_app_local_vm.cc)
+    # add_vineyard_app(run_vy_app SRCS test/run_vy_app.cc)
+    # add_vineyard_app(run_vy_app_compact SRCS test/run_vy_app_compact.cc)
+    # add_vineyard_app(run_vy_app_local_vm SRCS test/run_vy_app_local_vm.cc)
 
-    add_vineyard_app(run_load_from_stream SRCS test/run_load_from_stream.cc)
+    # add_vineyard_app(run_load_from_stream SRCS test/run_load_from_stream.cc)
 
-    add_vineyard_app(run_vy_ldbc SRCS test/run_vy_ldbc.cc)
-    target_include_directories(run_vy_ldbc PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps)
+    # add_vineyard_app(run_vy_ldbc SRCS test/run_vy_ldbc.cc)
+    # target_include_directories(run_vy_ldbc PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps)
 
-    add_vineyard_app(run_ctx SRCS test/run_ctx.cc)
-    target_include_directories(run_ctx PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps)
-    target_link_libraries(run_ctx gs_proto)
+    # add_vineyard_app(run_ctx SRCS test/run_ctx.cc)
+    # target_include_directories(run_ctx PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps)
+    # target_link_libraries(run_ctx gs_proto)
 
-    add_vineyard_app(run_property_ctx SRCS test/run_property_ctx.cc)
-    target_include_directories(run_property_ctx PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps)
-    target_link_libraries(run_property_ctx gs_proto)
+    # add_vineyard_app(run_property_ctx SRCS test/run_property_ctx.cc)
+    # target_include_directories(run_property_ctx PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps)
+    # target_link_libraries(run_property_ctx gs_proto)
 
-    add_vineyard_app(run_pregel_app SRCS test/run_pregel_app.cc)
+    # add_vineyard_app(run_pregel_app SRCS test/run_pregel_app.cc)
 
-    add_vineyard_app(run_string_oid SRCS test/run_string_oid.cc)
-    target_include_directories(run_string_oid PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps)
+    # add_vineyard_app(run_string_oid SRCS test/run_string_oid.cc)
+    # target_include_directories(run_string_oid PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps)
 
-    add_vineyard_app(run_empty_property SRCS test/run_empty_property.cc)
-    target_include_directories(run_empty_property PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps)
+    # add_vineyard_app(run_empty_property SRCS test/run_empty_property.cc)
+    # target_include_directories(run_empty_property PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps)
 
-    add_vineyard_app(test_project_string SRCS test/test_project_string.cc)
+    # add_vineyard_app(test_project_string SRCS test/test_project_string.cc)
 
-    add_vineyard_app(basic_graph_benchmarks SRCS benchmarks/basic_graph_benchmarks.cc)
+    # add_vineyard_app(basic_graph_benchmarks SRCS benchmarks/basic_graph_benchmarks.cc)
 
-    add_vineyard_app(property_graph_loader SRCS benchmarks/property_graph_loader.cc)
+    # add_vineyard_app(property_graph_loader SRCS benchmarks/property_graph_loader.cc)
 
-    add_vineyard_app(property_graph_benchmarks SRCS benchmarks/property_graph_benchmarks.cc)
+    # add_vineyard_app(property_graph_benchmarks SRCS benchmarks/property_graph_benchmarks.cc)
 
-    add_vineyard_app(projected_graph_benchmarks SRCS benchmarks/projected_graph_benchmarks.cc)
+    # add_vineyard_app(projected_graph_benchmarks SRCS benchmarks/projected_graph_benchmarks.cc)
 
     if (NETWORKX)
-        add_vineyard_app(test_convert SRCS test/test_convert.cc)
+        # add_vineyard_app(test_convert SRCS test/test_convert.cc)
     endif ()
 endif ()
 
@@ -509,17 +509,17 @@ if(ENABLE_JAVA_SDK)
         set(GAE_JAVA_JNI_LIB "${GAE_JAVA_DIR}/grape-runtime/target/native/libgrape-jni.so")
     endif()
 
-    add_custom_command(
-        OUTPUT "${GAE_JAVA_RUNTIME_JAR}"
-        COMMAND mvn -Drevision=${GRAPHSCOPE_ANALYTICAL_JAR_VERSION} clean install -DskipTests --quiet
-        DEPENDS gs_proto
-        WORKING_DIRECTORY ${GAE_JAVA_DIR}
-        COMMENT "Building GAE-java..."
-        VERBATIM
-    )
-    add_custom_target(grape_jni ALL
-         DEPENDS "${GAE_JAVA_RUNTIME_JAR}"
-    )
+    # add_custom_command(
+    #     OUTPUT "${GAE_JAVA_RUNTIME_JAR}"
+    #     COMMAND mvn -Drevision=${GRAPHSCOPE_ANALYTICAL_JAR_VERSION} clean install -DskipTests --quiet
+    #     DEPENDS gs_proto
+    #     WORKING_DIRECTORY ${GAE_JAVA_DIR}
+    #     COMMENT "Building GAE-java..."
+    #     VERBATIM
+    # )
+    # add_custom_target(grape_jni ALL
+    #      DEPENDS "${GAE_JAVA_RUNTIME_JAR}"
+    # )
     install(FILES DESTINATION lib)
     install(FILES "${GAE_JAVA_RUNTIME_JAR}" DESTINATION lib)
     install(FILES "${GAE_JAVA_GRAPHX_JAR}" DESTINATION lib)
@@ -578,7 +578,7 @@ install_gsa_binary(gs_proto)
 install_gsa_binary(gs_util)
 
 if (ENABLE_JAVA_SDK)
-    install_gsa_binary(graphx_runner)
+    # install_gsa_binary(graphx_runner)
 endif()
 
 install_gsa_headers("${PROJECT_SOURCE_DIR}/apps")

diff --git a/analytical_engine/core/context/java_context_base.h b/analytical_engine/core/context/java_context_base.h
@@ -86,8 +86,29 @@ class JavaContextBase : public grape::ContextBase {
     }
     JNIEnvMark m;
     if (m.env()) {
-      m.env()->DeleteGlobalRef(url_class_loader_object_);
-      VLOG(1) << "Delete URL class loader";
+      // Delete the java objects
+      if (app_object_) {
+        m.env()->DeleteGlobalRef(app_object_);
+        VLOG(1) << "Delete app object";
+      }
+      if (context_object_) {
+        m.env()->DeleteGlobalRef(context_object_);
+        VLOG(1) << "Delete context object";
+      }
+      if (fragment_object_) {
+        m.env()->DeleteGlobalRef(fragment_object_);
+        VLOG(1) << "Delete fragment object";
+      }
+      if (mm_object_) {
+        m.env()->DeleteGlobalRef(mm_object_);
+        VLOG(1) << "Delete message manager object";
+      }
+      if (url_class_loader_object_) {
+        m.env()->DeleteGlobalRef(url_class_loader_object_);
+        VLOG(1) << "Delete url class loader object";
+      }
+      // Invoke a gc, since we have created a lot of objects.
+      InvokeGC(m.env());
     } else {
       LOG(ERROR) << "JNI env not available.";
     }

diff --git a/analytical_engine/core/java/java_loader_invoker.h b/analytical_engine/core/java/java_loader_invoker.h
@@ -137,14 +137,15 @@ boost::leaf::result<void> BuildArray(
   return {};
 }
 
-static constexpr const char* JAVA_LOADER_CLASS =
-    "com/alibaba/graphscope/loader/impl/FileLoader";
-static constexpr const char* JAVA_LOADER_CREATE_METHOD = "create";
+static constexpr const char* JAVA_LOADER_FACTORY_CLASS =
+    "com/alibaba/graphscope/loader/LoaderFactory";
+static constexpr const char* JAVA_BASE_LOADER_CLASS =
+    "com/alibaba/graphscope/loader/LoaderBase";
+static constexpr const char* JAVA_LOADER_CREATE_METHOD = "createLoader";
 static constexpr const char* JAVA_LOADER_CREATE_SIG =
-    "(Ljava/net/URLClassLoader;)Lcom/alibaba/graphscope/loader/impl/"
-    "FileLoader;";
-static constexpr const char* JAVA_LOADER_LOAD_VE_METHOD =
-    "loadVerticesAndEdges";
+    "(ILjava/net/"
+    "URLClassLoader;)Lcom/alibaba/graphscope/loader/LoaderBase;";
+static constexpr const char* JAVA_LOADER_LOAD_VE_METHOD = "loadVertices";
 static constexpr const char* JAVA_LOADER_LOAD_VE_SIG =
     "(Ljava/lang/String;Ljava/lang/String;)I";
 static constexpr const char* JAVA_LOADER_LOAD_E_METHOD = "loadEdges";
@@ -389,16 +390,19 @@ class JavaLoaderInvoker {
     gs::JNIEnvMark m;
     if (m.env()) {
       JNIEnv* env = m.env();
-      jclass loader_class =
-          LoadClassWithClassLoader(env, gs_class_loader_obj, JAVA_LOADER_CLASS);
-      CHECK_NOTNULL(loader_class);
+      jclass factory_class = LoadClassWithClassLoader(
+          env, gs_class_loader_obj, JAVA_LOADER_FACTORY_CLASS);
+      jclass base_loader_class = LoadClassWithClassLoader(
+          env, gs_class_loader_obj, JAVA_BASE_LOADER_CLASS);
+      CHECK_NOTNULL(factory_class);
+      CHECK_NOTNULL(base_loader_class);
       // construct java loader obj.
       jmethodID create_method = env->GetStaticMethodID(
-          loader_class, JAVA_LOADER_CREATE_METHOD, JAVA_LOADER_CREATE_SIG);
+          factory_class, JAVA_LOADER_CREATE_METHOD, JAVA_LOADER_CREATE_SIG);
       CHECK(create_method);
 
       java_loader_obj = env->NewGlobalRef(env->CallStaticObjectMethod(
-          loader_class, create_method, gs_class_loader_obj));
+          factory_class, create_method, worker_id_, gs_class_loader_obj));
 
       if (env->ExceptionCheck()) {
         env->ExceptionDescribe();
@@ -409,7 +413,7 @@ class JavaLoaderInvoker {
       CHECK(java_loader_obj);
 
       jmethodID loader_method = env->GetMethodID(
-          loader_class, JAVA_LOADER_INIT_METHOD, JAVA_LOADER_INIT_SIG);
+          base_loader_class, JAVA_LOADER_INIT_METHOD, JAVA_LOADER_INIT_SIG);
       CHECK_NOTNULL(loader_method);
 
       env->CallVoidMethod(java_loader_obj, loader_method, worker_id_,
@@ -524,8 +528,8 @@ class JavaLoaderInvoker {
     gs::JNIEnvMark m;
     if (m.env()) {
       JNIEnv* env = m.env();
-      jclass loader_class =
-          LoadClassWithClassLoader(env, gs_class_loader_obj, JAVA_LOADER_CLASS);
+      jclass loader_class = LoadClassWithClassLoader(env, gs_class_loader_obj,
+                                                     JAVA_BASE_LOADER_CLASS);
       CHECK_NOTNULL(loader_class);
 
       jmethodID loader_method = env->GetMethodID(
@@ -560,8 +564,8 @@ class JavaLoaderInvoker {
     gs::JNIEnvMark m;
     if (m.env()) {
       JNIEnv* env = m.env();
-      jclass loader_class =
-          LoadClassWithClassLoader(env, gs_class_loader_obj, JAVA_LOADER_CLASS);
+      jclass loader_class = LoadClassWithClassLoader(env, gs_class_loader_obj,
+                                                     JAVA_BASE_LOADER_CLASS);
       CHECK_NOTNULL(loader_class);
 
       jmethodID loader_method = env->GetMethodID(