From 2b6fc680881b2ba9e84df7a669c621b0eca2ab5c Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Mon, 19 Sep 2022 21:28:45 +0530
Subject: [PATCH] Revert "fix: drop Meta cache during update" (#18186)

* Revert "fix: drop Meta cache during update (#18182)"

This reverts commit 656f6df25743f14bba3d7b6d08ed17fee928af55.

* fix: replace meta cache keys

Old keys stored different types of data `dict` changing key to indicate
change in type.
---
 frappe/cache_manager.py                 | 4 ++--
 frappe/desk/form/meta.py                | 4 ++--
 frappe/model/meta.py                    | 6 +++---
 frappe/patches.txt                      | 1 -
 frappe/patches/v14_0/drop_meta_cache.py | 7 -------
 5 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 frappe/patches/v14_0/drop_meta_cache.py

diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py
index 0ef63a539d..aae7b804d0 100644
--- a/frappe/cache_manager.py
+++ b/frappe/cache_manager.py
@@ -58,8 +58,8 @@ user_cache_keys = (
 )
 
 doctype_cache_keys = (
-	"meta",
-	"form_meta",
+	"doctype_meta",
+	"doctype_form_meta",
 	"table_columns",
 	"last_modified",
 	"linked_doctypes",
diff --git a/frappe/desk/form/meta.py b/frappe/desk/form/meta.py
index 63141d5f13..ee975c8326 100644
--- a/frappe/desk/form/meta.py
+++ b/frappe/desk/form/meta.py
@@ -35,10 +35,10 @@ ASSET_KEYS = (
 def get_meta(doctype, cached=True):
 	# don't cache for developer mode as js files, templates may be edited
 	if cached and not frappe.conf.developer_mode:
-		meta = frappe.cache().hget("form_meta", doctype)
+		meta = frappe.cache().hget("doctype_form_meta", doctype)
 		if not meta:
 			meta = FormMeta(doctype)
-			frappe.cache().hset("form_meta", doctype, meta)
+			frappe.cache().hset("doctype_form_meta", doctype, meta)
 	else:
 		meta = FormMeta(doctype)
 
diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index e2a8a7a8fa..6aa8d1d80e 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -56,14 +56,14 @@ DEFAULT_FIELD_LABELS = {
 
 
 def get_meta(doctype, cached=True) -> "Meta":
-	if not cached or frappe.flags.in_patch:
+	if not cached:
 		return Meta(doctype)
 
-	if meta := frappe.cache().hget("meta", doctype):
+	if meta := frappe.cache().hget("doctype_meta", doctype):
 		return meta
 
 	meta = Meta(doctype)
-	frappe.cache().hset("meta", doctype, meta)
+	frappe.cache().hset("doctype_meta", doctype, meta)
 	return meta
 
 
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 5d592fcfe8..2564a565b1 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -211,6 +211,5 @@ frappe.patches.v14_0.set_suspend_email_queue_default
 frappe.patches.v14_0.different_encryption_key
 frappe.patches.v14_0.update_multistep_webforms
 execute:frappe.delete_doc('Page', 'background_jobs', ignore_missing=True, force=True)
-frappe.patches.v14_0.drop_meta_cache
 frappe.patches.v14_0.drop_unused_indexes
 frappe.patches.v15_0.drop_modified_index
diff --git a/frappe/patches/v14_0/drop_meta_cache.py b/frappe/patches/v14_0/drop_meta_cache.py
deleted file mode 100644
index d240129001..0000000000
--- a/frappe/patches/v14_0/drop_meta_cache.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import frappe
-
-
-def execute():
-	cache = frappe.cache()
-	for key in cache.hkeys("meta"):
-		cache.hdel("meta", key)