-
-
Notifications
You must be signed in to change notification settings - Fork 8k
Migrate LocalDB to use SQLite database #502
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
paman7647
wants to merge
1
commit into
TeamUltroid:main
Choose a base branch
from
paman7647:patch-3
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -39,13 +39,7 @@ | |||||
| os.system(f"{sys.executable} -m pip install -q psycopg2-binary") | ||||||
| import psycopg2 | ||||||
| else: | ||||||
| try: | ||||||
| from localdb import Database | ||||||
| except ImportError: | ||||||
| LOGS.info("Using local file as database.") | ||||||
| os.system(f"{sys.executable} -m pip install -q localdb.json") | ||||||
| from localdb import Database | ||||||
|
|
||||||
| LOGS.info("Using SQLite as local database.") | ||||||
| # --------------------------------------------------------------------------------------------- # | ||||||
|
|
||||||
|
|
||||||
|
|
@@ -300,26 +294,69 @@ def usage(self): | |||||
|
|
||||||
| # --------------------------------------------------------------------------------------------- # | ||||||
|
|
||||||
|
|
||||||
| class LocalDB(_BaseDatabase): | ||||||
| def __init__(self): | ||||||
| self.db = Database("ultroid") | ||||||
| self.get = self.db.get | ||||||
| self.set = self.db.set | ||||||
| self.delete = self.db.delete | ||||||
| def __init__(self, db_name="ultroid.db"): | ||||||
| import sqlite3 | ||||||
|
|
||||||
| self.conn = sqlite3.connect(db_name, check_same_thread=False) | ||||||
| self.cursor = self.conn.cursor() | ||||||
|
|
||||||
| # Performance tweaks | ||||||
| self.cursor.execute("PRAGMA journal_mode=WAL;") | ||||||
| self.cursor.execute("PRAGMA synchronous=NORMAL;") | ||||||
|
|
||||||
| # Create table | ||||||
| self.cursor.execute( | ||||||
| "CREATE TABLE IF NOT EXISTS ultroid (key TEXT PRIMARY KEY, value TEXT)" | ||||||
| ) | ||||||
| self.conn.commit() | ||||||
|
|
||||||
| # Bind methods like original LocalDB | ||||||
| self.get = self._get | ||||||
| self.set = self._set | ||||||
| self.delete = self._delete | ||||||
|
|
||||||
| super().__init__() | ||||||
|
|
||||||
| @property | ||||||
| def name(self): | ||||||
| return "LocalDB" | ||||||
|
|
||||||
| def keys(self): | ||||||
| return self._cache.keys() | ||||||
| self.cursor.execute("SELECT key FROM ultroid") | ||||||
| return [row[0] for row in self.cursor.fetchall()] | ||||||
|
|
||||||
| def __repr__(self): | ||||||
| return f"<Ultroid.LocalDB\n -total_keys: {len(self.keys())}\n>" | ||||||
| # ------------------ INTERNAL METHODS ------------------ # | ||||||
|
|
||||||
| def _get(self, key): | ||||||
| self.cursor.execute("SELECT value FROM ultroid WHERE key=?", (key,)) | ||||||
| row = self.cursor.fetchone() | ||||||
| return row[0] if row else None | ||||||
|
|
||||||
| def _set(self, key, value): | ||||||
| self.cursor.execute( | ||||||
| "INSERT OR REPLACE INTO ultroid (key, value) VALUES (?, ?)", | ||||||
| (key, str(value)), | ||||||
| ) | ||||||
| self.conn.commit() | ||||||
| return True | ||||||
|
|
||||||
| def _delete(self, key): | ||||||
| self.cursor.execute("DELETE FROM ultroid WHERE key=?", (key,)) | ||||||
| self.conn.commit() | ||||||
| return True | ||||||
|
|
||||||
| # ------------------ EXTRA ------------------ # | ||||||
|
|
||||||
| def flushall(self): | ||||||
| self.cursor.execute("DELETE FROM ultroid") | ||||||
| self.conn.commit() | ||||||
| self._cache.clear() | ||||||
| return True | ||||||
|
|
||||||
| def __repr__(self): | ||||||
| return f"<Ultroid.LocalDB(SQLite)\n -total_keys: {len(self.keys())}\n>" | ||||||
|
|
||||||
| def UltroidDB(): | ||||||
| _er = False | ||||||
| from .. import HOSTED_ON | ||||||
|
|
@@ -341,7 +378,7 @@ def UltroidDB(): | |||||
| return SqlDB(Var.DATABASE_URL) | ||||||
| else: | ||||||
| LOGS.critical( | ||||||
| "No DB requirement fullfilled!\nPlease install redis, mongo or sql dependencies...\nTill then using local file as database." | ||||||
| "No DB requirement fullfilled!\nPlease install redis, mongo or sql dependencies...\nTill then using SQLite as database." | ||||||
|
||||||
| "No DB requirement fullfilled!\nPlease install redis, mongo or sql dependencies...\nTill then using SQLite as database." | |
| "No DB requirement fulfilled!\nPlease install redis, mongo or sql dependencies...\nTill then using SQLite as database." |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sqlite3.connect(..., check_same_thread=False)allows cross-thread access, but the class shares a single connection + cursor without any locking. SinceudBis used insiderun_asyncfunctions (ThreadPoolExecutor), concurrent calls can lead tosqlite3.ProgrammingError(recursive cursor use) or data corruption. Consider either (a) adding athreading.Lock/RLockand serializing all DB operations, and/or (b) not storing a sharedself.cursorand instead usingself.conn.execute(...)(creating a fresh cursor per call).