tinybird 0.0.1.dev178__py3-none-any.whl → 0.0.1.dev180__py3-none-any.whl

tinybird/sql_toolset.py

@@ -1,5 +1,6 @@
 import copy
 import logging
+import re
 from collections import defaultdict
 from datetime import datetime
 from functools import lru_cache
@@ -42,10 +43,88 @@ class InvalidResource(ValueError):
         self.table = table
 
 
+class UnoptimizedJoinException(Exception):
+    def __init__(self, sql: str):
+        self.sql = sql
+        self.msg = f"Materialized node SQL contains a join that is not optimized: {sql}"
+        self.documentation = (
+            "/docs/work-with-data/optimization/opt201-fix-mistakes#understanding-the-materialized-join-issue"
+        )
+        super().__init__(self.msg)
+
+
+ChQueryTable = Tuple[Optional[str], Optional[str], Optional[str]]
+
+
+def get_left_table(sql: str, default_database: Optional[str] = None) -> ChQueryTable:
+    if default_database is None:
+        left_table = chquery.get_left_table(sql)
+    else:
+        left_table = chquery.get_left_table(sql, default_database=default_database)
+    return left_table
+
+
 def format_sql(sql: str) -> str:
     return chquery.format(sql)
 
 
+def explain_plan(sql: str) -> str:
+    return chquery.explain_ast(sql)
+
+
+def has_join(sql: str) -> bool:
+    return any(line.rstrip().startswith("TableJoin") for line in explain_plan(sql).split())
+
+
+def has_unoptimized_join(sql: str, left_table: Optional[Union[Tuple[str, str], Tuple[str, str, str]]] = None) -> None:
+    """
+    Check if a SQL query contains an unoptimized join.
+    A join is considered optimized if the right table is filtered by the left table's data.
+
+    Args:
+        sql: The SQL query to check
+        left_table: Optional tuple of (database, table) for the left table
+
+    Raises:
+        UnoptimizedJoin: If an unoptimized join is found
+    """
+    # TODO: We should check that we are filtering the right table by the left table's data
+    # TODO: We should check if using EXPLAIN AST is better than using regex
+
+    number_of_joins = sum(1 for line in explain_plan(sql).split() if line.rstrip().startswith("TableJoin"))
+    if number_of_joins == 0:
+        return
+
+    if not left_table:
+        left_table = chquery.get_left_table(sql)
+        if not left_table:
+            return
+
+    # Find all JOIN clauses with subqueries
+    # This pattern matches anything between JOIN and ON/USING
+    join_pattern = r"(?:LEFT\s+|RIGHT\s+|INNER\s+|FULL\s+OUTER\s+)?JOIN\s*\((.*?)\)\s+(?:AS\s+\w+)?\s*(?:ON|USING)"
+
+    # Find all joins with subqueries
+    join_matches = list(re.finditer(join_pattern, sql, re.IGNORECASE | re.DOTALL))
+
+    if number_of_joins != len(join_matches):
+        logging.debug(f"number_of_joins: {number_of_joins}, join_matches: {join_matches}")
+        raise UnoptimizedJoinException(sql)
+
+    # If no joins with subqueries found, probably is an unoptimized join
+    if not join_matches:
+        raise UnoptimizedJoinException(sql)
+
+    # Check if the left table is referenced in the subquery
+    left_table_ref = f"{left_table[0]}.{left_table[1]}"
+
+    for match in join_matches:
+        subquery = match.group(1)  # Get the captured subquery
+        logging.debug(f"subquery: {subquery} left_table_ref: {left_table_ref}")
+        if left_table_ref not in subquery:
+            raise UnoptimizedJoinException(sql)
+
+
 def format_where_for_mutation_command(where_clause: str) -> str:
     """
     >>> format_where_for_mutation_command("numnights = 99")

tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev178'
-__revision__ = 'c2632b6'
+__version__ = '0.0.1.dev180'
+__revision__ = '4ea1a7e'

tinybird/tb/modules/build.py

@@ -89,7 +89,6 @@ def build_project(project: Project, tb_client: TinyB, silent: bool = False) -> O
         files = [
             ("context://", ("cli-version", "1.0.0", "text/plain")),
         ]
-        fds = []
         project_path = project.path
         project_files = project.get_project_files()
 
@@ -98,10 +97,11 @@ def build_project(project: Project, tb_client: TinyB, silent: bool = False) -> O
 
         for file_path in project_files:
             relative_path = str(Path(file_path).relative_to(project_path))
-            fd = open(file_path, "rb")
-            fds.append(fd)
-            content_type = DATAFILE_TYPE_TO_CONTENT_TYPE.get(Path(file_path).suffix, "application/unknown")
-            files.append((MULTIPART_BOUNDARY_DATA_PROJECT, (relative_path, fd.read().decode("utf-8"), content_type)))
+            with open(file_path, "rb") as fd:
+                content_type = DATAFILE_TYPE_TO_CONTENT_TYPE.get(Path(file_path).suffix, "application/unknown")
+                files.append(
+                    (MULTIPART_BOUNDARY_DATA_PROJECT, (relative_path, fd.read().decode("utf-8"), content_type))
+                )
         HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
 
         r = requests.post(TINYBIRD_API_URL, files=files, headers=HEADERS)
@@ -195,9 +195,6 @@ def build_project(project: Project, tb_client: TinyB, silent: bool = False) -> O
             error = f"Unknown build result. Error: {result.get('error')}"
     except Exception as e:
         error = str(e)
-    finally:
-        for fd in fds:
-            fd.close()
 
     if error:
         raise click.ClickException(error)

tinybird/tb/modules/deployment.py

@@ -524,13 +524,11 @@ def create_deployment(
     files = [
         ("context://", ("cli-version", "1.0.0", "text/plain")),
     ]
-    fds = []
     for file_path in project.get_project_files():
         relative_path = str(Path(file_path).relative_to(project.path))
-        fd = open(file_path, "rb")
-        fds.append(fd)
-        content_type = DATAFILE_TYPE_TO_CONTENT_TYPE.get(Path(file_path).suffix, "application/unknown")
-        files.append((MULTIPART_BOUNDARY_DATA_PROJECT, (relative_path, fd.read().decode("utf-8"), content_type)))
+        with open(file_path, "rb") as fd:
+            content_type = DATAFILE_TYPE_TO_CONTENT_TYPE.get(Path(file_path).suffix, "application/unknown")
+            files.append((MULTIPART_BOUNDARY_DATA_PROJECT, (relative_path, fd.read().decode("utf-8"), content_type)))
 
     deployment = None
     try:
@@ -605,9 +603,6 @@ def create_deployment(
             click.echo(FeedbackManager.error(message=f"Unknown deployment result {status}"))
     except Exception as e:
         click.echo(FeedbackManager.error_exception(error=e))
-    finally:
-        for fd in fds:
-            fd.close()
 
         if not deployment and not check:
             sys_exit("deployment_error", "Deployment failed")

{tinybird-0.0.1.dev178.dist-info → tinybird-0.0.1.dev180.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev178
+Version: 0.0.1.dev180
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev178.dist-info → tinybird-0.0.1.dev180.dist-info}/RECORD

@@ -7,17 +7,17 @@ tinybird/prompts.py,sha256=uFzlVsGgWFwEOBhXkaLL4zY-wz8jCQgTFiMEfoFcgro,36550
 tinybird/sql.py,sha256=C_B81wwv3BsqyXGhF5oTk9DcTUkrp7NwIFqSzd3Dmjc,47854
 tinybird/sql_template.py,sha256=hWW8JawSWLl9GeWPYkC_Yrxj7P0MHEVMJ0Px9bedEgM,99817
 tinybird/sql_template_fmt.py,sha256=KUHdj5rYCYm_rKKdXYSJAE9vIyXUQLB0YSZnUXHeBlY,10196
-tinybird/sql_toolset.py,sha256=KORVbNAUTfW1qo3U9oe7Z59xQ0QMsFhB0ji3HzY2JVo,15324
+tinybird/sql_toolset.py,sha256=eGYzhuxg9SGXdevV4xJMI7X7jlc_UzK1w84t4aRZFZU,18230
 tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=jjNVDMnkYFWXflmT8KU_Ssbo5vR8KQq3EJMk5vYgXRw,41959
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=X4tE9OrfaUy6kO9cqVEzyI9cDcmOF3IAssRRzsTsfEQ,40781
-tinybird/tb/__cli__.py,sha256=nsmL84fKdwG5x6nXbynOK9RY9QmmKkjzGOxJQg6xFsA,247
+tinybird/tb/__cli__.py,sha256=Kac5sOlejovZ8ZTdL4H0Omd9RVtBkFUm2IX9GQBmdG0,247
 tinybird/tb/check_pypi.py,sha256=rW4QmDRbtgKdUUwJCnBkVjmTjZSZGN-XgZhx7vMkC0w,1009
 tinybird/tb/cli.py,sha256=u3eGOhX0MHkuT6tiwaZ0_3twqLmqKXDAOxF7yV_Nn9Q,1075
 tinybird/tb/client.py,sha256=CSBl_JRuioPyY0H8Ac96dJ9wQXDXfrvK2lwqlOxKGoY,55715
 tinybird/tb/config.py,sha256=jT9xndpeCY_g0HdB5qE2EquC0TFRRnkPnQFWZWd04jo,3998
-tinybird/tb/modules/build.py,sha256=zakH5812Lop-XHjGmDRdOPeofPtoeyb_2un_T6e50xw,19177
+tinybird/tb/modules/build.py,sha256=rRL5XKBdadMc9uVDEUt0GXm0h09Y6XXw199rdmRI1qo,19127
 tinybird/tb/modules/cicd.py,sha256=MnShTTJzKBYeajswF2jg7p7ZzupaeCgSriAN05MeEdg,7330
 tinybird/tb/modules/cli.py,sha256=dXZs-MuqYPvxStVj7aLg36LwXtEB8NzTobDmHV9nzZI,15508
 tinybird/tb/modules/common.py,sha256=lu1Z3VYImwocaHvqOW2FzBJP6F3Ev7RuXsItkCZ6jpo,83237
@@ -26,7 +26,7 @@ tinybird/tb/modules/connection.py,sha256=7oOR7x4PhBcm1ETFFCH2YJ_3oeGXjAbmx1cnZX9
 tinybird/tb/modules/copy.py,sha256=2Mm4FWKehOG7CoOhiF1m9UZJgJn0W1_cMolqju8ONYg,5805
 tinybird/tb/modules/create.py,sha256=jz5jswVntvsnNN-IbCXoKw9pUKySx_IubpP0rxi7Iy0,17528
 tinybird/tb/modules/datasource.py,sha256=mZ9N9LxbNA9QoKSMbxcMiQkdaQkfFqLeFB9_88e3_68,17843
-tinybird/tb/modules/deployment.py,sha256=hbQ5ijbAp8Rvj4MRA7X8538Sb6Eko6MbD8jJ0MVsiTI,27227
+tinybird/tb/modules/deployment.py,sha256=t6DDLJ1YdY3SJiTPbEG7CRblSLkbuqwzauQ9y65FWtY,27147
 tinybird/tb/modules/deprecations.py,sha256=rrszC1f_JJeJ8mUxGoCxckQTJFBCR8wREf4XXXN-PRc,4507
 tinybird/tb/modules/dev_server.py,sha256=57FCKuWpErwYUYgHspYDkLWEm9F4pbvVOtMrFXX1fVU,10129
 tinybird/tb/modules/endpoint.py,sha256=XySDt3pk66vxOZ0egUfz4bY8bEk3BjOXkv-L0OIJ3sc,12083
@@ -80,8 +80,8 @@ tinybird/tb_cli_modules/config.py,sha256=IsgdtFRnUrkY8-Zo32lmk6O7u3bHie1QCxLwgp4
 tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
 tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb_cli_modules/telemetry.py,sha256=Hh2Io8ZPROSunbOLuMvuIFU4TqwWPmQTqal4WS09K1A,10449
-tinybird-0.0.1.dev178.dist-info/METADATA,sha256=2Nf3nXHYpiPTEE5DzWyymJ1AatyVhDeThpo5zQgZXPA,1608
-tinybird-0.0.1.dev178.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev178.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev178.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev178.dist-info/RECORD,,
+tinybird-0.0.1.dev180.dist-info/METADATA,sha256=CQzcZE6kic8iU_phMFMVuaohz8lPb9-JbFgjQ61BUDw,1608
+tinybird-0.0.1.dev180.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev180.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev180.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev180.dist-info/RECORD,,