Skip to content

Commit f8120d4

Browse files
paddyjokch7ck
authored andcommitted
Consistency in error handling (fb-1799) (FeatureBaseDB#2383)
* return 200 once plan compilation starts; if error, return error in response. * removed some commented out code that is definitely not needed. (cherry picked from commit 9dda3ff)
1 parent dfd4bb1 commit f8120d4

File tree

2 files changed

+7
-43
lines changed

2 files changed

+7
-43
lines changed

http_handler.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1420,13 +1420,6 @@ func (h *Handler) handlePostSQL(w http.ResponseWriter, r *http.Request) {
14201420
// put the requestId in the context
14211421
ctx := fbcontext.WithRequestID(r.Context(), requestID.String())
14221422

1423-
sql := string(b)
1424-
rootOperator, err := h.api.CompilePlan(ctx, sql)
1425-
if err != nil {
1426-
h.writeBadRequest(w, r, err)
1427-
return
1428-
}
1429-
14301423
// Write response back to client.
14311424
w.Header().Set("Content-Type", "application/json")
14321425

@@ -1501,6 +1494,13 @@ func (h *Handler) handlePostSQL(w http.ResponseWriter, r *http.Request) {
15011494
}
15021495
}
15031496

1497+
sql := string(b)
1498+
rootOperator, err := h.api.CompilePlan(ctx, sql)
1499+
if err != nil {
1500+
writeError(err, false)
1501+
return
1502+
}
1503+
15041504
// Get a query iterator.
15051505
iter, err := rootOperator.Iterator(ctx, nil)
15061506
if err != nil {

sql3/parser/walk.go

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@ func walk(v Visitor, node Node) (_ Node, err error) {
165165
if err := walkIdent(v, &n.Name); err != nil {
166166
return node, err
167167
}
168-
// if err := walkIdentList(v, n.UpdateOfColumns); err != nil {
169-
// return node, err
170-
// }
171168
for i := range n.Body {
172169
if body, err := walk(v, n.Body[i]); err != nil {
173170
return node, err
@@ -188,15 +185,6 @@ func walk(v Visitor, node Node) (_ Node, err error) {
188185
n.WithClause = nil
189186
}
190187
}
191-
/*for i := range n.ValueLists {
192-
if list, err := walk(v, n.ValueLists[i]); err != nil {
193-
return node, err
194-
} else if list != nil {
195-
n.ValueLists[i] = list.(*ExprList)
196-
} else {
197-
n.ValueLists[i] = nil
198-
}
199-
}*/
200188
for i := range n.Columns {
201189
if col, err := walk(v, n.Columns[i]); err != nil {
202190
return node, err
@@ -289,15 +277,6 @@ func walk(v Visitor, node Node) (_ Node, err error) {
289277
n.Select = nil
290278
}
291279
}*/
292-
/*if n.UpsertClause != nil {
293-
if clause, err := walk(v, n.UpsertClause); err != nil {
294-
return node, err
295-
} else if clause != nil {
296-
n.UpsertClause = clause.(*UpsertClause)
297-
} else {
298-
n.UpsertClause = nil
299-
}
300-
}*/
301280

302281
case *UpdateStatement:
303282
if n.WithClause != nil {
@@ -373,21 +352,6 @@ func walk(v Visitor, node Node) (_ Node, err error) {
373352
if err := walkExpr(v, &n.WhereExpr); err != nil {
374353
return node, err
375354
}
376-
// for i := range n.OrderingTerms {
377-
// if term, err := walk(v, n.OrderingTerms[i]); err != nil {
378-
// return node, err
379-
// } else if term != nil {
380-
// n.OrderingTerms[i] = term.(*OrderingTerm)
381-
// } else {
382-
// n.OrderingTerms[i] = nil
383-
// }
384-
// }
385-
// if err := walkExpr(v, &n.LimitExpr); err != nil {
386-
// return node, err
387-
// }
388-
// if err := walkExpr(v, &n.OffsetExpr); err != nil {
389-
// return node, err
390-
// }
391355

392356
case *PrimaryKeyConstraint:
393357
if err := walkIdent(v, &n.Name); err != nil {

0 commit comments

Comments
 (0)