@byted-apaas/server-sdk-node 1.1.26-beta.2 → 1.1.27-beta.0

package/kunlun/operator/impl/logic.js

@@ -424,26 +424,24 @@ async function handleLookupCondition(conditions) {
     let lookupMap = new Map(), dateSet = new Set();
     let firstObjApiName = conditions[0].left.settings.fieldPath[0].objectApiName;
     let fields = [];
-    let needReadCache = server_common_node_1.utils.getLaneID() !== ''; // 仅打包发布 2.0 支持走 cache
-    let cacheResult = null;
-    if (needReadCache) { // 打包发布 2.0 读缓存
-        cacheResult = getLookupObjectAPINamesFromCache(firstObjApiName, queryMap);
-        // todo wby 方便 qa 测试的日志
-        console.log(`\n=====>[handleLookupCondition] getLookupObjectAPINamesFromCache: ${JSON.stringify(cacheResult)}\n`);
-    }
-    // 命中缓存
-    if (cacheResult !== null && cacheResult.missFields.length === 0) {
-        fields = cacheResult.successFields;
-    }
-    // 未命中缓存 / 不读缓存
-    if ((cacheResult !== null && cacheResult.missFields.length === 1) || (!needReadCache && queryMap.size === 1)) {
-        if (cacheResult !== null && cacheResult.missFields.length === 1) {
-            fieldName = cacheResult.missFields[0];
+    // 未命中缓存的字段
+    let missFields = [...queryMap.keys()];
+    const needReadCache = server_common_node_1.utils.getLaneID() !== ''; // 仅打包发布 2.0 支持走 cache
+    if (needReadCache) {
+        const cacheResult = getLookupObjectAPINamesFromCache(firstObjApiName, queryMap);
+        if (cacheResult) {
+            fields = cacheResult.successFields;
+            missFields = cacheResult.missFields;
         }
-        fields.push(await Request.GetInstance().getField(firstObjApiName, fieldName));
     }
-    if ((cacheResult !== null && cacheResult.missFields.length > 1) || (!needReadCache && queryMap.size > 1)) {
-        fields = await Request.GetInstance().getFields(firstObjApiName);
+    // 获取未命中缓存的字段，通过 API 获取
+    if (missFields.length === 1) { // 单个获取
+        fields.push(await Request.GetInstance().getField(firstObjApiName, missFields[0]));
+    }
+    else if (missFields.length > 1) { // 批量获取
+        const allFields = await Request.GetInstance().getFields(firstObjApiName);
+        const fetchSet = new Set(missFields);
+        fields.push(...allFields.filter((f) => fetchSet.has(f.api_name)));
     }
     for (const field of fields) {
         parseFieldInfo(field, lookupMap, dateSet);
@@ -594,7 +592,7 @@ function setFieldCache(objectApiName, fieldName, field) {
     localCache.set(getFieldCacheKey(objectApiName, fieldName), field, 60); // 缓存60s
 }
 function getFieldCache(objectApiName, fieldName) {
-    let field = localCache.get(getFieldCacheKey(objectApiName, fieldName));
+    const field = localCache.get(getFieldCacheKey(objectApiName, fieldName));
     return field;
 }
 function getFieldCacheKey(objectApiName, fieldName) {
@@ -603,8 +601,8 @@ function getFieldCacheKey(objectApiName, fieldName) {
 function getLookupObjectAPINamesFromCache(firstObjApiName, queryMap) {
     var missFields = [];
     var successFields = [];
-    for (const [fieldName, _] of queryMap) {
-        let field = getFieldCache(firstObjApiName, fieldName);
+    for (const [fieldName] of queryMap) {
+        const field = getFieldCache(firstObjApiName, fieldName);
         if (field) {
             successFields.push(field);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byted-apaas/server-sdk-node",
-  "version": "1.1.26-beta.2",
+  "version": "1.1.27-beta.0",
   "description": "aPaaS Server SDK",
   "author": "zhouwexin <zhouwexin@bytedance.com>",
   "homepage": "",