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.

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

Upgrade to simdjson 3.2.1 #44

Merged
merged 2 commits into from
Jul 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions cysimdjson/cysimdjson.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ cdef extern from "jsoninter.h":
cdef object element_to_py_string(simdjson_element & value) except + simdjson_error_handler

cdef PyObject * string_view_to_python_string(string_view & sv)
cdef string get_active_implementation()
cdef string obtain_active_implementation()

cdef const char * PyUnicode_AsUTF8AndSize(object, Py_ssize_t *)

Expand Down Expand Up @@ -462,7 +462,7 @@ cdef class JSONParser:


def active_implementation(JSONParser self):
return get_active_implementation()
return obtain_active_implementation()


cdef public api object cysimdjson_addr_to_element(void * element):
Expand Down
4 changes: 2 additions & 2 deletions cysimdjson/jsoninter.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ inline PyObject * element_to_py_string(dom::element & value) {
}


inline std::string get_active_implementation() {
return simdjson::active_implementation->description();
inline std::string obtain_active_implementation() {
return simdjson::get_active_implementation()->description();
}


Expand Down
4 changes: 2 additions & 2 deletions cysimdjson/simdjson/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2018-2019 The simdjson authors
Copyright 2018-2023 The simdjson authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -198,4 +198,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
2 changes: 1 addition & 1 deletion cysimdjson/simdjson/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

https://github.com/simdjson

Version v1.0.2
Version v3.2.1

## Upgrade instructions:

Expand Down
6,122 changes: 5,013 additions & 1,109 deletions cysimdjson/simdjson/simdjson.cpp

Large diffs are not rendered by default.

Loading