#38: Use EVSCL

doc/model/diagrams/class/cl_creation_chain_local.plantuml

@@ -0,0 +1,40 @@
+@startuml
+!pragma layout smetana
+!include ../clean.skin
+set separator none
+
+title: Creation Chain for Local Virtual Schema
+
+package exasol.evscl <<external>> {
+    class LocalMetadataReader
+    class LocalQueryRewriter
+
+}
+
+package exasol.vscl <<external>> {
+    class QueryRenderer
+    class RequestDispatcher
+
+    url of RequestDispatcher is [[../sequence/seq_handle_request.svg]]
+}
+
+package exasol.evsl {
+    class entry <<function>>
+    class ExasolAdapter
+    class QueryRewriterFactory
+    class MetadataReaderFactory
+
+    entry -d-> MetadataReaderFactory : "**1:** create"
+    entry -r-> QueryRewriterFactory : "**2:** create"
+    entry -d-> ExasolAdapter : "**3:** create"
+
+
+    url of entry is [[../sequence/seq_entry.svg]]
+}
+
+entry --> RequestDispatcher : "**4:** create"
+MetadataReaderFactory -d-> LocalMetadataReader : create
+QueryRewriterFactory -d-> LocalQueryRewriter : create
+LocalQueryRewriter -d-> QueryRenderer : create
+
+@enduml

doc/model/diagrams/class/cl_creation_chain.plantuml → doc/model/diagrams/class/cl_creation_chain_remote.plantuml

@@ -3,13 +3,7 @@
 !include ../clean.skin
 set separator none
 
-title: Creation Chain
-
-
-package exasol.evscl <<external>> {
-    class LocalMetadataReader
-    class LocalQueryRewriter
-}
+title: Creation Chain Remote vs
 
 package exasol.evsl {
     class entry <<function>>
@@ -22,8 +16,8 @@ package exasol.evsl {
     entry -d-> MetadataReaderFactory : "**1:** create"
     entry -r-> QueryRewriterFactory : "**2:** create"
     entry -d-> ExasolAdapter : "**3:** create"
-    MetadataReaderFactory -r-> RemoteMetadataReader : "create"
-    QueryRewriterFactory -l-> RemoteQueryRewriter : "create"
+    MetadataReaderFactory -d-> RemoteMetadataReader : "create"
+    QueryRewriterFactory -r-> RemoteQueryRewriter : "create"
 
 
     url of entry is [[../sequence/seq_entry.svg]]
@@ -37,19 +31,6 @@ package exasol.vscl <<external>> {
 }
 
 entry -d-> RequestDispatcher : "**4:** create"
-MetadataReaderFactory --> LocalMetadataReader : create
-QueryRewriterFactory --> LocalQueryRewriter : create
 RemoteQueryRewriter -->  QueryRenderer : create
-LocalQueryRewriter --> QueryRenderer : create
-
-note as N1
-    Factories, adapter and dispatcher are always created at the start.
-
-    Depending on which type of virtual schema and what request is
-   used, the factories either produce a local or the remote
-    variant of the query rewriter and metadata reader.
-end note
-
-exasol.vscl -[hidden]d- N1
 
 @enduml

doc/model/diagrams/sequence/seq_pushdown.plantuml

@@ -8,10 +8,11 @@ title: Query Push-down
 
 participant RequestDispatcher
 participant ExasolAdapter
+participant QueryRewriterFactory
 participant RemoteQueryRewriter
 participant LocalQueryRewriter
+participant ImportQueryBuilder
 participant QueryRenderer
-participant QueryRewriterFactory
 
 activate RequestDispatcher
 RequestDispatcher -> ExasolAdapter : push down (request)
@@ -30,21 +31,30 @@ alt connection provided
     ExasolAdapter -> RemoteQueryRewriter : rewrite (query, schema\nadapter notes, involved table[])
     activate RemoteQueryRewriter
     ref over RemoteQueryRewriter : **[[../activity/act_rewrite.svg rewrite query]]**
+    create ImportQueryBuilder
+    RemoteQueryRewriter -> ImportQueryBuilder : new()
+    activate ImportQueryBuilder
+    ImportQueryBuilder -->> RemoteQueryRewriter : instance
+    deactivate ImportQueryBuilder
+    note over RemoteQueryRewriter, ImportQueryBuilder : Set connection, result column types and query to be wrapped in the import
+    RemoteQueryRewriter -> ImportQueryBuilder : build()
+    activate ImportQueryBuilder
+    ImportQueryBuilder -->> RemoteQueryRewriter : import query
+    deactivate ImportQueryBuilder
     create QueryRenderer
-    RemoteQueryRewriter -> QueryRenderer : new(query)
+    RemoteQueryRewriter -> QueryRenderer : new(import query)
     activate QueryRenderer
     QueryRenderer -->> RemoteQueryRewriter : instance
     deactivate QueryRenderer
     RemoteQueryRewriter -> QueryRenderer : render ()
     activate QueryRenderer
     QueryRenderer -->> RemoteQueryRewriter : query : SQL string
     deactivate QueryRenderer
-    RemoteQueryRewriter -> RemoteQueryRewriter : _wrap_in_import (SQL string)
-    note right : Uses the ""ImportBuilder"".
-    activate RemoteQueryRewriter
-    deactivate RemoteQueryRewriter
     RemoteQueryRewriter --> ExasolAdapter : query : SQL string
     deactivate RemoteQueryRewriter
+    destroy ImportQueryBuilder
+    destroy QueryRenderer
+    destroy RemoteQueryRewriter
 else no connection provided
     ExasolAdapter -> QueryRewriterFactory : create_rewriter()
     activate QueryRewriterFactory
@@ -66,6 +76,8 @@ else no connection provided
     deactivate QueryRenderer
     LocalQueryRewriter --> ExasolAdapter : query : SQL string
     deactivate LocalQueryRewriter
+    destroy QueryRenderer
+    destroy LocalQueryRewriter
 end
 ExasolAdapter -->> RequestDispatcher : wrapped response
 deactivate ExasolAdapter

doc/model/diagrams/sequence/seq_read_remote_schema_metadata.plantuml

@@ -31,7 +31,6 @@ deactivate ConnectionReader
 ConnectionReader -->> RemotedMetadataReader : host, port, user, password
 deactivate ConnectionReader
 
-
 RemotedMetadataReader -> ExasolDriverLua : read schema details (schema)
 activate ExasolDriverLua
 ExasolDriverLua -> ExasolDriverLua : connect (TLS options)