Merge branch 'master' into dev

georgia-tech-db · Jan 7, 2023 · 12ea13a · 12ea13a
2 parents c4d77c5 + 04368ef
commit 12ea13a
Show file tree

Hide file tree

Showing 57 changed files with 701 additions and 969 deletions.
diff --git a/eva/binder/binder_utils.py b/eva/binder/binder_utils.py
@@ -25,7 +25,7 @@
     from eva.binder.statement_binder_context import StatementBinderContext
 
 from eva.catalog.catalog_manager import CatalogManager
-from eva.catalog.models.table_catalog import TableCatalog
+from eva.catalog.models.table_catalog import TableCatalogEntry
 from eva.expression.tuple_value_expression import TupleValueExpression
 from eva.parser.table_ref import TableInfo, TableRef
 from eva.utils.logging_manager import logger
@@ -35,15 +35,15 @@ class BinderError(Exception):
     pass
 
 
-def bind_table_info(table_info: TableInfo) -> TableCatalog:
+def bind_table_info(table_info: TableInfo) -> TableCatalogEntry:
     """
     Uses catalog to bind the table information .
 
     Arguments:
          table_info (TableInfo): table information obtained from SQL query
 
     Returns:
-        TableCatalog  -  corresponding table catalog entry for the input table info
+        TableCatalogEntry  -  corresponding table catalog entry for the input table info
     """
     catalog = CatalogManager()
     obj = catalog.get_table_catalog_entry(

diff --git a/eva/binder/statement_binder.py b/eva/binder/statement_binder.py
@@ -24,6 +24,7 @@
 from eva.binder.statement_binder_context import StatementBinderContext
 from eva.catalog.catalog_manager import CatalogManager
 from eva.catalog.catalog_type import ColumnType, NdArrayType, TableType
+from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry
 from eva.expression.abstract_expression import AbstractExpression
 from eva.expression.function_expression import FunctionExpression
 from eva.expression.tuple_value_expression import TupleValueExpression
@@ -161,11 +162,11 @@ def _bind_tableref(self, node: TableRef):
             self.bind(func_expr)
             output_cols = []
             for obj, alias in zip(func_expr.output_objs, func_expr.alias.col_names):
-                alias_obj = self._catalog.udf_io(
+                alias_obj = UdfIOCatalogEntry(
                     alias,
-                    data_type=obj.type,
+                    type=obj.type,
                     array_type=obj.array_type,
-                    dimensions=obj.array_dimensions,
+                    array_dimensions=obj.array_dimensions,
                     is_input=obj.is_input,
                 )
 

diff --git a/eva/binder/statement_binder_context.py b/eva/binder/statement_binder_context.py
@@ -16,14 +16,14 @@
 
 from eva.binder.binder_utils import BinderError
 from eva.catalog.catalog_manager import CatalogManager
-from eva.catalog.models.column_catalog import ColumnCatalog
-from eva.catalog.models.table_catalog import TableCatalog
-from eva.catalog.models.udf_io_catalog import UdfIOCatalog
+from eva.catalog.models.column_catalog import ColumnCatalogEntry
+from eva.catalog.models.table_catalog import TableCatalogEntry
+from eva.catalog.models.udf_io_catalog import UdfIOCatalogEntry
 from eva.expression.function_expression import FunctionExpression
 from eva.expression.tuple_value_expression import TupleValueExpression
 from eva.utils.logging_manager import logger
 
-CatalogColumnType = Union[ColumnCatalog, UdfIOCatalog]
+CatalogColumnType = Union[ColumnCatalogEntry, UdfIOCatalogEntry]
 
 
 class StatementBinderContext:
@@ -41,7 +41,7 @@ class StatementBinderContext:
     """
 
     def __init__(self):
-        self._table_alias_map: Dict[str, TableCatalog] = dict()
+        self._table_alias_map: Dict[str, TableCatalogEntry] = dict()
         self._derived_table_alias_map: Dict[str, List[CatalogColumnType]] = dict()
         self._catalog = CatalogManager()
 
@@ -74,14 +74,14 @@ def add_derived_table_alias(
         self,
         alias: str,
         target_list: List[
-            Union[TupleValueExpression, FunctionExpression, UdfIOCatalog]
+            Union[TupleValueExpression, FunctionExpression, UdfIOCatalogEntry]
         ],
     ):
         """
         Add a alias -> derived table column mapping
         Arguments:
             alias (str): name of alias
-            target_list: list of Tuplevalue Expression or FunctionExpression or UdfIOCatalog
+            target_list: list of Tuplevalue Expression or FunctionExpression or UdfIOCatalogEntry
         """
         self._check_duplicate_alias(alias)
         col_list = []
@@ -126,7 +126,7 @@ def raise_error():
 
         raise_error()
 
-    def _check_table_alias_map(self, alias, col_name) -> ColumnCatalog:
+    def _check_table_alias_map(self, alias, col_name) -> ColumnCatalogEntry:
         """
         Find the column object in table alias map
         Arguments: