Merge pull request #2200 from mabel-dev/#1954-3

#1954
mabel-dev · Jan 4, 2025 · acba698 · acba698
2 parents c7f4e23 + f02fd1f
commit acba698
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/opteryx/__version__.py b/opteryx/__version__.py
@@ -1,4 +1,4 @@
-__build__ = 951
+__build__ = 952
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/tests/storage/test_cache_memcached.py b/tests/storage/test_cache_memcached.py
@@ -26,6 +26,10 @@ def test_memcached_cache():
     from opteryx import CacheManager
     from opteryx.managers.cache import MemcachedCache
     from opteryx.shared import BufferPool
+    from opteryx import register_store
+    from opteryx.connectors import GcpCloudStorageConnector
+
+    register_store("opteryx", GcpCloudStorageConnector)
 
     cache = MemcachedCache()
     #cache._server.flush_all()
@@ -37,7 +41,7 @@ def test_memcached_cache():
     for i in range(10):
         cur = conn.cursor()
         time.sleep(0.01)
-        cur.execute("SELECT count(*) FROM testdata.flat.ten_files;")
+        cur.execute("SELECT count(*) FROM opteryx.ten_files;")
 
     print(f"hits: {cache.hits}, misses: {cache.misses}, skips: {cache.skips}, errors: {cache.errors}, sets: {cache.sets}")
 
@@ -47,7 +51,7 @@ def test_memcached_cache():
         buffer.reset()
 
         cur = conn.cursor()
-        cur.execute("SELECT count(*) FROM testdata.flat.ten_files;")
+        cur.execute("SELECT count(*) FROM opteryx.ten_files;")
 
     stats = cur.stats
 

diff --git a/tests/storage/test_cache_redis.py b/tests/storage/test_cache_redis.py
@@ -23,19 +23,23 @@ def test_redis_cache():
     from opteryx import CacheManager
     from opteryx.managers.cache import RedisCache
     from opteryx.shared import BufferPool
+    from opteryx import register_store
+    from opteryx.connectors import GcpCloudStorageConnector
+
+    register_store("opteryx", GcpCloudStorageConnector)
 
     cache = RedisCache()
     opteryx.set_cache_manager(CacheManager(cache_backend=cache))
 
     # read the data once, this should populate the cache if it hasn't already
-    cur = opteryx.query("SELECT * FROM testdata.flat.ten_files;")
-    stats = cur.stats
+    cur = opteryx.query("SELECT * FROM opteryx.ten_files;")
+    cur.fetchall()
 
     buffer = BufferPool()
     buffer.reset()
 
     # read the data a second time, this should hit the cache
-    cur = opteryx.query("SELECT * FROM testdata.flat.ten_files;")
+    cur = opteryx.query("SELECT * FROM opteryx.ten_files;")
 
     assert cache.hits > 0
     assert cache.misses < 12

diff --git a/tests/storage/test_cache_valkey.py b/tests/storage/test_cache_valkey.py
@@ -23,19 +23,23 @@ def test_valkey_cache():
     from opteryx import CacheManager
     from opteryx.managers.cache import ValkeyCache
     from opteryx.shared import BufferPool
+    from opteryx import register_store
+    from opteryx.connectors import GcpCloudStorageConnector
+
+    register_store("opteryx", GcpCloudStorageConnector)
 
     cache = ValkeyCache()
     opteryx.set_cache_manager(CacheManager(cache_backend=cache))
 
     # read the data once, this should populate the cache if it hasn't already
-    cur = opteryx.query("SELECT * FROM testdata.flat.ten_files;")
-    stats = cur.stats
+    cur = opteryx.query("SELECT * FROM opteryx.ten_files;")
+    cur.fetchall()
 
     buffer = BufferPool()
     buffer.reset()
 
     # read the data a second time, this should hit the cache
-    cur = opteryx.query("SELECT * FROM testdata.flat.ten_files;")
+    cur = opteryx.query("SELECT * FROM opteryx.ten_files;")
 
     assert cache.hits > 0, cache.hits
     assert cache.misses < 12