Skip to content

Commit bb98e3a

Browse files
- Tests passing, soon big changes.
1 parent db133f0 commit bb98e3a

13 files changed

+1311
-1028
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/spf13/cobra v1.4.0
2020
github.com/spf13/pflag v1.0.5
2121
github.com/spf13/viper v1.10.1
22-
github.com/stackql/any-sdk v0.0.6-alpha18
22+
github.com/stackql/any-sdk v0.1.1-alpha02
2323
github.com/stackql/go-suffix-map v0.0.1-alpha01
2424
github.com/stackql/psql-wire v0.1.1-alpha07
2525
github.com/stackql/stackql-parser v0.0.14-alpha05

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
482482
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
483483
github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk=
484484
github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
485-
github.com/stackql/any-sdk v0.0.6-alpha18 h1:JLbmmlQ9dEfmeX1qPLaqkLkQ7WLmq5Fc5wmNgiiHOB4=
486-
github.com/stackql/any-sdk v0.0.6-alpha18/go.mod h1:4jYKpPoX2GWEK+qBnlGLvr8SUfndiYwHMIkg1dn9tFM=
485+
github.com/stackql/any-sdk v0.1.1-alpha02 h1:4KtB2mZ1nHig69wI/GZlKcr/c08va4JY4m+HK0UWLVw=
486+
github.com/stackql/any-sdk v0.1.1-alpha02/go.mod h1:4jYKpPoX2GWEK+qBnlGLvr8SUfndiYwHMIkg1dn9tFM=
487487
github.com/stackql/go-suffix-map v0.0.1-alpha01 h1:TDUDS8bySu41Oo9p0eniUeCm43mnRM6zFEd6j6VUaz8=
488488
github.com/stackql/go-suffix-map v0.0.1-alpha01/go.mod h1:QAi+SKukOyf4dBtWy8UMy+hsXXV+yyEE4vmBkji2V7g=
489489
github.com/stackql/psql-wire v0.1.1-alpha07 h1:LQWVUlx4Bougk6dztDNG5tmXxpIVeeTSsInTj801xCs=

internal/stackql/planbuilder/plan_builder.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ func (pgb *standardPlanGraphBuilder) handleDelete(pbi planbuilderinput.PlanBuild
637637
}
638638
return nil
639639
}
640-
pr := primitive.NewHTTPRestPrimitive(nil, nil, nil, nil, primitive_context.NewPrimitiveContext())
640+
pr := primitive.NewGenericPrimitive(nil, nil, nil, nil, primitive_context.NewPrimitiveContext())
641641
pgb.planGraphHolder.CreatePrimitiveNode(pr)
642642
return nil
643643
}
@@ -926,7 +926,7 @@ func (pgb *standardPlanGraphBuilder) handleInsert(pbi planbuilderinput.PlanBuild
926926
}
927927
return nil
928928
}
929-
pr := primitive.NewHTTPRestPrimitive(nil, nil, nil, nil, primitive_context.NewPrimitiveContext())
929+
pr := primitive.NewGenericPrimitive(nil, nil, nil, nil, primitive_context.NewPrimitiveContext())
930930
pgb.planGraphHolder.CreatePrimitiveNode(pr)
931931
return nil
932932
}
@@ -991,7 +991,7 @@ func (pgb *standardPlanGraphBuilder) handleUpdate(pbi planbuilderinput.PlanBuild
991991
}
992992
return nil
993993
}
994-
pr := primitive.NewHTTPRestPrimitive(nil, nil, nil, nil, primitive_context.NewPrimitiveContext())
994+
pr := primitive.NewGenericPrimitive(nil, nil, nil, nil, primitive_context.NewPrimitiveContext())
995995
pgb.planGraphHolder.CreatePrimitiveNode(pr)
996996
return nil
997997
}
@@ -1034,7 +1034,7 @@ func (pgb *standardPlanGraphBuilder) handleExec(pbi planbuilderinput.PlanBuilder
10341034
}
10351035
return nil
10361036
}
1037-
pr := primitive.NewHTTPRestPrimitive(nil, nil, nil, nil, primitive_context.NewPrimitiveContext())
1037+
pr := primitive.NewGenericPrimitive(nil, nil, nil, nil, primitive_context.NewPrimitiveContext())
10381038
pgb.planGraphHolder.CreatePrimitiveNode(pr)
10391039
return nil
10401040
}

internal/stackql/primitive/http_rest_primitive.go renamed to internal/stackql/primitive/generic_primitive.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/stackql/stackql/internal/stackql/provider"
1010
)
1111

12-
type HTTPRestPrimitive struct {
12+
type GenericPrimitive struct {
1313
Provider provider.IProvider
1414
Executor func(pc IPrimitiveCtx) internaldto.ExecutorOutput
1515
Preparator func() drm.PreparedStatementCtx
@@ -23,14 +23,14 @@ type HTTPRestPrimitive struct {
2323
debugName string
2424
}
2525

26-
func NewHTTPRestPrimitive(
26+
func NewGenericPrimitive(
2727
provider provider.IProvider,
2828
executor func(pc IPrimitiveCtx) internaldto.ExecutorOutput,
2929
preparator func() drm.PreparedStatementCtx,
3030
txnCtrlCtr internaldto.TxnControlCounters,
3131
primitiveCtx primitive_context.IPrimitiveCtx,
3232
) IPrimitive {
33-
return &HTTPRestPrimitive{
33+
return &GenericPrimitive{
3434
Provider: provider,
3535
Executor: executor,
3636
Preparator: preparator,
@@ -41,52 +41,52 @@ func NewHTTPRestPrimitive(
4141
}
4242
}
4343

44-
func (pr *HTTPRestPrimitive) WithDebugName(name string) IPrimitive {
44+
func (pr *GenericPrimitive) WithDebugName(name string) IPrimitive {
4545
pr.debugName = name
4646
return pr
4747
}
4848

49-
func (pr *HTTPRestPrimitive) SetUndoLog(log binlog.LogEntry) {
49+
func (pr *GenericPrimitive) SetUndoLog(log binlog.LogEntry) {
5050
pr.undoLog = log
5151
}
5252

53-
func (pr *HTTPRestPrimitive) SetRedoLog(log binlog.LogEntry) {
53+
func (pr *GenericPrimitive) SetRedoLog(log binlog.LogEntry) {
5454
pr.redoLog = log
5555
}
5656

57-
func (pr *HTTPRestPrimitive) GetRedoLog() (binlog.LogEntry, bool) {
57+
func (pr *GenericPrimitive) GetRedoLog() (binlog.LogEntry, bool) {
5858
return pr.redoLog, pr.redoLog != nil
5959
}
6060

61-
func (pr *HTTPRestPrimitive) GetUndoLog() (binlog.LogEntry, bool) {
61+
func (pr *GenericPrimitive) GetUndoLog() (binlog.LogEntry, bool) {
6262
return pr.undoLog, pr.undoLog != nil
6363
}
6464

65-
func (pr *HTTPRestPrimitive) SetTxnID(id int) {
65+
func (pr *GenericPrimitive) SetTxnID(id int) {
6666
if pr.TxnControlCtr != nil {
6767
pr.TxnControlCtr.SetTxnID(id)
6868
}
6969
}
7070

71-
func (pr *HTTPRestPrimitive) IsReadOnly() bool {
71+
func (pr *GenericPrimitive) IsReadOnly() bool {
7272
return pr.isReadOnly
7373
}
7474

75-
func (pr *HTTPRestPrimitive) IncidentData(fromID int64, input internaldto.ExecutorOutput) error {
75+
func (pr *GenericPrimitive) IncidentData(fromID int64, input internaldto.ExecutorOutput) error {
7676
pr.Inputs[fromID] = input
7777
return nil
7878
}
7979

80-
func (pr *HTTPRestPrimitive) SetInputAlias(alias string, id int64) error {
80+
func (pr *GenericPrimitive) SetInputAlias(alias string, id int64) error {
8181
pr.InputAliases[alias] = id
8282
return nil
8383
}
8484

85-
func (pr *HTTPRestPrimitive) Optimise() error {
85+
func (pr *GenericPrimitive) Optimise() error {
8686
return nil
8787
}
8888

89-
func (pr *HTTPRestPrimitive) GetInputFromAlias(alias string) (internaldto.ExecutorOutput, bool) {
89+
func (pr *GenericPrimitive) GetInputFromAlias(alias string) (internaldto.ExecutorOutput, bool) {
9090
var rv internaldto.ExecutorOutput
9191
key, keyExists := pr.InputAliases[alias]
9292
if !keyExists {
@@ -99,7 +99,7 @@ func (pr *HTTPRestPrimitive) GetInputFromAlias(alias string) (internaldto.Execut
9999
return input, true
100100
}
101101

102-
func (pr *HTTPRestPrimitive) Execute(pc IPrimitiveCtx) internaldto.ExecutorOutput {
102+
func (pr *GenericPrimitive) Execute(pc IPrimitiveCtx) internaldto.ExecutorOutput {
103103
if pr.Executor != nil {
104104
logging.GetLogger().Debugf("running HTTP rest primitive %s", pr.debugName)
105105
op := pr.Executor(pc)
@@ -108,11 +108,11 @@ func (pr *HTTPRestPrimitive) Execute(pc IPrimitiveCtx) internaldto.ExecutorOutpu
108108
return internaldto.NewExecutorOutput(nil, nil, nil, nil, nil)
109109
}
110110

111-
func (pr *HTTPRestPrimitive) ID() int64 {
111+
func (pr *GenericPrimitive) ID() int64 {
112112
return pr.id
113113
}
114114

115-
func (pr *HTTPRestPrimitive) SetExecutor(ex func(pc IPrimitiveCtx) internaldto.ExecutorOutput) error {
115+
func (pr *GenericPrimitive) SetExecutor(ex func(pc IPrimitiveCtx) internaldto.ExecutorOutput) error {
116116
pr.Executor = ex
117117
return nil
118118
}

internal/stackql/primitivebuilder/delete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (ss *Delete) Build() error {
164164
ss.handlerCtx.GetTypingConfig(),
165165
)
166166
}
167-
deletePrimitive := primitive.NewHTTPRestPrimitive(
167+
deletePrimitive := primitive.NewGenericPrimitive(
168168
prov,
169169
ex,
170170
nil,

internal/stackql/primitivebuilder/exec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func (ss *Exec) Build() error {
163163
ss.handlerCtx.GetTypingConfig(),
164164
)
165165
}
166-
execPrimitive := primitive.NewHTTPRestPrimitive(
166+
execPrimitive := primitive.NewGenericPrimitive(
167167
prov,
168168
ex,
169169
nil,

internal/stackql/primitivebuilder/generic_http_reversal.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (gh *genericHTTPReversal) Build() error {
112112
commentDirectives := gh.commentDirectives
113113
isAwait := gh.isAwait
114114
_, _, responseAnalysisErr := m.GetResponseBodySchemaAndMediaType()
115-
actionPrimitive := primitive.NewHTTPRestPrimitive(
115+
actionPrimitive := primitive.NewGenericPrimitive(
116116
prov,
117117
nil,
118118
nil,
@@ -236,7 +236,7 @@ func (gh *genericHTTPReversal) Build() error {
236236
}
237237
for _, eI := range nullaryExecutors {
238238
execInstance := eI
239-
dependentInsertPrimitive := primitive.NewHTTPRestPrimitive(
239+
dependentInsertPrimitive := primitive.NewGenericPrimitive(
240240
prov,
241241
nil,
242242
nil,

internal/stackql/primitivebuilder/generic_http_stream_input.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func (gh *genericHTTPStreamInput) Build() error {
189189
// inverseBuilder :=
190190
}
191191
_, _, responseAnalysisErr := tbl.GetResponseSchemaAndMediaType()
192-
actionPrimitive := primitive.NewHTTPRestPrimitive(
192+
actionPrimitive := primitive.NewGenericPrimitive(
193193
prov,
194194
nil,
195195
nil,
@@ -341,7 +341,7 @@ func (gh *genericHTTPStreamInput) Build() error {
341341
}
342342
for _, eI := range nullaryExecutors {
343343
execInstance := eI
344-
dependentInsertPrimitive := primitive.NewHTTPRestPrimitive(
344+
dependentInsertPrimitive := primitive.NewGenericPrimitive(
345345
prov,
346346
nil,
347347
nil,

internal/stackql/primitivebuilder/graphql_single_select_acquire.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func (ss *GraphQLSingleSelectAcquire) Build() error {
199199
prep := func() drm.PreparedStatementCtx {
200200
return ss.insertPreparedStatementCtx
201201
}
202-
insertPrim := primitive.NewHTTPRestPrimitive(
202+
insertPrim := primitive.NewGenericPrimitive(
203203
prov,
204204
ex,
205205
prep,

0 commit comments

Comments
 (0)