@open-mercato/shared 0.6.8-develop.7091.1.15ffbe30ce → 0.6.8-develop.7093.1.700c5c8d96

package/dist/lib/query/engine.js

@@ -22,6 +22,7 @@ import { warnOnCiphertextLikeFallback } from "./ciphertext-search-warning.js";
 import { resolveEncryptedSortFields, resolveEncryptedSortMaxRows, sortRowsInMemory } from "./encrypted-sort.js";
 import { resolveListCountCap } from "./count-cap.js";
 import { mapWithConcurrency } from "./bounded-decrypt.js";
+import { parseNumberWithDefault } from "../number.js";
 import { createLogger } from "../logger/index.js";
 const logger = createLogger("shared").child({ component: "query" });
 const DECRYPT_CONCURRENCY = 8;
@@ -48,6 +49,32 @@ async function resolveEncryptedLikeFieldSet(read, entity, tenantId) {
 function clearEncryptedLikeFieldsCache() {
   encryptedLikeFieldsCache.clear();
 }
+const COLUMN_EXISTS_CACHE_DEFAULT_TTL_MS = 3e5;
+const COLUMN_EXISTS_CACHE_DEFAULT_MAX_ENTRIES = 1e4;
+const columnExistsCache = /* @__PURE__ */ new Map();
+function resolveColumnExistsCacheTtlMs() {
+  return parseNumberWithDefault(process.env.OM_QUERY_COLUMN_EXISTS_CACHE_MS, COLUMN_EXISTS_CACHE_DEFAULT_TTL_MS, { integer: true, min: 0 });
+}
+function resolveColumnExistsCacheMaxEntries() {
+  return parseNumberWithDefault(process.env.OM_QUERY_COLUMN_EXISTS_CACHE_MAX_ENTRIES, COLUMN_EXISTS_CACHE_DEFAULT_MAX_ENTRIES, { integer: true, min: 1 });
+}
+function storeColumnExists(key, value, ttlMs) {
+  const maxEntries = resolveColumnExistsCacheMaxEntries();
+  if (columnExistsCache.size >= maxEntries) {
+    const now = Date.now();
+    for (const [entryKey, entry] of columnExistsCache) {
+      if (entry.expiresAt <= now) columnExistsCache.delete(entryKey);
+    }
+    if (columnExistsCache.size >= maxEntries) columnExistsCache.clear();
+  }
+  columnExistsCache.set(key, { value, expiresAt: Date.now() + ttlMs });
+}
+function clearColumnExistsCache() {
+  columnExistsCache.clear();
+}
+function columnExistsCacheSize() {
+  return columnExistsCache.size;
+}
 const ENTITY_ID_PATTERN = /^[a-z][a-z0-9_]*:[a-z][a-z0-9_]*$/;
 const isValidEntityIdShape = (value) => ENTITY_ID_PATTERN.test(value);
 const pluralizeBaseName = (name) => {
@@ -164,7 +191,6 @@ class BasicQueryEngine {
     this.em = em;
     this.getDbFn = getDbFn;
     this.resolveEncryptionService = resolveEncryptionService;
-    this.columnCache = /* @__PURE__ */ new Map();
     this.searchAliasSeq = 0;
     this.searchAvailabilityInstance = null;
   }
@@ -1115,16 +1141,13 @@ class BasicQueryEngine {
   }
   async columnExists(table, column) {
     const key = `${table}.${column}`;
-    if (this.columnCache.has(key)) {
-      const cached = this.columnCache.get(key);
-      if (cached === true) return true;
-      this.columnCache.delete(key);
-    }
+    const ttlMs = resolveColumnExistsCacheTtlMs();
+    const cached = columnExistsCache.get(key);
+    if (cached && cached.expiresAt > Date.now()) return cached.value;
     const db = this.getDb();
     const exists = await db.selectFrom("information_schema.columns").select(sql`1`.as("one")).where("table_name", "=", table).where("column_name", "=", column).limit(1).executeTakeFirst();
     const present = !!exists;
-    if (present) this.columnCache.set(key, true);
-    else this.columnCache.delete(key);
+    if (ttlMs > 0) storeColumnExists(key, present, ttlMs);
     return present;
   }
   applySearchTokens(q, opts) {
@@ -1334,7 +1357,9 @@ class BasicQueryEngine {
 export {
   BasicQueryEngine,
   ENTITY_ID_PATTERN,
+  clearColumnExistsCache,
   clearEncryptedLikeFieldsCache,
+  columnExistsCacheSize,
   isEncryptedLikeField,
   isValidEntityIdShape,
   resolveEncryptedLikeFieldSet,