Merge branch 'master' into exceptop

query/gremlin/finals.go

@@ -208,7 +208,14 @@ func (wk *worker) runIteratorToArrayNoTags(it graph.Iterator, limit int) []strin
 func (wk *worker) runIteratorWithCallback(it graph.Iterator, callback otto.Value, this otto.FunctionCall, limit int) {
 	n := 0
 	it, _ = it.Optimize()
-	glog.V(2).Infoln(it.DebugString(0))
+	if glog.V(2) {
+		b, err := json.MarshalIndent(it.Describe(), "", "  ")
+		if err != nil {
+			glog.V(2).Infof("failed to format description: %v", err)
+		} else {
+			glog.V(2).Infof("%s", b)
+		}
+	}
 	for {
 		select {
 		case <-wk.kill:
@@ -271,7 +278,14 @@ func (wk *worker) runIterator(it graph.Iterator) {
 		return
 	}
 	it, _ = it.Optimize()
-	glog.V(2).Infoln(it.DebugString(0))
+	if glog.V(2) {
+		b, err := json.MarshalIndent(it.Describe(), "", "  ")
+		if err != nil {
+			glog.Infof("failed to format description: %v", err)
+		} else {
+			glog.Infof("%s", b)
+		}
+	}
 	for {
 		select {
 		case <-wk.kill:

query/gremlin/session.go

@@ -210,17 +210,22 @@ func (s *Session) BuildJSON(result interface{}) {
 		if data.val == nil {
 			obj := make(map[string]string)
 			tags := data.actualResults
-			tagKeys := make([]string, len(tags))
-			i := 0
+			var tagKeys []string
 			for k := range tags {
-				tagKeys[i] = k
-				i++
+				tagKeys = append(tagKeys, k)
 			}
 			sort.Strings(tagKeys)
 			for _, k := range tagKeys {
-				obj[k] = s.qs.NameOf(tags[k])
+				name := s.qs.NameOf(tags[k])
+				if name != "" {
+					obj[k] = name
+				} else {
+					delete(obj, k)
+				}
+			}
+			if len(obj) != 0 {
+				s.dataOutput = append(s.dataOutput, obj)
 			}
-			s.dataOutput = append(s.dataOutput, obj)
 		} else {
 			if data.val.IsObject() {
 				export, _ := data.val.Export()