Fix panic when not using a pk

chaisql · Mar 4, 2020 · b4c3131 · b4c3131
1 parent ab6a445
commit b4c3131
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,4 +17,3 @@ script:
   - make
   - make gen
   - go test -v -mod vendor -race -cover -timeout=2m ./...
-  - cd engine/badgerengine && go mod vendor && go test -v -mod vendor -race -cover -timeout=2m ./...
diff --git a/Makefile b/Makefile
@@ -17,10 +17,8 @@ test:
 
 testrace:
 	go test -v -race -cover -timeout=2m ./...
-	cd engine/badgerengine && go test -v -race -cover -timeout=2m ./...
 	cd cmd/genji && go test -v -race -cover -timeout=2m ./...
 
 bench:
 	go test -v -run=^\$$ -benchmem -bench=. ./...
-	cd engine/badgerengine && go test -v -run=^\$$ -benchmem -bench=. ./...
 	cd cmd/genji && go test -v -run=^\$$ -benchmem -bench=. ./...
diff --git a/sql/query/plan.go b/sql/query/plan.go
@@ -145,7 +145,7 @@ func (qo *queryOptimizer) buildQueryPlan() queryPlan {
 		if len(qo.orderBy) != 0 {
 			_, ok := qo.indexes[qo.orderBy.Name()]
 			pk := qo.cfg.GetPrimaryKey()
-			if ok || pk.Path.String() == qo.orderBy.Name() {
+			if ok || (pk != nil && pk.Path.String() == qo.orderBy.Name()) {
 				qp.field = &queryPlanField{
 					indexedField: qo.orderBy,
 					isPrimaryKey: pk.Path.String() == qo.orderBy.Name(),
@@ -184,7 +184,8 @@ func (qo *queryOptimizer) analyseExpr(e Expr) *queryPlanField {
 			}
 		}
 
-		if qo.cfg.GetPrimaryKey().Path.String() == fs.Name() {
+		pk := qo.cfg.GetPrimaryKey()
+		if pk != nil && pk.Path.String() == fs.Name() {
 			return &queryPlanField{
 				indexedField: fs,
 				op:           t.Token,