#1630

opteryx/__version__.py

@@ -1,4 +1,4 @@
-__build__ = 500
+__build__ = 501
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

opteryx/connectors/aws_s3_connector.py

@@ -17,7 +17,6 @@
 from typing import List
 
 import pyarrow
-from orso.schema import FlatColumn
 from orso.schema import RelationSchema
 from orso.tools import single_item_cache
 

opteryx/models/logical_column.py

@@ -81,3 +81,15 @@ def copy(self):
 
     def __repr__(self) -> str:
         return f"<LogicalColumn name: '{self.current_name}' fullname: '{self.qualified_name}'>"
+
+    def to_dict(self) -> str:
+        from dataclasses import asdict
+
+        return {
+            "class": "LogicalColumn",
+            "node_type": self.node_type,
+            "source_column": self.source_column,
+            "source": self.source,
+            "alias": self.alias,
+            "schema_column": asdict(self.schema_column),
+        }

opteryx/operators/#heap_sort_node.py

@@ -53,11 +53,11 @@ def __init__(self, properties: QueryProperties, **config):
         self.order = config.get("order", [])
         self.limit: int = config.get("limit", -1)
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/#information_schema_node.py

@@ -161,11 +161,11 @@ def __init__(self, properties: QueryProperties, **config):
         # pushed down selection/filter
         self._selection = config.get("selection")
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/#show_databases_node.py

@@ -31,11 +31,11 @@ class ShowDatabasesNode(BasePlanNode):
     def __init__(self, properties: QueryProperties, **config):
         super().__init__(properties=properties)
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/aggregate_and_group_node.py

@@ -76,11 +76,11 @@ def __init__(self, properties: QueryProperties, **config):
         self.group_by_columns = list({node.schema_column.identity for node in self.groups})
         self.column_map, self.aggregate_functions = build_aggregations(self.aggregates)
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/aggregate_node.py

@@ -203,11 +203,11 @@ def __init__(self, properties: QueryProperties, **config):
 
         self.column_map, self.aggregate_functions = build_aggregations(self.aggregates)
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/async_read_node.py

@@ -104,7 +104,7 @@ def __init__(self, *args, **kwargs):
             MAX_BUFFER_SIZE_MB * 1024 * 1024, f"ReadBuffer <{self.parameters['alias']}>"
         )
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod

opteryx/operators/base_plan_node.py

@@ -47,11 +47,11 @@ def __init__(self, properties: QueryProperties, **parameters):
         self.execution_time = 0
         self.identity = random_string()
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     def set_producers(self, producers):

opteryx/operators/cross_join_node.py

@@ -232,11 +232,11 @@ def __init__(self, properties: QueryProperties, **config):
             ):
                 self._unnest_column.value = tuple([self._unnest_column.value])
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/distinct_node.py

@@ -41,11 +41,11 @@ def __init__(self, properties: QueryProperties, **config):
             self._distinct_on = [col.schema_column.identity for col in self._distinct_on]
         self.hash_set = HashSet()
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/exit_node.py

@@ -41,17 +41,21 @@ def __init__(self, properties: QueryProperties, **config):
         super().__init__(properties=properties)
         self.columns = config.get("columns", [])
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
 
-        return {
-            "node": self.__class__.__name__,
-            "identity": self.identity,
-            "query_id": self.properties.qid,
-            "configuration": {"columns": self.columns},
-        }
+        import orjson
+
+        return orjson.dumps(
+            {
+                "node": self.__class__.__name__,
+                "identity": self.identity,
+                "query_id": self.properties.qid,
+                "configuration": {"columns": [c.to_dict() for c in self.columns]},
+            }
+        )
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/explain_node.py

@@ -40,11 +40,11 @@ def name(self):  # pragma: no cover
     def config(self):
         return ""
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     def execute(self) -> Generator:

opteryx/operators/filter_node.py

@@ -47,11 +47,11 @@ def __init__(self, properties: QueryProperties, **config):
             select_nodes=(NodeType.FUNCTION,),
         )
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/function_dataset_node.py

@@ -86,11 +86,11 @@ def __init__(self, properties: QueryProperties, **config):
         self.parameters = config
         self.columns = config.get("columns", [])
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/inner_join_node.py

@@ -132,11 +132,11 @@ def __init__(self, properties: QueryProperties, **config):
         self._right_columns = config.get("right_columns")
         self._right_relation = config.get("right_relation_names")
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/join_node.py

@@ -47,11 +47,11 @@ def __init__(self, properties: QueryProperties, **config):
         self._right_columns = config.get("right_columns")
         self._right_relation = config.get("right_relation_names")
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/left_join_node.py

@@ -94,11 +94,11 @@ def __init__(self, properties: QueryProperties, **config):
         self._right_columns = config.get("right_columns")
         self._right_relation = config.get("right_relation_names")
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/limit_node.py

@@ -37,11 +37,11 @@ def __init__(self, properties: QueryProperties, **config):
         self.limit = config.get("limit")
         self.offset = config.get("offset", 0)
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/metadata_writer_node.py_

@@ -33,11 +33,11 @@ class MetadataWriterNode(BasePlanNode):
         super().__init__(properties=properties)
 
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/morsel_defragment_node.py_

@@ -56,11 +56,11 @@ class MorselDefragmentNode(BasePlanNode):
         super().__init__(properties=properties)
 
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/noop_node.py

@@ -29,11 +29,11 @@ class NoOpNode(BasePlanNode):
     def __init__(self, properties: QueryProperties, **config):
         super().__init__(properties=properties)
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/projection_node.py

@@ -48,11 +48,11 @@ def __init__(self, properties: QueryProperties, **config):
             column for column in projection if column.node_type != NodeType.IDENTIFIER
         ]
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/set_variable_node.py

@@ -36,11 +36,11 @@ def __init__(self, properties: QueryProperties, **config):
 
         self.variables = config.get("variables")
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/show_columns_node.py

@@ -75,11 +75,11 @@ def __init__(self, properties: QueryProperties, **config):
         self._schema = config.get("schema")
         self._column_map = {c.schema_column.identity: c.source_column for c in config["columns"]}
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/show_value_node.py

@@ -42,11 +42,11 @@ def __init__(self, properties: QueryProperties, **config):
             self.key = self.value
             self.value = properties.variables[self.value]
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property

opteryx/operators/sort_node.py

@@ -40,11 +40,11 @@ def __init__(self, properties: QueryProperties, **config):
         super().__init__(properties=properties)
         self.order = config.get("order", [])
 
-    def to_dict(self) -> dict:  # pragma: no cover
+    def to_json(self) -> dict:  # pragma: no cover
         raise NotImplementedError()
 
     @classmethod
-    def from_dict(cls, dic: dict) -> "BasePlanNode":  # pragma: no cover
+    def from_json(cls, json_obj: str) -> "BasePlanNode":  # pragma: no cover
         raise NotImplementedError()
 
     @property