From ea4d9645f176d7cb2e37da9b64354e3a074e2422 Mon Sep 17 00:00:00 2001
From: Arash M <27716912+am357@users.noreply.github.com>
Date: Wed, 16 Aug 2023 12:10:09 -0700
Subject: [PATCH] Add Catalog to NameResolver

During the work for adding a steel thread for PartiQL Typing (Recent PR #389)
and after merging #410 to `feat-type-plan-poc` it is realized that we need to
refactor the code to remove `DynamicLocalup` `VarExpr` with the assumption that
we work based off of Typing and Value Environment from the Catalog. We have a
Typing Environment in the Catalog at the moment and we are going to add the
Variable Environment as well. In preparation for such task, we need to make
the `NameResolver` Catalog aware. In that regard this commit adds the `Catalog`
to `NameResolver`

Expecting subsequent PR(s) for the name resolving using the Catalog.
---
 partiql-ast-passes/src/name_resolver.rs | 31 +++++++++++++++++++++----
 partiql-logical-planner/src/lib.rs      |  5 ++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/partiql-ast-passes/src/name_resolver.rs b/partiql-ast-passes/src/name_resolver.rs
index 993c11c1..a04fba0f 100644
--- a/partiql-ast-passes/src/name_resolver.rs
+++ b/partiql-ast-passes/src/name_resolver.rs
@@ -5,6 +5,7 @@ use partiql_ast::ast;
 use partiql_ast::ast::{GroupByExpr, GroupKey};
 use partiql_ast::visit::{Traverse, Visit, Visitor};
 use std::sync::atomic::{AtomicU32, Ordering};
+use partiql_catalog::Catalog;
 
 type FnvIndexSet<T> = IndexSet<T, FnvBuildHasher>;
 
@@ -82,8 +83,8 @@ enum EnclosingClause {
 /// Resolves which clauses in a query produce & consume variable references by walking the
 /// AST and collecting variable references. Also partially infers alias if no `AS` alias
 /// was provided in the query.
-#[derive(Default, Debug)]
-pub struct NameResolver {
+#[derive(Debug)]
+pub struct NameResolver<'c> {
     // environment stack tracking
     id_path_to_root: Vec<ast::NodeId>,
     id_child_stack: Vec<Vec<ast::NodeId>>,
@@ -99,9 +100,31 @@ pub struct NameResolver {
 
     // errors that occur during name resolution
     errors: Vec<AstTransformError>,
+    catalog: &'c dyn Catalog,
 }
 
-impl NameResolver {
+impl<'c> NameResolver<'c> {
+    pub fn new(catalog: &'c dyn Catalog) -> Self {
+        NameResolver {
+            // environment stack tracking
+            id_path_to_root: Default::default(),
+            id_child_stack: Default::default(),
+            keyref_stack: Default::default(),
+            lateral_stack: Default::default(),
+            id_gen: Default::default(),
+
+            // data flow tracking
+            enclosing_clause: Default::default(),
+            in_scope: Default::default(),
+            schema: Default::default(),
+            aliases: Default::default(),
+
+            // errors that occur during name resolution
+            errors: Default::default(),
+            catalog,
+        }
+    }
+
     pub fn resolve(
         &mut self,
         query: &ast::AstNode<ast::TopLevelQuery>,
@@ -188,7 +211,7 @@ impl NameResolver {
     }
 }
 
-impl<'ast> Visitor<'ast> for NameResolver {
+impl<'ast, 'c> Visitor<'ast> for NameResolver<'c> {
     fn enter_ast_node(&mut self, id: ast::NodeId) -> Traverse {
         self.id_path_to_root.push(id);
         if let Some(children) = self.id_child_stack.last_mut() {
diff --git a/partiql-logical-planner/src/lib.rs b/partiql-logical-planner/src/lib.rs
index 73ce018c..e1f58630 100644
--- a/partiql-logical-planner/src/lib.rs
+++ b/partiql-logical-planner/src/lib.rs
@@ -5,7 +5,7 @@ use partiql_ast_passes::name_resolver::NameResolver;
 use partiql_logical as logical;
 use partiql_parser::Parsed;
 
-use partiql_catalog::Catalog;
+use partiql_catalog::{Catalog, PartiqlCatalog};
 
 mod builtins;
 mod lower;
@@ -25,7 +25,8 @@ impl<'c> LogicalPlanner<'c> {
         parsed: &Parsed,
     ) -> Result<logical::LogicalPlan<logical::BindingsOp>, AstTransformationError> {
         let q = &parsed.ast;
-        let mut resolver = NameResolver::default();
+        let catalog = PartiqlCatalog::default();
+        let mut resolver = NameResolver::new(&catalog);
         let registry = resolver.resolve(q)?;
         let planner = AstToLogical::new(self.catalog, registry);
         planner.lower_query(q)