Moves PartiQLSystemCatalog back into SPI package

Removes partiql-system package Adds systemCatalog() method to Session.Builder
partiql · Dec 5, 2024 · 11b1496 · 11b1496
1 parent 896e295
commit 11b1496
Show file tree

Hide file tree

Showing 139 changed files with 199 additions and 843 deletions.
diff --git a/partiql-cli/build.gradle.kts b/partiql-cli/build.gradle.kts
@@ -26,7 +26,6 @@ dependencies {
     implementation(project(":partiql-planner"))
     implementation(project(":partiql-types"))
     implementation(project(":partiql-spi"))
-    implementation(project(":partiql-system"))
     implementation(Deps.csv)
     implementation(Deps.awsSdkBom)
     implementation(Deps.awsSdkDynamodb)

diff --git a/partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt b/partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt
@@ -20,10 +20,10 @@ import org.partiql.cli.pipeline.Pipeline
 import org.partiql.cli.shell.Shell
 import org.partiql.spi.catalog.Catalog
 import org.partiql.spi.catalog.Name
+import org.partiql.spi.catalog.Session
 import org.partiql.spi.catalog.Table
 import org.partiql.spi.value.Datum
 import org.partiql.spi.value.DatumReader
-import org.partiql.system.PartiQLSessionBuilder
 import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.io.PartiQLValueTextWriter
 import picocli.CommandLine
@@ -210,7 +210,7 @@ internal class MainCommand : Runnable {
         println()
     }
 
-    private fun session() = PartiQLSessionBuilder()
+    private fun session() = Session.builder()
         .identity(System.getProperty("user.name"))
         .namespace(emptyList())
         .catalog("default")

diff --git a/partiql-eval/build.gradle.kts b/partiql-eval/build.gradle.kts
@@ -33,7 +33,6 @@ dependencies {
     annotationProcessor(Deps.lombok)
     // Test
     testImplementation(project(":partiql-parser"))
-    testImplementation(project(":partiql-system"))
     testImplementation(testFixtures(project(":partiql-types"))) // TODO: Remove use of StaticType
     testImplementation(Deps.junit4)
     testImplementation(Deps.junit4Params)

diff --git a/partiql-eval/src/test/kotlin/org/partiql/eval/compiler/StrategyTest.kt b/partiql-eval/src/test/kotlin/org/partiql/eval/compiler/StrategyTest.kt
@@ -9,7 +9,7 @@ import org.partiql.eval.Statement
 import org.partiql.parser.PartiQLParser
 import org.partiql.plan.rel.RelLimit
 import org.partiql.planner.PartiQLPlanner
-import org.partiql.system.PartiQLSession
+import org.partiql.spi.catalog.Session
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
@@ -20,7 +20,7 @@ public class StrategyTest {
 
     private val parser = PartiQLParser.standard()
     private val planner = PartiQLPlanner.standard()
-    private val session = PartiQLSession.empty()
+    private val session = Session.empty()
 
     private class MyLimit : ExprRelation {
         override fun open(env: Environment) = error("open")

diff --git a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/SuccessTestCase.kt b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/SuccessTestCase.kt
@@ -8,10 +8,10 @@ import org.partiql.plan.Plan
 import org.partiql.planner.PartiQLPlanner
 import org.partiql.spi.catalog.Catalog
 import org.partiql.spi.catalog.Name
+import org.partiql.spi.catalog.Session
 import org.partiql.spi.catalog.Table
 import org.partiql.spi.value.Datum
 import org.partiql.spi.value.DatumReader
-import org.partiql.system.PartiQLSessionBuilder
 import org.partiql.types.StaticType
 import org.partiql.types.fromStaticType
 import org.partiql.value.PartiQLValue
@@ -64,7 +64,7 @@ public class SuccessTestCase(
                 }
             }
             .build()
-        val session = PartiQLSessionBuilder()
+        val session = Session.builder()
             .catalog("memory")
             .catalogs(catalog)
             .build()

diff --git a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/TypingTestCase.kt b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/TypingTestCase.kt
@@ -7,8 +7,8 @@ import org.partiql.parser.PartiQLParser
 import org.partiql.plan.Plan
 import org.partiql.planner.PartiQLPlanner
 import org.partiql.spi.catalog.Catalog
+import org.partiql.spi.catalog.Session
 import org.partiql.spi.value.Datum
-import org.partiql.system.PartiQLSessionBuilder
 import org.partiql.types.PType
 import org.partiql.value.PartiQLValue
 import org.partiql.value.PartiQLValueExperimental
@@ -62,7 +62,7 @@ public class TypingTestCase @OptIn(PartiQLValueExperimental::class) constructor(
         assertEquals(1, parseResult.statements.size)
         val statement = parseResult.statements[0]
         val catalog = Catalog.builder().name("memory").build()
-        val session = PartiQLSessionBuilder()
+        val session = Session.builder()
             .catalog("memory")
             .catalogs(catalog)
             .build()

diff --git a/partiql-planner/build.gradle.kts b/partiql-planner/build.gradle.kts
@@ -37,7 +37,6 @@ dependencies {
     annotationProcessor(Deps.lombok)
     // Test
     testImplementation(project(":partiql-parser"))
-    testImplementation(project(":partiql-system"))
     testImplementation(testFixtures(project(":partiql-types"))) // TODO: Remove use of StaticType
     testImplementation(Deps.kotlinReflect)
     // Test Fixtures

diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/Env.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/Env.kt
@@ -102,25 +102,8 @@ internal class Env(private val session: Session) {
             error("Qualified functions are not supported.")
         }
 
-        // Search in SQL Path
-        session.getPath().forEach { catalogName ->
-            // TODO: Allow for referencing schemas within a catalog. For now, only allow top-level functions in a catalog.
-            if (catalogName.getLength() != 1) {
-                return@forEach
-            }
-            val catalog = catalogs.getCatalog(catalogName.first()) ?: return@forEach
-            val candidates = getCandidates(catalog, identifier, args)
-            if (candidates.isNotEmpty()) {
-                return candidates
-            }
-        }
-        return emptyList()
-    }
-
-    /**
-     * Given a [catalog], searches for candidate functions.
-     */
-    private fun getCandidates(catalog: Catalog, identifier: Identifier, args: List<Rex>): List<Function> {
+        // 1. Search in the current catalog and namespace.
+        val catalog = default
         val name = identifier.getIdentifier().getText().lowercase() // CASE-NORMALIZED LOWER
         val variants = catalog.getFunctions(session, name).toList()
         val candidates = variants.filter { it.getParameters().size == args.size }
@@ -135,35 +118,14 @@ internal class Env(private val session: Session) {
      * @return
      */
     fun resolveFn(identifier: Identifier, args: List<Rex>): Rex? {
+
         // Reject qualified routine names.
         if (identifier.hasQualifier()) {
             error("Qualified functions are not supported.")
         }
 
-        // Search in SQL Path
-        session.getPath().forEach { catalogName ->
-            // TODO: Allow for referencing schemas within a catalog. For now, only allow top-level functions in a catalog.
-            if (catalogName.getLength() != 1) {
-                return@forEach
-            }
-            val catalog = catalogs.getCatalog(catalogName.first()) ?: return@forEach
-            val candidates = resolveFn(catalog, identifier, args)
-            if (candidates != null) {
-                return candidates
-            }
-        }
-        return null
-    }
-
-    /**
-     * TODO leverage session PATH.
-     *
-     * @param identifier
-     * @param args
-     * @return
-     */
-    private fun resolveFn(catalog: Catalog, identifier: Identifier, args: List<Rex>): Rex? {
         // 1. Search in the current catalog and namespace.
+        val catalog = default
         val name = identifier.getIdentifier().getText().lowercase() // CASE-NORMALIZED LOWER
         val variants = catalog.getFunctions(session, name).toList()
         if (variants.isEmpty()) {
@@ -208,25 +170,10 @@ internal class Env(private val session: Session) {
     }
 
     fun resolveAgg(path: String, setQuantifier: SetQuantifier, args: List<Rex>): Rel.Op.Aggregate.Call.Resolved? {
-        // Search in SQL Path
-        session.getPath().forEach { catalogName ->
-            // TODO: Allow for referencing schemas within a catalog. For now, only allow top-level functions in a catalog.
-            if (catalogName.getLength() != 1) {
-                return@forEach
-            }
-            val catalog = catalogs.getCatalog(catalogName.first()) ?: return@forEach
-            val agg = resolveAgg(catalog, path, setQuantifier, args)
-            if (agg != null) {
-                return agg
-            }
-        }
-        return null
-    }
-
-    private fun resolveAgg(catalog: Catalog, path: String, setQuantifier: SetQuantifier, args: List<Rex>): Rel.Op.Aggregate.Call.Resolved? {
         // TODO: Eventually, do we want to support sensitive lookup? With a path?
 
         // 1. Search in the current catalog and namespace.
+        val catalog = default
         val name = path.lowercase()
         val candidates = catalog.getAggregations(session, name).toList()
         if (candidates.isEmpty()) {

diff --git a/partiql-planner/src/test/kotlin/org/partiql/planner/PlanTest.kt b/partiql-planner/src/test/kotlin/org/partiql/planner/PlanTest.kt
@@ -11,7 +11,7 @@ import org.partiql.planner.internal.TestCatalog
 import org.partiql.planner.test.PartiQLTest
 import org.partiql.planner.test.PartiQLTestProvider
 import org.partiql.spi.catalog.Name
-import org.partiql.system.PartiQLSessionBuilder
+import org.partiql.spi.catalog.Session
 import org.partiql.types.BagType
 import org.partiql.types.StaticType
 import org.partiql.types.StructType
@@ -66,7 +66,7 @@ class PlanTest {
     )
 
     private val pipeline: (PartiQLTest, Boolean) -> PartiQLPlanner.Result = { test, isSignalMode ->
-        val session = PartiQLSessionBuilder()
+        val session = Session.builder()
             .catalog("default")
             .catalogs(
                 TestCatalog.builder()

diff --git a/partiql-planner/src/test/kotlin/org/partiql/planner/PlannerPErrorReportingTests.kt b/partiql-planner/src/test/kotlin/org/partiql/planner/PlannerPErrorReportingTests.kt
@@ -12,8 +12,8 @@ import org.partiql.planner.util.PErrorCollector
 import org.partiql.planner.util.PlanPrinter
 import org.partiql.spi.Context
 import org.partiql.spi.catalog.Catalog
+import org.partiql.spi.catalog.Session
 import org.partiql.spi.catalog.Table
-import org.partiql.system.PartiQLSessionBuilder
 import org.partiql.types.BagType
 import org.partiql.types.Field
 import org.partiql.types.PType
@@ -38,7 +38,7 @@ internal class PlannerPErrorReportingTests {
         .define(Table.empty("struct_with_missing", PType.row(listOf(Field.of("f1", PType.smallint())))))
         .build()
 
-    private val session = PartiQLSessionBuilder()
+    private val session = Session.builder()
         .catalog(catalogName)
         .catalogs(catalog)
         .build()

diff --git a/partiql-planner/src/test/kotlin/org/partiql/planner/internal/exclude/SubsumptionTest.kt b/partiql-planner/src/test/kotlin/org/partiql/planner/internal/exclude/SubsumptionTest.kt
@@ -17,7 +17,7 @@ import org.partiql.plan.rex.RexSelect
 import org.partiql.plan.rex.RexVar
 import org.partiql.planner.PartiQLPlanner
 import org.partiql.spi.catalog.Catalog
-import org.partiql.system.PartiQLSessionBuilder
+import org.partiql.spi.catalog.Session
 import java.util.stream.Stream
 import kotlin.test.assertEquals
 
@@ -41,7 +41,7 @@ class SubsumptionTest {
         val parseResult = parser.parse(text)
         assertEquals(1, parseResult.statements.size)
         val statement = parseResult.statements[0]
-        val session = PartiQLSessionBuilder().catalog("default").catalogs(catalog).build()
+        val session = Session.builder().catalog("default").catalogs(catalog).build()
         val plan = planner.plan(statement, session).plan
         val excludeClause = getExcludeClause(plan.getOperation()).getExclusions()
         assertEquals(tc.expectedExcludeExprs, excludeClause)

diff --git a/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/PartiQLTyperTestBase.kt b/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/PartiQLTyperTestBase.kt
@@ -16,7 +16,6 @@ import org.partiql.spi.catalog.Session
 import org.partiql.spi.catalog.Table
 import org.partiql.spi.errors.PError
 import org.partiql.spi.errors.PErrorListener
-import org.partiql.system.PartiQLSessionBuilder
 import org.partiql.types.PType
 import org.partiql.types.StaticType
 import org.partiql.types.fromStaticType
@@ -43,7 +42,7 @@ abstract class PartiQLTyperTestBase {
         public val planner = PartiQLPlanner.standard()
 
         internal val session: ((String, Catalog) -> Session) = { catalog, metadata ->
-            PartiQLSessionBuilder()
+            Session.builder()
                 .catalog(catalog)
                 .catalogs(metadata)
                 .build()

diff --git a/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/PlanTyperTest.kt b/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/PlanTyperTest.kt
@@ -21,8 +21,8 @@ import org.partiql.planner.util.PErrorCollector
 import org.partiql.spi.Context
 import org.partiql.spi.catalog.Identifier
 import org.partiql.spi.catalog.Name
+import org.partiql.spi.catalog.Session
 import org.partiql.spi.catalog.Table
-import org.partiql.system.PartiQLSessionBuilder
 import org.partiql.types.PType
 import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.int32Value
@@ -120,7 +120,7 @@ class PlanTyperTest {
         private fun getTyper(): PlanTyperWrapper {
             val config = Context.of(PErrorCollector())
             val env = Env(
-                PartiQLSessionBuilder()
+                Session.builder()
                     .catalog("pql")
                     .namespace("main")
                     .catalogs(

diff --git a/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/PlanTyperTestsPorted.kt b/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/PlanTyperTestsPorted.kt
@@ -32,7 +32,6 @@ import org.partiql.spi.catalog.Name
 import org.partiql.spi.catalog.Session
 import org.partiql.spi.errors.PError
 import org.partiql.spi.errors.PErrorListener
-import org.partiql.system.PartiQLSessionBuilder
 import org.partiql.types.BagType
 import org.partiql.types.DecimalType
 import org.partiql.types.Field
@@ -3825,7 +3824,7 @@ internal class PlanTyperTestsPorted {
     }
 
     private fun runTest(tc: SuccessTestCase) {
-        val session = PartiQLSessionBuilder()
+        val session = Session.builder()
             .catalog(tc.catalog)
             .catalogs(*catalogs.toTypedArray())
             .namespace(tc.catalogPath)
@@ -3868,7 +3867,7 @@ internal class PlanTyperTestsPorted {
     }
 
     private fun runTest(tc: ErrorTestCase) {
-        val session = PartiQLSessionBuilder()
+        val session = Session.builder()
             .catalog(tc.catalog)
             .catalogs(*catalogs.toTypedArray())
             .namespace(tc.catalogPath)
@@ -3912,7 +3911,7 @@ internal class PlanTyperTestsPorted {
     }
 
     private fun runTest(tc: ThrowingExceptionTestCase) {
-        val session = PartiQLSessionBuilder()
+        val session = Session.builder()
             .catalog(tc.catalog)
             .catalogs(*catalogs.toTypedArray())
             .namespace(tc.catalogPath)

diff --git a/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/ScopeTest.kt b/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/ScopeTest.kt
@@ -10,7 +10,7 @@ import org.partiql.planner.internal.ir.relBinding
 import org.partiql.planner.internal.typer.PlanTyper.Companion.toCType
 import org.partiql.spi.catalog.Catalog
 import org.partiql.spi.catalog.Identifier
-import org.partiql.system.PartiQLSessionBuilder
+import org.partiql.spi.catalog.Session
 import org.partiql.types.PType
 import kotlin.test.assertEquals
 import kotlin.test.fail
@@ -36,7 +36,7 @@ internal class ScopeTest {
         @JvmStatic
         val locals = TypeEnv(
             Env(
-                PartiQLSessionBuilder()
+                Session.builder()
                     .catalog("currentCatalog")
                     .catalogs(catalog)
                     .build()

diff --git a/partiql-spi/api/partiql-spi.api b/partiql-spi/api/partiql-spi.api
@@ -202,7 +202,6 @@ public final class org/partiql/spi/catalog/Namespace : java/lang/Iterable, kotli
 	public synthetic fun <init> ([Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun append ([Ljava/lang/String;)Lorg/partiql/spi/catalog/Namespace;
 	public final fun asIdentifier ()Lorg/partiql/spi/catalog/Identifier;
-	public static final fun empty ()Lorg/partiql/spi/catalog/Namespace;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun forEach (Ljava/util/function/Consumer;)V
 	public final fun get (I)Ljava/lang/String;
@@ -262,6 +261,7 @@ public final class org/partiql/spi/catalog/Session$Builder {
 	public final fun namespace (Lorg/partiql/spi/catalog/Namespace;)Lorg/partiql/spi/catalog/Session$Builder;
 	public final fun namespace ([Ljava/lang/String;)Lorg/partiql/spi/catalog/Session$Builder;
 	public final fun property (Ljava/lang/String;Ljava/lang/String;)Lorg/partiql/spi/catalog/Session$Builder;
+	public final fun systemCatalog (Lorg/partiql/spi/catalog/Catalog;)Lorg/partiql/spi/catalog/Session$Builder;
 }
 
 public final class org/partiql/spi/catalog/Session$Companion {

diff --git a/.../partiql/system/PartiQLSystemCatalog.java → ...iql/spi/catalog/PartiQLSystemCatalog.java b/.../partiql/system/PartiQLSystemCatalog.java → ...iql/spi/catalog/PartiQLSystemCatalog.java
@@ -1,23 +1,22 @@
-package org.partiql.system;
+package org.partiql.spi.catalog;
 
-import lombok.EqualsAndHashCode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.partiql.spi.catalog.Catalog;
-import org.partiql.spi.catalog.Identifier;
-import org.partiql.spi.catalog.Name;
-import org.partiql.spi.catalog.Session;
-import org.partiql.spi.catalog.Table;
 import org.partiql.spi.function.Aggregation;
+import org.partiql.spi.function.Builtins;
 import org.partiql.spi.function.Function;
 
 import java.util.Collection;
 
 /**
- * This is a package-private class that implements the PartiQL System Catalog.
+ * <p>
+ * This implements the PartiQL System Catalog.
+ * </p>
+ * <p>
  * It provides the implementation for the PartiQL System Catalog, which is a built-in catalog
  * that provides access to the PartiQL language and its built-in functions and aggregations.
- * @see PartiQLSessionBuilder
+ * </p>
+ * @see Session.Builder
  */
 final class PartiQLSystemCatalog implements Catalog {