Merge pull request #33 from mdmarek/update-grid-import

araddon · web-flow · commit 7cbd948c5ba2 · 2016-11-10T11:21:18.000-08:00
Use latest in master of grid pacakge.
diff --git a/frontends/mysqlfe/testmysql/runtestserver.go b/frontends/mysqlfe/testmysql/runtestserver.go
@@ -7,7 +7,7 @@ import (
 
 	u "github.com/araddon/gou"
 	"github.com/bmizerany/assert"
-	"github.com/lytics/grid/natsunit"
+	"github.com/lytics/grid/grid.v2/natsunit"
 	"github.com/lytics/sereno/embeddedetcd"
 
 	// Frontend's side-effect imports
diff --git a/planner/actormaker.go b/planner/actormaker.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	u "github.com/araddon/gou"
-	"github.com/lytics/grid"
+	"github.com/lytics/grid/grid.v2"
 )
 
 var (
diff --git a/planner/executor.go b/planner/executor.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	u "github.com/araddon/gou"
-	"github.com/lytics/grid"
+	"github.com/lytics/grid/grid.v2"
 
 	"github.com/araddon/qlbridge/exec"
 	"github.com/araddon/qlbridge/plan"
diff --git a/planner/plan_server.go b/planner/plan_server.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	u "github.com/araddon/gou"
-	"github.com/lytics/grid"
-	"github.com/lytics/grid/condition"
+	"github.com/lytics/grid/grid.v2"
+	"github.com/lytics/grid/grid.v2/condition"
 	"github.com/lytics/metafora"
 	"github.com/sony/sonyflake"
 
diff --git a/planner/sink_nats.go b/planner/sink_nats.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	u "github.com/araddon/gou"
-	"github.com/lytics/grid"
+	"github.com/lytics/grid/grid.v2"
 
 	"github.com/araddon/qlbridge/datasource"
 	"github.com/araddon/qlbridge/exec"
diff --git a/planner/source_nats.go b/planner/source_nats.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	u "github.com/araddon/gou"
-	"github.com/lytics/grid"
+	"github.com/lytics/grid/grid.v2"
 
 	"github.com/araddon/qlbridge/datasource"
 	"github.com/araddon/qlbridge/exec"
diff --git a/planner/sql_master.go b/planner/sql_master.go
@@ -7,9 +7,9 @@ import (
 	"time"
 
 	u "github.com/araddon/gou"
-	"github.com/lytics/grid"
-	"github.com/lytics/grid/condition"
-	"github.com/lytics/grid/ring"
+	"github.com/lytics/grid/grid.v2"
+	"github.com/lytics/grid/grid.v2/condition"
+	"github.com/lytics/grid/grid.v2/ring"
 
 	"github.com/araddon/qlbridge/exec"
 	"github.com/araddon/qlbridge/plan"
diff --git a/planner/sqlactor.go b/planner/sqlactor.go
@@ -9,8 +9,8 @@ import (
 	u "github.com/araddon/gou"
 
 	"github.com/lytics/dfa"
-	"github.com/lytics/grid"
-	"github.com/lytics/grid/condition"
+	"github.com/lytics/grid/grid.v2"
+	"github.com/lytics/grid/grid.v2/condition"
 
 	"github.com/araddon/qlbridge/datasource"
 	"github.com/araddon/qlbridge/exec"
diff --git a/planner/sqlworker.go b/planner/sqlworker.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	u "github.com/araddon/gou"
-	"github.com/lytics/grid"
-	"github.com/lytics/grid/condition"
+	"github.com/lytics/grid/grid.v2"
+	"github.com/lytics/grid/grid.v2/condition"
 
 	"github.com/araddon/qlbridge/datasource"
 )

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`	`6`	`u "github.com/araddon/gou"`
`7`		`- "github.com/lytics/grid"`
	`7`	`+ "github.com/lytics/grid/grid.v2"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ import (`
`6`	`6`	`"time"`
`7`	`7`
`8`	`8`	`u "github.com/araddon/gou"`
`9`		`- "github.com/lytics/grid"`
`10`		`- "github.com/lytics/grid/condition"`
	`9`	`+ "github.com/lytics/grid/grid.v2"`
	`10`	`+ "github.com/lytics/grid/grid.v2/condition"`
`11`	`11`
`12`	`12`	`"github.com/araddon/qlbridge/datasource"`
`13`	`13`	`)`