Merge 055b898 into a54f6ad

.gitignore

@@ -6,7 +6,7 @@ build
 ~$*
 .gradle
 out/
-
+partiql-parser/src/main/gen
 
 # Created by https://www.toptal.com/developers/gitignore/api/vim,git,java,emacs,kotlin,eclipse,intellij+all,macos
 # Edit at https://www.toptal.com/developers/gitignore?templates=vim,git,java,emacs,kotlin,eclipse,intellij+all,macos

partiql-cli/src/main/kotlin/org/partiql/cli/pipeline/Pipeline.kt

@@ -7,7 +7,7 @@ import org.partiql.errors.ProblemSeverity
 import org.partiql.eval.PartiQLEngine
 import org.partiql.eval.PartiQLResult
 import org.partiql.parser.PartiQLParser
-import org.partiql.plan.PartiQLPlan
+import org.partiql.plan.v1.PartiQLPlan
 import org.partiql.planner.PartiQLPlanner
 import org.partiql.spi.connector.Connector
 import java.time.Instant
@@ -41,11 +41,6 @@ internal class Pipeline private constructor(
             .catalog(currentCatalog)
             .catalogs(*catalogs.toTypedArray())
             .build()
-
-        fun engine() = PartiQLEngine.Session(
-            catalogs = connectors,
-            mode = mode
-        )
     }
 
     /**
@@ -69,12 +64,13 @@ internal class Pipeline private constructor(
         if (errors.isNotEmpty()) {
             throw RuntimeException(errors.joinToString())
         }
-        return result.plan
+        TODO("Add V1 planner to the CLI")
     }
 
     private fun execute(plan: PartiQLPlan, session: Session): PartiQLResult {
-        val statement = engine.prepare(plan, session.engine())
-        return engine.execute(statement)
+        // val statement = engine.prepare(plan, session.mode, session.planner())
+        // return engine.execute(statement)
+        TODO("Add V1 planner to the CLI")
     }
 
     private class ProblemListener : ProblemCallback {
@@ -91,14 +87,14 @@ internal class Pipeline private constructor(
         fun default(): Pipeline {
             val parser = PartiQLParser.default()
             val planner = PartiQLPlanner.standard()
-            val engine = PartiQLEngine.default()
+            val engine = PartiQLEngine.standard()
             return Pipeline(parser, planner, engine)
         }
 
         fun strict(): Pipeline {
             val parser = PartiQLParser.default()
             val planner = PartiQLPlanner.builder().signal().build()
-            val engine = PartiQLEngine.default()
+            val engine = PartiQLEngine.standard()
             return Pipeline(parser, planner, engine)
         }
     }

partiql-eval/api/partiql-eval.api

@@ -1,14 +1,13 @@
 public abstract interface class org/partiql/eval/PartiQLEngine {
 	public static final field Companion Lorg/partiql/eval/PartiQLEngine$Companion;
-	public static fun builder ()Lorg/partiql/eval/PartiQLEngineBuilder;
-	public static fun default ()Lorg/partiql/eval/PartiQLEngine;
-	public abstract fun execute (Lorg/partiql/eval/PartiQLStatement;)Lorg/partiql/eval/PartiQLResult;
-	public abstract fun prepare (Lorg/partiql/plan/PartiQLPlan;Lorg/partiql/eval/PartiQLEngine$Session;)Lorg/partiql/eval/PartiQLStatement;
+	public static fun builder ()Lorg/partiql/eval/builder/PartiQLEngineBuilder;
+	public abstract fun prepare (Lorg/partiql/plan/v1/PartiQLPlan;Lorg/partiql/eval/PartiQLEngine$Mode;Lorg/partiql/planner/catalog/Session;)Lorg/partiql/eval/PartiQLStatement;
+	public static fun standard ()Lorg/partiql/eval/PartiQLEngine;
 }
 
 public final class org/partiql/eval/PartiQLEngine$Companion {
-	public final fun builder ()Lorg/partiql/eval/PartiQLEngineBuilder;
-	public final fun default ()Lorg/partiql/eval/PartiQLEngine;
+	public final fun builder ()Lorg/partiql/eval/builder/PartiQLEngineBuilder;
+	public final fun standard ()Lorg/partiql/eval/PartiQLEngine;
 }
 
 public final class org/partiql/eval/PartiQLEngine$Mode : java/lang/Enum {
@@ -18,19 +17,6 @@ public final class org/partiql/eval/PartiQLEngine$Mode : java/lang/Enum {
 	public static fun values ()[Lorg/partiql/eval/PartiQLEngine$Mode;
 }
 
-public final class org/partiql/eval/PartiQLEngine$Session {
-	public fun <init> ()V
-	public fun <init> (Ljava/util/Map;Lorg/partiql/eval/PartiQLEngine$Mode;)V
-	public synthetic fun <init> (Ljava/util/Map;Lorg/partiql/eval/PartiQLEngine$Mode;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun getCatalogs ()Ljava/util/Map;
-	public final fun getMode ()Lorg/partiql/eval/PartiQLEngine$Mode;
-}
-
-public final class org/partiql/eval/PartiQLEngineBuilder {
-	public fun <init> ()V
-	public final fun build ()Lorg/partiql/eval/PartiQLEngine;
-}
-
 public abstract interface class org/partiql/eval/PartiQLResult {
 }
 
@@ -57,9 +43,11 @@ public final class org/partiql/eval/PartiQLResult$Value : org/partiql/eval/Parti
 }
 
 public abstract interface class org/partiql/eval/PartiQLStatement {
-	public abstract fun execute ()Ljava/lang/Object;
+	public abstract fun execute (Lorg/partiql/planner/catalog/Session;)Lorg/partiql/eval/PartiQLResult;
 }
 
-public abstract interface class org/partiql/eval/PartiQLStatement$Query : org/partiql/eval/PartiQLStatement {
+public final class org/partiql/eval/builder/PartiQLEngineBuilder {
+	public fun <init> ()V
+	public final fun build ()Lorg/partiql/eval/PartiQLEngine;
 }
 

partiql-eval/build.gradle.kts

@@ -38,7 +38,6 @@ dependencies {
     testImplementation(Deps.junitVintage) // Enables JUnit4
 }
 
-// Disabled for partiql-eval project at initialization.
 kotlin {
     explicitApi = null
 }

partiql-eval/src/main/kotlin/org/partiql/eval/PartiQLEngine.kt

@@ -1,7 +1,8 @@
 package org.partiql.eval
 
-import org.partiql.plan.PartiQLPlan
-import org.partiql.spi.connector.Connector
+import org.partiql.eval.builder.PartiQLEngineBuilder
+import org.partiql.plan.v1.PartiQLPlan
+import org.partiql.planner.catalog.Session
 
 /**
  * PartiQL's Experimental Engine.
@@ -17,28 +18,26 @@ import org.partiql.spi.connector.Connector
  * This engine also internalizes the mechanics of the engine itself. Internally, it creates a physical plan to operate on,
  * and it executes directly on that plan. The limited number of APIs exposed in this library is intentional to allow for
  * under-the-hood experimentation by the PartiQL Community.
+ *
+ *
+ * TODO rename PartiQLEngine to PartiQLCompiler as it produces the statement (statement holds its own execution logic).
  */
 public interface PartiQLEngine {
 
-    public fun prepare(plan: PartiQLPlan, session: Session): PartiQLStatement<*>
-
-    // TODO: Pass session variable during statement execution once we finalize data structure for session.
-    public fun execute(statement: PartiQLStatement<*>): PartiQLResult
+    public fun prepare(plan: PartiQLPlan, mode: Mode, session: Session): PartiQLStatement
 
     companion object {
 
         @JvmStatic
         public fun builder(): PartiQLEngineBuilder = PartiQLEngineBuilder()
 
         @JvmStatic
-        fun default() = PartiQLEngineBuilder().build()
+        fun standard() = PartiQLEngineBuilder().build()
     }
 
-    public class Session(
-        val catalogs: Map<String, Connector> = mapOf(),
-        val mode: Mode = Mode.PERMISSIVE
-    )
-
+    /**
+     * TODO move mode to the session ??
+     */
     public enum class Mode {
         PERMISSIVE,
         STRICT // AKA, Type Checking Mode in the PartiQL Specification

partiql-eval/src/main/kotlin/org/partiql/eval/PartiQLStatement.kt

@@ -1,15 +1,11 @@
 package org.partiql.eval
 
-import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
+import org.partiql.planner.catalog.Session
 
 /**
- * Represents a compiled PartiQL Plan ready for execution.
+ * Represents a compiled PartiQL statement ready for execution.
  */
-sealed interface PartiQLStatement<T> {
+public interface PartiQLStatement {
 
-    public fun execute(): T
-
-    @OptIn(PartiQLValueExperimental::class)
-    interface Query : PartiQLStatement<PartiQLValue>
+    public fun execute(session: Session): PartiQLResult
 }

partiql-eval/src/main/kotlin/org/partiql/eval/builder/PartiQLEngineBuilder.kt

@@ -0,0 +1,14 @@
+package org.partiql.eval.builder
+
+import org.partiql.eval.PartiQLEngine
+import org.partiql.eval.internal.SqlEngine
+
+class PartiQLEngineBuilder {
+
+    /**
+     * Build the builder, return an implementation of a [PartiQLEngine]
+     *
+     * @return
+     */
+    public fun build(): PartiQLEngine = SqlEngine()
+}