Merge branch 'feature/upgrade-to-simdjson-3.2.1'

TeskaLabs · Jul 20, 2023 · 17653c3 · 17653c3
2 parents dac95b9 + 2857564
commit 17653c3
Show file tree

Hide file tree

Showing 7 changed files with 11,176 additions and 4,743 deletions.
diff --git a/cysimdjson/cysimdjson.pyx b/cysimdjson/cysimdjson.pyx
@@ -121,7 +121,7 @@ cdef extern from "jsoninter.h":
 	cdef object element_to_py_string(simdjson_element & value) except + simdjson_error_handler
 
 	cdef object 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 *)
 
@@ -461,7 +461,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):

diff --git a/cysimdjson/jsoninter.h b/cysimdjson/jsoninter.h
@@ -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();
 }
 
 

diff --git a/cysimdjson/simdjson/LICENSE b/cysimdjson/simdjson/LICENSE
@@ -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.
@@ -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.
diff --git a/cysimdjson/simdjson/README.md b/cysimdjson/simdjson/README.md
@@ -2,7 +2,7 @@
 
 https://github.com/simdjson
 
-Version v1.0.2
+Version v3.2.1
 
 ## Upgrade instructions:
 

diff --git a/cysimdjson/simdjson/simdjson.cpp b/cysimdjson/simdjson/simdjson.cpp