Merge pull request #3403 from KouShenhai/dev

fix: SQL缓存，拼接多个租户ID
KouShenhai · Jan 22, 2025 · 2a37635 · 2a37635
2 parents d17e6a8 + ae5532c
commit 2a37635
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/...u-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/FuryFactory.java b/...u-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/FuryFactory.java
@@ -20,7 +20,7 @@
 import net.sf.jsqlparser.expression.Function;
 import net.sf.jsqlparser.statement.select.OrderByElement;
 import org.apache.fury.Fury;
-import org.apache.fury.ThreadLocalFury;
+import org.apache.fury.ThreadSafeFury;
 
 /**
  * @author laokou
@@ -29,7 +29,7 @@ public final class FuryFactory {
 
 	private static final FuryFactory FACTORY = new FuryFactory();
 
-	private final ThreadLocalFury FURY = Fury.builder().buildThreadLocalFury();
+	private final ThreadSafeFury FURY = Fury.builder().buildThreadSafeFury();
 
 	public FuryFactory() {
 		FURY.register(net.sf.jsqlparser.expression.Alias.class);

diff --git a/.../src/main/java/org/laokou/common/mybatisplus/config/FurySerialCaffeineJsqlParseCache.java b/.../src/main/java/org/laokou/common/mybatisplus/config/FurySerialCaffeineJsqlParseCache.java
@@ -20,8 +20,6 @@
 import com.baomidou.mybatisplus.extension.parser.cache.AbstractCaffeineJsqlParseCache;
 import com.github.benmanes.caffeine.cache.Cache;
 
-import java.util.concurrent.Executor;
-
 /**
  * jsqlparser 缓存 fury 序列化 Caffeine 缓存实现.
  *
@@ -33,13 +31,6 @@ public FurySerialCaffeineJsqlParseCache(Cache<String, byte[]> cache) {
 		super(cache);
 	}
 
-	public FurySerialCaffeineJsqlParseCache(Cache<String, byte[]> cache, Executor executor, boolean async) {
-		super(cache);
-		super.executor = executor;
-		// 开启异步
-		super.async = async;
-	}
-
 	@Override
 	public byte[] serialize(Object obj) {
 		return FuryFactory.getFuryFactory().serialize(obj);

diff --git a/...ybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/MybatisPlusAutoConfig.java b/...ybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/MybatisPlusAutoConfig.java
@@ -57,8 +57,7 @@ public class MybatisPlusAutoConfig {
 
 	static {
 		JsqlParserGlobal.setJsqlParseCache(new FurySerialCaffeineJsqlParseCache(
-				Caffeine.newBuilder().maximumSize(4096).expireAfterWrite(10, TimeUnit.MINUTES).build(),
-				ThreadUtil.newVirtualTaskExecutor(), true));
+				Caffeine.newBuilder().maximumSize(4096).expireAfterWrite(10, TimeUnit.MINUTES).build()));
 	}
 
 	@Bean