Fix bugs: cause by autocommit=False.

Author: ralgond

example_flask_mybatis.py

@@ -0,0 +1,106 @@
+from flask import Flask
+import mysql.connector
+from mybatis import Mybatis
+import orjson as json
+import functools
+
+app = Flask(__name__)
+
+
+# 连接到 MySQL 数据库
+conn = None
+mb = Mybatis(conn, "mapper", cache_memory_limit=50*1024*1024)
+connection_error = False
+error_string = ""
+
+def make_connection_and_mybatis():
+    global conn
+    global mb
+    global connection_error
+    global error_string
+
+    if conn is None:
+        try:
+            conn = mysql.connector.connect(
+                            host="localhost",
+                            user="mybatis",  
+                            password="mybatis", 
+                            database="mybatis",
+                            autocommit=True
+            )
+            mb.conn = conn
+                
+            return True
+            
+        except Exception as e:
+            connection_error = True
+            error_string = str(e)
+            return False
+    else:
+        try:
+            if connection_error:
+                conn.reconnect(3, 3)
+                connection_error = False
+
+            if mb.conn is None:
+                mb.conn = conn
+            return True
+        except Exception as e:
+            connection_error = True
+            error_string = str(e)
+            return False
+
+
+@mb.SelectOne("SELECT * FROM fruits WHERE id=#{id}")
+def select_one(id:int):
+    pass
+
+@mb.SelectMany("SELECT * FROM fruits")
+def select_many():
+    pass
+
+@mb.Insert("INSERT INTO fruits (name,category,price) VALUES ('Candy', 'C', 500)")
+def insert():
+    pass
+
+def mysql_auto_reconnect(func):
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        global connection_error
+        try:
+            ret = make_connection_and_mybatis()
+            if ret is False:
+                return error_string, 500
+
+
+
+            ret = func(*args, **kwargs)
+            return ret, 200
+
+        except mysql.connector.errors.Error as e:
+            connection_error = True
+            return str(e), 500
+        except Exception as e:
+            return str(e), 500
+
+    #wrapper.__name__ = func.__name__
+    #wrapper.__doc__ = func.__doc__
+
+    return wrapper
+
+
+@app.route('/')
+@mysql_auto_reconnect
+def hello():
+    ret = select_many()
+    return json.dumps(ret)
+
+
+@app.route('/insert')
+@mysql_auto_reconnect
+def do_insert():
+    ret = insert()
+    return json.dumps(ret)
+
+if __name__ == "__main__":
+    app.run(debug=True)

mybatis/cache.py

@@ -43,8 +43,6 @@ def put(self, raw_key:CacheKey, value: Any):
             node = CacheNode(key, json.dumps(value))
             node.memory_usage = asizeof.asizeof(node.key) + asizeof.asizeof(node.value)
 
-        # print("====>", node.memory_usage)
-
         while self.memory_used + node.memory_usage >= self.memory_limit:
             to_remove_node = self.list.tail.prev
             if to_remove_node is not self.list.head:
@@ -57,7 +55,8 @@ def put(self, raw_key:CacheKey, value: Any):
         if self.memory_used + node.memory_usage > self.memory_limit:
             return
 
-        self.table[key] = node
+        node.timestamp = int(time.time() * 1000)
+        self.table[node.key] = node
 
         self.list.move_to_head(node)
 
@@ -70,8 +69,9 @@ def get(self, raw_key: CacheKey) -> Optional[Any]:
 
         node = self.table[key]
         current_time_ms = int(time.time() * 1000)
+        # print("delta:",current_time_ms - node.timestamp, "self.max_live_ms:", self.max_live_ms)
         if current_time_ms - node.timestamp > self.max_live_ms:
-            del self.table[node.key]
+            del self.table[key]
             self.list.remove(node)
             self.memory_used -= node.memory_usage
             return None

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='mybatis',
-    version='0.0.13',
+    version='0.0.14',
     description='A python ORM like mybatis.',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',  # 如果你使用的是Markdown格式的README