Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fix; json displayed better #11

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bug fix; json displayed better #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ad59be
Fixed bug in tree rendering. JSON is now pretty printed
rohit-nayak-ps Jan 10, 2020
520e7b9
Removed comment
rohit-nayak-ps Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 36 additions & 16 deletions etcd-dump/etcd_dump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/golang/protobuf/proto"
"github.com/pkg/browser"
"go.etcd.io/etcd/clientv3"
"html"
"io/ioutil"
"strings"
"time"
Expand Down Expand Up @@ -37,7 +36,7 @@ var (
"Tablet":&topodata.Tablet{},
"VSchema":&vschema.Keyspace{},
}

divIndex = 0
)

var css = `
Expand Down Expand Up @@ -81,6 +80,13 @@ ul, #root {
.active {
display: block;
}
.jsonview {
display:inline-block;
font-size:12px;
background:#fafafa;
padding-left:1px;padding-right:1px;
}

</style>`

var js = `
Expand Down Expand Up @@ -130,7 +136,6 @@ func store(tree *Tree, key string, value string ) {
typeString := paths[len(paths)-1]
if unicode.IsUpper(rune(typeString[0])) {
value = decodeProtoBuf(typeString, []byte(value))
value = html.EscapeString(value)
}

paths = append(paths, value)
Expand Down Expand Up @@ -188,21 +193,32 @@ func flatten(tree *Tree) ([]Item, int) {
if level > maxLevel {
maxLevel = level
}

}
tree.root.traverse(0, callback)
for idx, item := range list {
if idx != len(list) -1 {
list[idx].next = list[idx+1].level - item.level
if list[idx].next < -1 {
list[idx].next = -1
}
}
}
return list, maxLevel
}

func fixupJson (val string) string {
val = strings.TrimSpace(val)
divIndex++
if strings.Index(val, "{") == 0 {
return fmt.Sprintf("<div id='json%d' class=jsonview></div><script>$('#json%d').JSONView('%s')</script>", divIndex, divIndex, val)
}
return val
}

func toHtml(list []Item) string {
html := "<html><body><h1>etcd: dump of all keys</h1>\n"
html := "<html>\n<head>\n"
html += "<link rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/jquery-jsonview/1.2.3/jquery.jsonview.min.css' />\n"
html += "<script type='text/javascript' src='http://code.jquery.com/jquery.min.js'></script>\n"
html += "<script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/jquery-jsonview/1.2.3/jquery.jsonview.min.js'></script>\n"
html += "</head><body><h1>Vitess Topology</h1>\n"
html += css
html += "<a href='javascript:all(true)' style='text-decoration:none'>Expand All</a>&nbsp;&nbsp;&nbsp;&nbsp;"
html += "<a href='javascript:all(false)' style='text-decoration:none'>Collapse All</a>\n"
Expand All @@ -218,25 +234,29 @@ func toHtml(list []Item) string {
}
push("</ul>")
for _, item := range list {
val := fixupJson(item.name)
switch item.next {
case 1:
html += "<li><span class='caret'>" + item.name + "</span>\n"
html += "<ul class='nested'>\n"
html += "<li><span class='caret'>" + val + "</span>\n<ul class='nested'>\n"
push("</ul></li>")
break
case 0:
html += "<li>"+item.name+"</li>"
break
case -1:
html += "<li>"+item.name+"</li>"
html += pop()
html += "<li>" + val + "</li>\n"
break
default:
panic(fmt.Sprintf("Invalid item.next %d", item.next))

if item.next > 1 {
panic("For increasing depth, next node has to be at the same level or immediately below")
}
html += "<li>" + val + "</li>\n"
n := -1 * item.next
for i := 0; i < n; i++ {
html += pop()
}
break
}
}
return html + js
return html + js + "<script>all(true)</script>\n</body>\n</html>\n"
}

func main() {
Expand Down
199 changes: 0 additions & 199 deletions etcd-dump/rohit.html
View file
Open in desktop

This file was deleted.