You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by fr...@apache.org on 2017/12/14 10:34:22 UTC
[2/2] calcite-avatica-go git commit: Remove empty slice declaration
via literals
Remove empty slice declaration via literals
Project: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/commit/e3c045c7
Tree: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/tree/e3c045c7
Diff: http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/diff/e3c045c7
Branch: refs/heads/master
Commit: e3c045c78f6a1706f0a3cb4ef551ebd557d0510e
Parents: ff983fb
Author: Francis Chuang <fr...@boostport.com>
Authored: Thu Dec 14 21:18:07 2017 +1100
Committer: Francis Chuang <fr...@boostport.com>
Committed: Thu Dec 14 21:30:32 2017 +1100
----------------------------------------------------------------------
rows.go | 15 ++++++++-------
statement.go | 6 +++---
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/e3c045c7/rows.go
----------------------------------------------------------------------
diff --git a/rows.go b/rows.go
index 1d8e3eb..4083916 100644
--- a/rows.go
+++ b/rows.go
@@ -68,7 +68,7 @@ type rows struct {
// string should be returned for that entry.
func (r *rows) Columns() []string {
- cols := []string{}
+ var cols []string
for _, column := range r.resultSets[r.currentResultSet].columns {
cols = append(cols, column.name)
@@ -118,7 +118,7 @@ func (r *rows) Next(dest []driver.Value) error {
frame := res.(*message.FetchResponse).Frame
- data := [][]*message.TypedValue{}
+ var data [][]*message.TypedValue
// In some cases the server does not return done as true
// until it returns a result with no rows
@@ -127,7 +127,7 @@ func (r *rows) Next(dest []driver.Value) error {
}
for _, row := range frame.Rows {
- rowData := []*message.TypedValue{}
+ var rowData []*message.TypedValue
for _, col := range row.Value {
rowData = append(rowData, col.ScalarValue)
@@ -154,13 +154,14 @@ func (r *rows) Next(dest []driver.Value) error {
// newRows create a new set of rows from a result set.
func newRows(conn *conn, statementID uint32, resultSets []*message.ResultSetResponse) *rows {
- rsets := []*resultSet{}
+ var rsets []*resultSet
for _, result := range resultSets {
if result.Signature == nil {
break
}
- columns := []*column{}
+
+ var columns []*column
for _, col := range result.Signature.Columns {
@@ -243,10 +244,10 @@ func newRows(conn *conn, statementID uint32, resultSets []*message.ResultSetResp
frame := result.FirstFrame
- data := [][]*message.TypedValue{}
+ var data [][]*message.TypedValue
for _, row := range frame.Rows {
- rowData := []*message.TypedValue{}
+ var rowData []*message.TypedValue
for _, col := range row.Value {
rowData = append(rowData, col.ScalarValue)
http://git-wip-us.apache.org/repos/asf/calcite-avatica-go/blob/e3c045c7/statement.go
----------------------------------------------------------------------
diff --git a/statement.go b/statement.go
index ff30fad..a7e0908 100644
--- a/statement.go
+++ b/statement.go
@@ -19,12 +19,12 @@ package avatica
import (
"database/sql/driver"
+ "errors"
"math"
"time"
"github.com/apache/calcite-avatica-go/message"
"golang.org/x/net/context"
- "errors"
)
type stmt struct {
@@ -96,7 +96,7 @@ func (s *stmt) exec(ctx context.Context, args []namedValue) (driver.Result, erro
results := res.(*message.ExecuteResponse).Results
- if len(results) <= 0{
+ if len(results) <= 0 {
return nil, errors.New("empty ResultSet in ExecuteResponse")
}
@@ -146,7 +146,7 @@ func (s *stmt) query(ctx context.Context, args []namedValue) (driver.Rows, error
func (s *stmt) parametersToTypedValues(vals []namedValue) []*message.TypedValue {
- result := []*message.TypedValue{}
+ var result []*message.TypedValue
for i, val := range vals {
typed := message.TypedValue{}