Merge pull request #331 from CorvusYe/master

feat: supporting SessionPool calls for direct data query.
nebula-contrib · Dec 17, 2024 · e7330eb · e7330eb
2 parents 5074616 + 05f2ffb
commit e7330eb
Showing 1 changed file with 5 additions and 36 deletions.
diff --git a/src/main/java/org/nebula/contrib/ngbatis/base/GraphBaseExt.java b/src/main/java/org/nebula/contrib/ngbatis/base/GraphBaseExt.java
@@ -4,21 +4,16 @@
 import static org.nebula.contrib.ngbatis.utils.ReflectUtil.getValue;
 
 import com.vesoft.nebula.client.graph.data.ResultSet;
-import com.vesoft.nebula.client.graph.exception.BindSpaceFailedException;
-import com.vesoft.nebula.client.graph.exception.IOErrorException;
-import com.vesoft.nebula.client.graph.net.Session;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 import org.nebula.contrib.ngbatis.ArgsResolver;
 import org.nebula.contrib.ngbatis.Env;
 import org.nebula.contrib.ngbatis.ResultResolver;
 import org.nebula.contrib.ngbatis.SessionDispatcher;
 import org.nebula.contrib.ngbatis.annotations.base.EdgeType;
 import org.nebula.contrib.ngbatis.annotations.base.GraphId;
 import org.nebula.contrib.ngbatis.annotations.base.Tag;
-import org.nebula.contrib.ngbatis.session.LocalSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,12 +29,9 @@ public class GraphBaseExt {
 
   public static ResultSet executeGql(String textTpl,
           Map<String, Object> m1, Map<String, Object> m2) {
-    Session session = null;
-    LocalSession localSession = null;
     ResultSet result = null;
     //从env中获取本地会话调度器
     SessionDispatcher dispatcher = ENV.getDispatcher();
-    localSession = dispatcher.poll();
     //从env中获取space
     String currentSpace = ENV.getSpace();
 
@@ -49,20 +41,17 @@ public static ResultSet executeGql(String textTpl,
 
     Map<String, Object> parasForDb = argsResolver.resolve(m2);
 
-    String[] qlAndSpace = null;
+    Map<String, Object> extraReturn = new HashMap<>();
     try {
-      //确保当前图空间正确
-      qlAndSpace = qlWithSpace(localSession, gql, currentSpace);
-      gql = qlAndSpace[1];
-      session = localSession.getSession();
-      result = session.executeWithParameter(gql, parasForDb);
+      result = dispatcher.executeWithParameter(gql, parasForDb, currentSpace, extraReturn);
     } catch (Exception e) {
       throw new RuntimeException(e);
     } finally {
-      log.debug("\n\t- nGql：{}"
+      log.debug("\n\t- space: {}" 
+                      + "\n\t- nGql：{}"
                       + "\n\t- params: {}"
                       + "\n\t- result：{}",
-              gql, m2, result);
+        currentSpace, gql, m2, result);
     }
     return result;
   }
@@ -80,26 +69,6 @@ public static Object handleResult(ResultSet resultSet, Class returnType, Class r
     return resolve;
   }
 
-  private static String[] qlWithSpace(LocalSession localSession, String gql, String currentSpace)
-          throws IOErrorException, BindSpaceFailedException {
-    String[] qlAndSpace = new String[2];
-    gql = gql.trim();
-    String sessionSpace = localSession.getCurrentSpace();
-    boolean sameSpace = Objects.equals(sessionSpace, currentSpace);
-    if (!sameSpace && currentSpace != null) {
-      qlAndSpace[0] = currentSpace;
-      Session session = localSession.getSession();
-      ResultSet execute = session.execute(String.format("USE `%s`", currentSpace));
-      if (!execute.isSucceeded()) {
-        throw new BindSpaceFailedException(
-                String.format(" %s \"%s\"", execute.getErrorMessage(), currentSpace)
-        );
-      }
-    }
-    qlAndSpace[1] = String.format("\n\t\t%s", gql);
-    return qlAndSpace;
-  }
-
   /**
    * 得到某个边实体的type
    * @param edgeClass 实体类