fix:(ast) SortKeys(true) panic when not loaded-all (#603)

bytedance · Feb 28, 2024 · 3739ffe · 3739ffe
1 parent 618834f
commit 3739ffe
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/ast/buffer.go b/ast/buffer.go
@@ -351,7 +351,7 @@ func (self *linkedPairs) Swap(i, j int) {
 }
 
 func (self *linkedPairs) Sort() {
-    sort.Sort(self)
+    sort.Stable(self)
 }
 
 // Compare two strings from the pos d.

diff --git a/ast/node.go b/ast/node.go
@@ -971,7 +971,7 @@ func (self *Node) SortKeys(recurse bool) error {
     }
     if self.itype() == types.V_OBJECT {
         return self.sortKeys(recurse)
-    } else {
+    } else if self.itype() == types.V_ARRAY {
         var err error
         err2 := self.ForEach(func(path Sequence, node *Node) bool {
             it := node.itype()
@@ -987,10 +987,16 @@ func (self *Node) SortKeys(recurse bool) error {
             return err
         }
         return err2
+    } else {
+        return nil
     }
 }
 
 func (self *Node) sortKeys(recurse bool) (err error) {
+    // check raw node first
+    if err := self.checkRaw(); err != nil {
+        return err
+    }
     ps, err := self.unsafeMap()
     if err != nil {
         return err

diff --git a/ast/node_test.go b/ast/node_test.go
@@ -86,9 +86,9 @@ func BenchmarkNodeSortKeys(b *testing.B) {
     if err != nil {
         b.Fatal(err)
     }
-    if err := root.LoadAll(); err != nil {
-        b.Fatal(err)
-    }
+    // if err := root.LoadAll(); err != nil {
+    //     b.Fatal(err)
+    // }
 
     b.Run("single", func(b *testing.B) {
         r := root.Get("statuses")
@@ -110,6 +110,28 @@ func BenchmarkNodeSortKeys(b *testing.B) {
     })
 }
 
+func TestNodeSortKeys2(t *testing.T) {
+    root, err := NewSearcher(_TwitterJson).GetByPath()
+    if err != nil {
+        t.Fatal(err)
+    }
+    // if err := root.LoadAll(); err != nil {
+    //     b.Fatal(err)
+    // }
+    t.Run("single", func(t *testing.T) {
+        r := root.Get("statuses")
+        if r.Check() != nil {
+            t.Fatal(r.Error())
+        }
+        require.NoError(t, root.SortKeys(false))
+    })
+    t.Run("recurse", func(t *testing.T) {
+        require.NoError(t, root.SortKeys(true))
+    })
+}
+
+
+
 //go:noinline
 func stackObj() interface{} {
     var a int = 1