fix: match empty string in path (#387)

bytedance · Mar 19, 2023 · 114b816 · 114b816
1 parent 8dbcce3
commit 114b816
Show file tree

Hide file tree

Showing 8 changed files with 853 additions and 812 deletions.
diff --git a/ast/search_test.go b/ast/search_test.go
@@ -123,6 +123,7 @@ func TestExportErrNotExist(t *testing.T)  {
         // {`{"a":null}`, []interface{}{"a", 0}, ErrNotExist},
         // {`{"a":null}`, []interface{}{"a", "b", 0}, ErrNotExist},
         {`{"":{"b":123}}`, []interface{}{"b"}, ErrNotExist},
+        {`{"":{"b":123}}`, []interface{}{"", ""}, ErrNotExist},
         {`{"a":{"b":123}}`, []interface{}{"b"}, ErrNotExist},
         {`{"a":{"b":123}}`, []interface{}{"a", "c"}, ErrNotExist},
         {`{"a":{"c": null, "b":{}}}`, []interface{}{"a", "b", "c"}, ErrNotExist},
@@ -209,6 +210,8 @@ func TestSearcher_GetByPathSingle(t *testing.T) {
         {`"abc"`, Path{}, "abc", Ok},
         {`"a\"\\bc"`, Path{}, "a\"\\bc", Ok},
         {`{"a":1}`, Path{"a"}, 1.0, Ok},
+        {`{"":1}`, Path{""}, 1.0, Ok},
+        {`{"":{"":1}}`, Path{"", ""}, 1.0, Ok},
         {`[1,2,3]`, Path{0}, 1.0, Ok},
         {`[1,2,3]`, Path{1}, 2.0, Ok},
         {`[1,2,3]`, Path{2}, 3.0, Ok},

diff --git a/internal/native/avx/native_amd64.s b/internal/native/avx/native_amd64.s
diff --git a/internal/native/avx/native_subr_amd64.go b/internal/native/avx/native_subr_amd64.go
diff --git a/internal/native/avx2/native_amd64.s b/internal/native/avx2/native_amd64.s
diff --git a/internal/native/avx2/native_subr_amd64.go b/internal/native/avx2/native_subr_amd64.go
diff --git a/internal/native/sse/native_amd64.s b/internal/native/sse/native_amd64.s
diff --git a/internal/native/sse/native_subr_amd64.go b/internal/native/sse/native_subr_amd64.go
diff --git a/native/scanning.c b/native/scanning.c
@@ -1781,6 +1781,12 @@ static always_inline long match_key(const GoString *src, long *p, const GoString
     /* compare non-escaped strings */
     if (likely(v == -1 || v > se)) {
         long sn = se - si - 1;
+
+        // check empty keys
+        if (!sn && !key.len) {
+            return true;
+        }
+
         return sn == key.len && xmemcmpeq(src->buf + si, key.buf, key.len);
     }