Move 25.2.1 changes to v25_STABLE (#387)

* prevent spock upgrade with auto ddl is enabled (#382)

* Auto ddl off warning added before spock upgrade

* ensure custom pg_data directory is supported for autoddl check

---------

Co-authored-by: Matthew Mols <matt@pgedge.com>

* [ACE] Throw meaningful errors for empty tables (#381)

* [ACE] Throw meaningful errors for empty tables

* Temp fix in interval merging for single row tables

* Minor improvement to error message

* ensure spock major version compat checks run when using either install and um install (#386)

---------

Co-authored-by: Moiz Ibrar <moiz@pgedge.com>
Co-authored-by: Tej Kashi <pct960@gmail.com>

Author: 3 people

cli/scripts/ace_core.py

@@ -701,7 +701,14 @@ def table_diff(td_task: TableDiffTask, skip_all_checks: bool = False):
             )
             ref_cur.execute(offsets_query)
             raw_offsets = ref_cur.fetchall()
-            pkey_offsets = ace.process_pkey_offsets(raw_offsets)
+
+            if all(
+                pkey_range is None for offset in raw_offsets for pkey_range in offset
+            ):
+                pkey_offsets = []
+            else:
+                pkey_offsets = ace.process_pkey_offsets(raw_offsets)
+
         except Exception as e:
             context = {
                 "total_rows": total_rows,
@@ -727,6 +734,11 @@ def get_pkey_offsets(conn, pkey_sql, block_rows):
             cur.execute(pkey_sql)
             rows = cur.fetchmany(block_rows)
 
+            if not rows:
+                cur.close()
+                conn.close()
+                return pkey_offsets
+
             if simple_primary_key:
                 rows[:] = [str(x[0]) for x in rows]
                 pkey_offsets.append(([None], [str(rows[0])]))
@@ -764,6 +776,12 @@ def get_pkey_offsets(conn, pkey_sql, block_rows):
             conn_with_max_rows, pkey_sql, td_task.block_size
         )
 
+    if not pkey_offsets:
+        raise AceException(
+            f"Table {td_task.fields.l_schema}.{td_task.fields.l_table} is empty "
+            "on all nodes."
+        )
+
     # We're done with getting table metadata. Closing all connections.
     for conn in conn_list:
         conn.close()

cli/scripts/ace_mtree.py

@@ -476,6 +476,9 @@ def build_mtree(mtree_task: MerkleTreeTask) -> None:
                         f"Error creating mtree objects on {node['name']}: {str(e)}"
                     )
 
+            if not ref_node:
+                raise AceException(f"Table {schema}.{table} is empty on all nodes.")
+
             print(f"Using node {ref_node['name']} as the reference node")
 
             block_ranges = []
@@ -505,6 +508,12 @@ def build_mtree(mtree_task: MerkleTreeTask) -> None:
             with conn.cursor() as cur:
                 cur.execute(offsets_query)
                 offsets = cur.fetchall()
+
+                if all(
+                    pkey_range is None for offset in offsets for pkey_range in offset
+                ):
+                    raise AceException(f"Table {schema}.{table} is empty on all nodes.")
+
                 block_ranges = process_block_ranges(offsets)
 
         if mtree_task.write_ranges:
@@ -1422,6 +1431,7 @@ def update_mtree(mtree_task: MerkleTreeTask, skip_all_checks=False) -> None:
     key = mtree_task.fields.key
     key_columns = key.split(",")
     is_composite = len(key_columns) > 1
+    block_size = None
 
     # we need to first read the metadata to figure out what the
     # block size the tree was built with
@@ -1436,12 +1446,24 @@ def update_mtree(mtree_task: MerkleTreeTask, skip_all_checks=False) -> None:
                 table=sql.Literal(table),
             )
         )
-        block_size = cur.fetchone()[0]
+        result = cur.fetchone()
+
+        if result is not None:
+            block_size = result[0]
+
     except Exception as e:
-        raise AceException(f"Error getting block size from metadata: {str(e)}")
+        raise AceException(
+            f"Error getting block size from metadata: {str(e)}\n"
+            "Please initialise the Merkle tree objects first with\n"
+            f"./pgedge ace mtree init {mtree_task.cluster_name}"
+        )
 
     if not block_size:
-        raise AceException(f"Block size not found for {schema}.{table}")
+        raise AceException(
+            f"Missing metadata for {schema}.{table}.\nPlease build the tree first "
+            f"with ./pgedge ace mtree build {mtree_task.cluster_name} "
+            f"{schema}.{table}"
+        )
 
     mtree_task.block_size = block_size
 
@@ -1966,15 +1988,22 @@ def get_pkey_batches(
 
     boundaries = sorted(set(boundaries))
 
+    if not boundaries:
+        return []
+
     slices = []
-    for i in range(len(boundaries) - 1):
-        s = boundaries[i]
-        e = boundaries[i + 1]
-
-        # We'll form the half-open interval [s, e)
-        # but only keep it if it intersects any mismatch.
-        if interval_in_union(s, e, all_ranges):
-            slices.append((s, e))
+    if len(boundaries) == 1:
+        s = boundaries[0]
+        slices.append((s, s))
+    else:
+        for i in range(len(boundaries) - 1):
+            s = boundaries[i]
+            e = boundaries[i + 1]
+
+            # We'll form the half-open interval [s, e)
+            # but only keep it if it intersects any mismatch.
+            if interval_in_union(s, e, all_ranges):
+                slices.append((s, e))
 
     # TODO: Fix this!
     # # We always need the last boundary to be (max_key, None), otherwise,

cli/scripts/cli.py

@@ -322,6 +322,8 @@ def read(self, size):
         return io.FileIO.read(self, size)
 
 
+_SPOCK50_RE = re.compile(r"^spock50(?:-pg\d+)?$", re.IGNORECASE)
+
 # Install Component ######################################################
 def install_comp(p_app, p_ver=0, p_rver=None, p_re_install=False):
     util.message(f"cli.install_comp(p_app={p_app}, p_ver={p_ver}, p_rver={p_rver}, p_re_install={p_re_install})", "debug")
@@ -346,6 +348,10 @@ def install_comp(p_app, p_ver=0, p_rver=None, p_re_install=False):
             print(errmsg)
             exit_cleanly(1)
 
+    # Trigger pre-check ONLY for Spock 5.0 artifacts
+    if _SPOCK50_RE.match(p_app):
+        util.validate_spock_upgrade(p_app)   # should sys.exit(1) on failure; otherwise just returns
+
     state = util.get_comp_state(p_app)
 
     if state in ["Enabled", "Disabled"]:

cli/scripts/um.py

@@ -5,7 +5,6 @@
 import fire, meta, util
 isJSON = util.isJSON
 import re
-import sqlite3 as _sqlite3
 
 MY_HOME = util.MY_HOME
 
@@ -83,20 +82,8 @@ def update():
     """Update with a new list of available components."""
     run_cmd("update")
 
-
-
-# Match both "spock50" and "spock50-pg17" (and variants like spock5, spock5-pg16)
-_SPOCK5_NAME_RE = re.compile(r"^spock5(?:0)?(?:-pg\d+)?$", re.IGNORECASE)
-_SPOCK5_VER_RE  = re.compile(r"^5\.", re.IGNORECASE)
-_SPOCK50_RE = re.compile(r"^spock50(?:-pg\d+)?$", re.IGNORECASE)
-
 def install(component, active=True):
     """Install a component."""
-
-    # Trigger pre-check ONLY for Spock 5.0 artifacts
-    if _SPOCK50_RE.match(component):
-        validate_spock_upgrade(component)   # should sys.exit(1) on failure; otherwise just returns
-
     # Common path (no duplication)
     if active not in (True, False):
         util.exit_message("'active' parm must be True or False")
@@ -105,8 +92,6 @@ def install(component, active=True):
     util.message(f"um.install({cmd} {component})", "debug")
     run_cmd(cmd, component)
 
-
-
 def remove(component):
     """Uninstall a component."""
     installed_comp_list = meta.get_component_list()
@@ -244,78 +229,6 @@ def verify_metadata(Project="", Stage="prod", IsCurrent=0):
 
     meta.pretty_sql(sql)
 
-def validate_spock_upgrade(spock_component):
-    """
-    Validate Spock↔PostgreSQL compatibility for an upcoming Spock 5 install.
-    """
-
-    DB_PATH = "data/conf/db_local.db"
-
-    SPOCK_SQL = """
-    SELECT version AS spock_ver, component AS spock_comp
-    FROM components
-    WHERE component LIKE 'spock%'
-    ORDER BY CASE
-               WHEN version LIKE '5.%' THEN 5
-               WHEN version LIKE '4.%' THEN 4
-               ELSE 0
-             END DESC,
-             version DESC
-    LIMIT 1;
-    """
-
-    PG_SQL = """
-    SELECT version AS pg_ver
-    FROM components
-    WHERE component LIKE 'pg__'
-    ORDER BY CAST(substr(component, 3) AS INTEGER) DESC
-    LIMIT 1;
-    """
-
-    try:
-        with _sqlite3.connect(DB_PATH) as conn:
-            sp_row = conn.execute(SPOCK_SQL).fetchone()
-            pg_row = conn.execute(PG_SQL).fetchone()
-    except _sqlite3.Error as err:
-        sys.exit(f"ERROR: SQLite query failed: {err}")
-
-    if not pg_row:
-        sys.exit("ERROR: No PostgreSQL version row found.")
-
-    existing_pg_ver = pg_row[0]
-    existing_spock_ver, existing_spock_comp = (sp_row or (None, None))
-
-    # Already on Spock 5? No-op.
-    if existing_spock_ver and (
-        _SPOCK5_NAME_RE.match(existing_spock_comp) or _SPOCK5_VER_RE.match(existing_spock_ver)
-    ):
-                return 0
-    
-    # Trim "spock" off the front to get the version (e.g., "spock50" -> "50")
-    requested_spock_ver = spock_component
-    if requested_spock_ver and requested_spock_ver.lower().startswith("spock"):
-        requested_spock_ver = requested_spock_ver[5:]
-        
-    # Downtime warning
-    banner = "=" * 80
-
-    if existing_spock_ver:
-        # Case 2: Spock 4.x installed, this is a major upgrade
-        print(f"\n{banner}")
-        print("*** WARNING: This operation will cause downtime! ***")
-        print(f"{banner}\n")
-        print(f"Detected existing Spock version {existing_spock_ver} on PostgreSQL {existing_pg_ver}")
-
-    try:
-        util.validate_spock_pg_compat(requested_spock_ver, existing_pg_ver)
-    except Exception as exc:
-        sys.exit(f"ERROR: Compatibility check failed: {exc}")
-
-    if existing_spock_ver:
-        print("Compatibility check passed.")
-
-    return 0
-
 if __name__ == "__main__":
     fire.Fire(
         {