diff --git a/ngbatis-demo/src/main/resources/application.yml b/ngbatis-demo/src/main/resources/application.yml index c2c2f2d9..5278acdc 100644 --- a/ngbatis-demo/src/main/resources/application.yml +++ b/ngbatis-demo/src/main/resources/application.yml @@ -11,10 +11,10 @@ nebula: check-fixed-rate: 300000 # space name needs to be informed through annotations(@Space) or xml(space="test") # default false(false: Session pool map will not be initialized) - use-session-pool: false - hosts: 127.0.0.1:19669 + use-session-pool: true + hosts: 139.9.187.207:9669 username: root - password: bmVidWxh + password: U3RhclNoYWRvd18wOTE5 space: test pool-config: min-conns-size: 0 @@ -22,11 +22,11 @@ nebula: timeout: 6000 idle-time: 0 interval-idle: -1 - wait-time: 6000 + wait-time: 0 min-cluster-health-rate: 1.0 enable-ssl: false # 开启 nGQL 输出 -#logging: -# level: -# org.nebula.contrib: DEBUG \ No newline at end of file +logging: + level: + org.nebula.contrib: DEBUG \ No newline at end of file diff --git a/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/NgbatisDemoApplicationTests.java b/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/NgbatisDemoApplicationTests.java index 850c5ebe..4e00d47b 100644 --- a/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/NgbatisDemoApplicationTests.java +++ b/ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/NgbatisDemoApplicationTests.java @@ -245,7 +245,7 @@ public void spaceFromParam() { try { repository.spaceFromParam(spaceName); } catch (Exception e) { - Assert.isTrue(e instanceof QueryException && e.getMessage().contains("SpaceNotFound")); + assertSpaceFailed(e); } } @@ -258,10 +258,17 @@ public void dynamicSpaceWithPage() { page.setPageNo(1); repository.dynamicSpaceWithPage(page, spaceName); } catch (Exception e) { - System.out.println(e.getMessage()); - Assert.isTrue(e instanceof QueryException && e.getMessage().contains("SpaceNotFound")); + assertSpaceFailed(e); } } + + void assertSpaceFailed(Exception e) { + e.printStackTrace(); + String message = e.getMessage(); + Assert.isTrue(e instanceof QueryException && + (message.contains("SpaceNotFound") || (message.contains("create session failed."))) + ); + } @Test public void insertWithTimestamp() { diff --git a/src/main/java/org/nebula/contrib/ngbatis/Env.java b/src/main/java/org/nebula/contrib/ngbatis/Env.java index 09a37e2b..beaff488 100644 --- a/src/main/java/org/nebula/contrib/ngbatis/Env.java +++ b/src/main/java/org/nebula/contrib/ngbatis/Env.java @@ -102,7 +102,12 @@ public SessionDispatcher getDispatcher() { * @return SessionPool */ public SessionPool getSessionPool(String spaceName) { - return mapperContext.getNebulaSessionPoolMap().get(spaceName); + SessionPool sessionPool = mapperContext.getNebulaSessionPoolMap().get(spaceName); + if (sessionPool == null) { + sessionPool = dispatcher.initSessionPool(spaceName); + mapperContext.getNebulaSessionPoolMap().put(spaceName, sessionPool); + } + return sessionPool; } /** diff --git a/src/main/java/org/nebula/contrib/ngbatis/NgbatisBeanFactoryPostProcessor.java b/src/main/java/org/nebula/contrib/ngbatis/NgbatisBeanFactoryPostProcessor.java index 32d1a735..9d37de0f 100644 --- a/src/main/java/org/nebula/contrib/ngbatis/NgbatisBeanFactoryPostProcessor.java +++ b/src/main/java/org/nebula/contrib/ngbatis/NgbatisBeanFactoryPostProcessor.java @@ -5,16 +5,13 @@ import static org.nebula.contrib.ngbatis.proxy.NebulaDaoBasicExt.entityTypeAndIdType; import static org.nebula.contrib.ngbatis.proxy.NebulaDaoBasicExt.vertexName; -import com.vesoft.nebula.client.graph.NebulaPoolConfig; import com.vesoft.nebula.client.graph.SessionPool; -import com.vesoft.nebula.client.graph.SessionPoolConfig; import com.vesoft.nebula.client.graph.net.NebulaPool; import java.net.UnknownHostException; import java.util.Collection; import java.util.Map; import javax.annotation.Resource; import org.nebula.contrib.ngbatis.config.NebulaJdbcProperties; -import org.nebula.contrib.ngbatis.config.NgbatisConfig; import org.nebula.contrib.ngbatis.config.ParseCfgProps; import org.nebula.contrib.ngbatis.io.DaoResourceLoader; import org.nebula.contrib.ngbatis.models.ClassModel; @@ -86,8 +83,6 @@ public MapperContext mapperContext(NebulaPool nebulaPool) { context.setNebulaPoolConfig(nebulaJdbcProperties.getPoolConfig()); figureTagTypeMapping(interfaces.values(), context.getTagTypeMapping()); - setNebulaSessionPool(context); - registerBean(context); return context; } @@ -201,22 +196,12 @@ public NebulaPool nebulaPool() { /** * create and init Nebula SessionPool */ - public void setNebulaSessionPool(MapperContext context) { - NgbatisConfig ngbatisConfig = nebulaJdbcProperties.getNgbatis(); - if (ngbatisConfig.getUseSessionPool() == null || !ngbatisConfig.getUseSessionPool()) { - return; - } - - context.getSpaceNameSet().add(nebulaJdbcProperties.getSpace()); - Map nebulaSessionPoolMap = context.getNebulaSessionPoolMap(); - for (String spaceName : context.getSpaceNameSet()) { - SessionPool sessionPool = initSessionPool(spaceName); - if (sessionPool == null) { - log.error("{} session pool init failed.", spaceName); - continue; - } - nebulaSessionPoolMap.put(spaceName, sessionPool); - } + @Deprecated + public void setNebulaSessionPool(MapperContext context) throws Exception { + throw new Exception( + "Deprecated method, " + + "please use IntervalCheckSessionDispatcher.setNebulaSessionPool() instead." + ); } /** @@ -224,40 +209,12 @@ public void setNebulaSessionPool(MapperContext context) { * @param spaceName nebula space name * @return inited SessionPool */ - public SessionPool initSessionPool(String spaceName) { - final NgbatisConfig ngbatisConfig = nebulaJdbcProperties.getNgbatis(); - NebulaPoolConfig poolConfig = nebulaJdbcProperties.getPoolConfig(); - - SessionPoolConfig sessionPoolConfig = new SessionPoolConfig( - nebulaJdbcProperties.getHostAddresses(), - spaceName, - nebulaJdbcProperties.getUsername(), - nebulaJdbcProperties.getPassword() - ).setUseHttp2(poolConfig.isUseHttp2()) - .setEnableSsl(poolConfig.isEnableSsl()) - .setSslParam(poolConfig.getSslParam()) - .setCustomHeaders(poolConfig.getCustomHeaders()) - .setWaitTime(poolConfig.getWaitTime()) - .setTimeout(poolConfig.getTimeout()); - - if (poolConfig.getMinConnSize() <= 0) { - sessionPoolConfig.setMinSessionSize(1); - } else { - sessionPoolConfig.setMinSessionSize(poolConfig.getMinConnSize()); - } - sessionPoolConfig.setMaxSessionSize(poolConfig.getMaxConnSize()); - sessionPoolConfig.setTimeout(poolConfig.getTimeout()); - sessionPoolConfig.setWaitTime(poolConfig.getWaitTime()); - if (null != ngbatisConfig.getSessionLifeLength()) { - int cleanTime = (int) (ngbatisConfig.getSessionLifeLength() / 1000); - sessionPoolConfig.setCleanTime(cleanTime); - } - if (null != ngbatisConfig.getCheckFixedRate()) { - int healthCheckTime = (int) (ngbatisConfig.getCheckFixedRate() / 1000); - sessionPoolConfig.setHealthCheckTime(healthCheckTime); - } - - return new SessionPool(sessionPoolConfig); + @Deprecated + public SessionPool initSessionPool(String spaceName) throws Exception { + throw new Exception( + "Deprecated method, " + + "please use SessionDispatcher.initSessionPool() instead." + ); } @Override diff --git a/src/main/java/org/nebula/contrib/ngbatis/SessionDispatcher.java b/src/main/java/org/nebula/contrib/ngbatis/SessionDispatcher.java index 71cc8454..fab8a615 100644 --- a/src/main/java/org/nebula/contrib/ngbatis/SessionDispatcher.java +++ b/src/main/java/org/nebula/contrib/ngbatis/SessionDispatcher.java @@ -6,6 +6,9 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank; +import com.vesoft.nebula.client.graph.SessionPool; +import com.vesoft.nebula.client.graph.data.ResultSet; +import java.util.Map; import org.nebula.contrib.ngbatis.config.NgbatisConfig; import org.nebula.contrib.ngbatis.models.MapperContext; import org.nebula.contrib.ngbatis.session.LocalSession; @@ -68,4 +71,25 @@ static boolean useSessionPool() { NgbatisConfig ngbatisConfig = MapperContext.newInstance().getNgbatisConfig(); return ngbatisConfig != null && ngbatisConfig.getUseSessionPool(); } + + /** + * 按 spaceName 初始化 sessionPool + * + * @param spaceName 可以是启动时不存在的空间名 + * @return 初始化后的 sessionPool + */ + SessionPool initSessionPool(String spaceName); + + /** + * 处理会话 + * @param localSession 本地会话 + * @param result 结果集，主要获取成功与否 + */ + void handleSession(LocalSession localSession, ResultSet result); + + ResultSet executeWithParameter( + String gql, + Map params, + String space, + Map extraReturn); } diff --git a/src/main/java/org/nebula/contrib/ngbatis/config/EnvConfig.java b/src/main/java/org/nebula/contrib/ngbatis/config/EnvConfig.java index afb39e97..52ed2fe7 100644 --- a/src/main/java/org/nebula/contrib/ngbatis/config/EnvConfig.java +++ b/src/main/java/org/nebula/contrib/ngbatis/config/EnvConfig.java @@ -72,6 +72,7 @@ public class EnvConfig { @Autowired(required = false) private PkGenerator pkGenerator; + @Autowired private SessionDispatcher sessionDispatcher; /** @@ -80,8 +81,6 @@ public class EnvConfig { */ @Bean public Env getEnv() { - properties.setPoolConfig(MapperContext.newInstance().getNebulaPoolConfig()); - sessionDispatcher = new IntervalCheckSessionDispatcher(properties); return new Env( textResolver, resultResolver, diff --git a/src/main/java/org/nebula/contrib/ngbatis/proxy/MapperProxy.java b/src/main/java/org/nebula/contrib/ngbatis/proxy/MapperProxy.java index 5894f45e..eb42bb1b 100644 --- a/src/main/java/org/nebula/contrib/ngbatis/proxy/MapperProxy.java +++ b/src/main/java/org/nebula/contrib/ngbatis/proxy/MapperProxy.java @@ -126,12 +126,8 @@ public static Object invoke(ClassModel classModel, MethodModel methodModel, Obje Map parasForDb = argsResolver.resolve(methodModel, args); final long step1 = System.currentTimeMillis(); - NgbatisConfig ngbatisConfig = MapperContext.newInstance().getNgbatisConfig(); - if (ngbatisConfig == null || !ngbatisConfig.getUseSessionPool()) { - query = executeWithParameter(classModel, methodModel, gql, parasForDb, argMap); - } else { - query = executeBySessionPool(classModel, methodModel, gql, parasForDb, argMap); - } + + query = executeWithParameter(classModel, methodModel, gql, parasForDb, argMap); final long step2 = System.currentTimeMillis(); if (!query.isSucceeded()) { @@ -206,31 +202,29 @@ private static Object pageSupport(ClassModel classModel, Method method, Object[] * @param params 待执行脚本的参数所需的参数 * @return nebula-graph 的未被 orm 操作的原始结果集 */ - public static ResultSet executeWithParameter(ClassModel cm, MethodModel mm, String gql, - Map params, Map paramsForTemplate) { - LocalSession localSession = null; - Session session = null; + public static ResultSet executeWithParameter( + ClassModel cm, MethodModel mm, String gql, + Map params, + Map paramsForTemplate) { + ResultSet result = null; String proxyClass = null; String proxyMethod = null; - String localSessionSpace = null; - String autoSwitch = null; + SessionDispatcher dispatcher = ENV.getDispatcher(); + Map extraReturn = new HashMap<>(); + try { - localSession = dispatcher.poll(); if (log.isDebugEnabled()) { proxyClass = cm.getNamespace().getName(); proxyMethod = mm.getId(); - localSessionSpace = localSession.getCurrentSpace(); } String currentSpace = getSpace(cm, mm, paramsForTemplate); - String[] qlAndSpace = qlWithSpace(localSession, gql, currentSpace); - gql = qlAndSpace[1]; - autoSwitch = qlAndSpace[0] == null ? "" : qlAndSpace[0]; - session = localSession.getSession(); - result = session.executeWithParameter(gql, params); - localSession.setCurrentSpace(getSpace(result)); + result = dispatcher.executeWithParameter( + gql, params, currentSpace, extraReturn + ); + if (result.isSucceeded()) { return result; } else { @@ -243,15 +237,18 @@ public static ResultSet executeWithParameter(ClassModel cm, MethodModel mm, Stri throw new QueryException("数据查询失败：" + e.getMessage(), e); } finally { if (log.isDebugEnabled()) { + Object autoSwitch = extraReturn.get("autoSwitch"); + Object localSessionSpace = extraReturn.get("localSessionSpace"); + boolean noNeedSwitch = isEmpty(autoSwitch); + autoSwitch = (isEmpty(autoSwitch) ? "" : autoSwitch); log.debug("\n\t- proxyMethod: {}#{}" + "\n\t- session space: {}" - + (isEmpty(autoSwitch) ? "\n\t- {}" : "\n\t- auto switch to: {}") + + (noNeedSwitch ? "\n\t- {}" : "\n\t- auto switch to: {}") + "\n\t- nGql：{}" + "\n\t- params: {}" + "\n\t- result：{}", proxyClass, proxyMethod, localSessionSpace, autoSwitch, gql, paramsForTemplate, result); } - handleSession(dispatcher, localSession, result); } } @@ -304,38 +301,6 @@ public static ResultSet executeBySessionPool(ClassModel cm, MethodModel mm, Stri } } - private static void handleSession(SessionDispatcher dispatcher, - LocalSession localSession, ResultSet result) { - if (localSession != null) { - boolean sessionError = ResultSetUtil.isSessionError(result); - if (sessionError || dispatcher.timeToRelease(localSession)) { - dispatcher.release(localSession); - } else { - dispatcher.offer(localSession); - } - } - } - - 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; - } - /** * 获取当前语句所执行的目标space。 * @param cm 当前接口的类模型 @@ -370,16 +335,6 @@ public static String getSpace( return space; } - /** - * 从结果集中获取当前的 space - * @param result 脚本执行之后的结果集 - * @return 结果集所对应的 space - */ - private static String getSpace(ResultSet result) { - String spaceName = result.getSpaceName(); - return isBlank(spaceName) ? null : spaceName; - } - public static Logger getLog() { return log; } diff --git a/src/main/java/org/nebula/contrib/ngbatis/session/IntervalCheckSessionDispatcher.java b/src/main/java/org/nebula/contrib/ngbatis/session/IntervalCheckSessionDispatcher.java index aa76c61a..4c09b56b 100644 --- a/src/main/java/org/nebula/contrib/ngbatis/session/IntervalCheckSessionDispatcher.java +++ b/src/main/java/org/nebula/contrib/ngbatis/session/IntervalCheckSessionDispatcher.java @@ -4,9 +4,18 @@ // // This source code is licensed under Apache 2.0 License. +import static org.apache.commons.lang3.StringUtils.isBlank; import static org.nebula.contrib.ngbatis.proxy.MapperProxy.ENV; import com.vesoft.nebula.client.graph.NebulaPoolConfig; +import com.vesoft.nebula.client.graph.SessionPool; +import com.vesoft.nebula.client.graph.SessionPoolConfig; +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.util.Map; +import java.util.Objects; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -15,8 +24,12 @@ import org.nebula.contrib.ngbatis.config.EnvConfig; import org.nebula.contrib.ngbatis.config.NebulaJdbcProperties; import org.nebula.contrib.ngbatis.config.NgbatisConfig; +import org.nebula.contrib.ngbatis.exception.QueryException; +import org.nebula.contrib.ngbatis.models.MapperContext; +import org.nebula.contrib.ngbatis.utils.ResultSetUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; /** * 间隔时间进行检查的本地会话调度器。 @@ -25,6 +38,7 @@ * @since 2022-08-26 2:34 *
Now is history! */ +@Component public class IntervalCheckSessionDispatcher implements Runnable, SessionDispatcher { public static long SESSION_LIFE_LENGTH = 5 * 60 * 60 * 1000; @@ -33,12 +47,14 @@ public class IntervalCheckSessionDispatcher implements Runnable, SessionDispatch private final NebulaPoolConfig nebulaPoolConfig; private final ArrayBlockingQueue sessionQueue; private final ScheduledExecutorService threadPool; + final private NebulaJdbcProperties nebulaJdbcProperties; /** * 具备间隔时间做连接可用性检查的会话调度器 * @param properties 连接信息 */ public IntervalCheckSessionDispatcher(NebulaJdbcProperties properties) { + this.nebulaJdbcProperties = properties; this.nebulaPoolConfig = properties.getPoolConfig(); this.sessionQueue = new ArrayBlockingQueue<>(nebulaPoolConfig.getMaxConnSize()); threadPool = EnvConfig.reconnect ? Executors.newScheduledThreadPool(1) : null; @@ -51,6 +67,7 @@ public IntervalCheckSessionDispatcher(NebulaJdbcProperties properties) { ? CHECK_FIXED_RATE : ngbatis.getCheckFixedRate(); } + setNebulaSessionPool(MapperContext.newInstance()); wakeUp(); } @@ -130,6 +147,11 @@ public void releaseAll() { LocalSession poll = sessionQueue.poll(); release(poll); } + if (SessionDispatcher.useSessionPool()) { + MapperContext.newInstance() + .getNebulaSessionPoolMap() + .forEach((k, v) -> v.close()); + } } @Override @@ -138,4 +160,156 @@ public boolean timeToRelease(LocalSession session) { return System.currentTimeMillis() - birth > SESSION_LIFE_LENGTH; } + /** + * create and init Nebula SessionPool + * + * @author gin soul [create] + * @author CorvusYe [refac] + */ + public void setNebulaSessionPool(MapperContext context) { + NgbatisConfig ngbatisConfig = nebulaJdbcProperties.getNgbatis(); + if (ngbatisConfig.getUseSessionPool() == null || !ngbatisConfig.getUseSessionPool()) { + return; + } + + context.getSpaceNameSet().add(nebulaJdbcProperties.getSpace()); + Map nebulaSessionPoolMap = context.getNebulaSessionPoolMap(); + for (String spaceName : context.getSpaceNameSet()) { + SessionPool sessionPool = initSessionPool(spaceName); + if (sessionPool == null) { + log.error("{} session pool init failed.", spaceName); + continue; + } + log.info("session pool for `{}` init success.", spaceName); + nebulaSessionPoolMap.put(spaceName, sessionPool); + } + } + + /** + * session pool create and init + * @param spaceName nebula + space name + * @author gin soul [create] + * @author CorvusYe [refac] + * @return inited SessionPool + */ + @Override + public SessionPool initSessionPool(String spaceName) { + final NgbatisConfig ngbatisConfig = nebulaJdbcProperties.getNgbatis(); + NebulaPoolConfig poolConfig = nebulaJdbcProperties.getPoolConfig(); + + SessionPoolConfig sessionPoolConfig = new SessionPoolConfig( + nebulaJdbcProperties.getHostAddresses(), + spaceName, + nebulaJdbcProperties.getUsername(), + nebulaJdbcProperties.getPassword() + ).setUseHttp2(poolConfig.isUseHttp2()) + .setEnableSsl(poolConfig.isEnableSsl()) + .setSslParam(poolConfig.getSslParam()) + .setCustomHeaders(poolConfig.getCustomHeaders()) + .setWaitTime(poolConfig.getWaitTime()) + .setTimeout(poolConfig.getTimeout()); + + if (poolConfig.getMinConnSize() <= 0) { + sessionPoolConfig.setMinSessionSize(1); + } else { + sessionPoolConfig.setMinSessionSize(poolConfig.getMinConnSize()); + } + sessionPoolConfig.setMaxSessionSize(poolConfig.getMaxConnSize()); + sessionPoolConfig.setTimeout(poolConfig.getTimeout()); + sessionPoolConfig.setWaitTime(poolConfig.getWaitTime()); + if (null != ngbatisConfig.getSessionLifeLength()) { + int cleanTime = (int) (ngbatisConfig.getSessionLifeLength() / 1000); + sessionPoolConfig.setCleanTime(cleanTime); + } + if (null != ngbatisConfig.getCheckFixedRate()) { + int healthCheckTime = (int) (ngbatisConfig.getCheckFixedRate() / 1000); + sessionPoolConfig.setHealthCheckTime(healthCheckTime); + } + + return new SessionPool(sessionPoolConfig); + } + + @Override + public void handleSession(LocalSession localSession, ResultSet result) { + if (localSession != null) { + boolean sessionError = ResultSetUtil.isSessionError(result); + if (sessionError || timeToRelease(localSession)) { + release(localSession); + } else { + offer(localSession); + } + } + } + + @Override + public ResultSet executeWithParameter( + String gql, + Map params, + String space, + Map extraReturn) { + + Session session = null; + LocalSession localSession = null; + ResultSet result = null; + boolean useSessionPool = SessionDispatcher.useSessionPool(); + try { + if (useSessionPool) { + SessionPool sessionPool = ENV.getSessionPool(space); + if (sessionPool == null) { + throw new QueryException(space + " sessionPool is null"); + } + extraReturn.put("localSessionSpace", space); + return sessionPool.execute(gql, params); + } else { + localSession = poll(); + + String[] qlAndSpace = qlWithSpace(localSession, gql, space); + gql = qlAndSpace[1]; + String autoSwitch = qlAndSpace[0] == null ? "" : qlAndSpace[0]; + session = localSession.getSession(); + result = session.executeWithParameter(gql, params); + extraReturn.put("autoSwitch", autoSwitch); + localSession.setCurrentSpace(getSpace(result)); + handleSession(localSession, result); + if (log.isDebugEnabled()) { + extraReturn.put("localSessionSpace", localSession.getCurrentSpace()); + extraReturn.put("autoSwitch", autoSwitch); + } + return result; + } + } catch (Exception e) { + throw new QueryException("execute failed: " + e.getMessage(), e); + } + } + + 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; + } + + /** + * 从结果集中获取当前的 space + * @param result 脚本执行之后的结果集 + * @return 结果集所对应的 space + */ + private static String getSpace(ResultSet result) { + String spaceName = result.getSpaceName(); + return isBlank(spaceName) ? null : spaceName; + } }