diff options
author | robot-contrib <robot-contrib@yandex-team.com> | 2025-01-30 18:24:10 +0300 |
---|---|---|
committer | robot-contrib <robot-contrib@yandex-team.com> | 2025-01-30 19:01:24 +0300 |
commit | 6e502f2086936c78bd6af6f9435bd2d2ea314247 (patch) | |
tree | 07800bc3ab0233e54b00d090560d1750e6320885 | |
parent | 3ac747f4670e54f1073374b9cfa7ca8fc7c4e89c (diff) | |
download | ydb-6e502f2086936c78bd6af6f9435bd2d2ea314247.tar.gz |
Update contrib/libs/simdjson to 3.12.0
commit_hash:5f96ca9daebed328f88d4f3e02c1505f8bb23034
-rw-r--r-- | contrib/libs/simdjson/.yandex_meta/devtools.copyrights.report | 23 | ||||
-rw-r--r-- | contrib/libs/simdjson/.yandex_meta/devtools.licenses.report | 87 | ||||
-rw-r--r-- | contrib/libs/simdjson/.yandex_meta/licenses.list.txt | 66 | ||||
-rw-r--r-- | contrib/libs/simdjson/.yandex_meta/override.nix | 4 | ||||
-rw-r--r-- | contrib/libs/simdjson/LICENSE | 2 | ||||
-rw-r--r-- | contrib/libs/simdjson/LICENSE-MIT | 18 | ||||
-rw-r--r-- | contrib/libs/simdjson/README.md | 10 | ||||
-rw-r--r-- | contrib/libs/simdjson/include/simdjson/simdjson_version.h | 6 | ||||
-rw-r--r-- | contrib/libs/simdjson/ya.make | 4 |
9 files changed, 178 insertions, 42 deletions
diff --git a/contrib/libs/simdjson/.yandex_meta/devtools.copyrights.report b/contrib/libs/simdjson/.yandex_meta/devtools.copyrights.report index 48e3aa9469..79eb8a74b0 100644 --- a/contrib/libs/simdjson/.yandex_meta/devtools.copyrights.report +++ b/contrib/libs/simdjson/.yandex_meta/devtools.copyrights.report @@ -44,17 +44,6 @@ BELONGS ya.make include/simdjson/internal/instruction_set.h [5:14] src/internal/isadetection.h [5:14] -KEEP COPYRIGHT_SERVICE_LABEL 1ce2e39c07413c844104d4a1610b8621 -BELONGS ya.make - License text: - Copyright 2018-2023 The simdjson authors - Scancode info: - Original SPDX id: COPYRIGHT_SERVICE_LABEL - Score : 100.00 - Match type : COPYRIGHT - Files with this license: - LICENSE [189:189] - KEEP COPYRIGHT_SERVICE_LABEL 2067bdaf1585921cf47dfb0b810c88f7 BELONGS ya.make Note: matched license text is too long. Read it in the source files. @@ -99,6 +88,18 @@ BELONGS ya.make include/simdjson/internal/instruction_set.h [5:14] src/internal/isadetection.h [5:14] +KEEP COPYRIGHT_SERVICE_LABEL 7e2e2b3059e8b51ccc7c129f32aa3c56 +BELONGS ya.make + License text: + Copyright 2018-2025 The simdjson authors + Scancode info: + Original SPDX id: COPYRIGHT_SERVICE_LABEL + Score : 100.00 + Match type : COPYRIGHT + Files with this license: + LICENSE [189:189] + LICENSE-MIT [1:1] + KEEP COPYRIGHT_SERVICE_LABEL abfbab3d484099905de04f84551ac607 BELONGS ya.make Note: matched license text is too long. Read it in the source files. diff --git a/contrib/libs/simdjson/.yandex_meta/devtools.licenses.report b/contrib/libs/simdjson/.yandex_meta/devtools.licenses.report index 8f4e95f877..5ddc509f18 100644 --- a/contrib/libs/simdjson/.yandex_meta/devtools.licenses.report +++ b/contrib/libs/simdjson/.yandex_meta/devtools.licenses.report @@ -42,7 +42,19 @@ BELONGS ya.make Match type : REFERENCE Links : http://www.boost.org/LICENSE_1_0.txt, http://www.boost.org/users/license.html, https://spdx.org/licenses/BSL-1.0 Files with this license: - README.md [227:227] + README.md [233:233] + +KEEP MIT 0a00f0d66f4f37595306dd8c6a25c63c +BELONGS ya.make + License text: + This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html) as well as under the MIT License. As a user, you can pick the license you prefer. + Scancode info: + Original SPDX id: MIT + Score : 100.00 + Match type : NOTICE + Links : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT + Files with this license: + README.md [229:229] SKIP LicenseRef-scancode-unknown-license-reference 0d48e0b09865a98a90db20ea37b36bb8 BELONGS ya.make @@ -54,7 +66,18 @@ BELONGS ya.make Match type : INTRO Links : https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unknown-license-reference.LICENSE Files with this license: - README.md [231:231] + README.md [237:237] + +KEEP Apache-2.0 13ec3cccf3036f38df47d2051a825972 +BELONGS ya.make + Note: matched license text is too long. Read it in the source files. + Scancode info: + Original SPDX id: Apache-2.0 + Score : 99.81 + Match type : TEXT + Links : http://www.apache.org/licenses/, http://www.apache.org/licenses/LICENSE-2.0, https://spdx.org/licenses/Apache-2.0 + Files with this license: + LICENSE [1:201] KEEP BSD-3-Clause 1932361280194a7b208a1a5671cb21a2 BELONGS ya.make @@ -79,7 +102,7 @@ BELONGS ya.make Match type : REFERENCE Links : http://www.apache.org/licenses/, http://www.apache.org/licenses/LICENSE-2.0, https://spdx.org/licenses/Apache-2.0 Files with this license: - README.md [212:212] + README.md [213:213] SKIP BSL-1.0 2a9212d785cde4078c2f6803e544de21 BELONGS ya.make @@ -90,19 +113,31 @@ BELONGS ya.make Match type : REFERENCE Links : http://www.boost.org/LICENSE_1_0.txt, http://www.boost.org/users/license.html, https://spdx.org/licenses/BSL-1.0 Files with this license: - README.md [227:227] + README.md [233:233] + +KEEP MIT 3e1ede6948a97e7ee3d75e0204a567f3 +BELONGS ya.make + License text: + [licensemit img]: https://img.shields.io/badge/License-MIT-blue.svg + Scancode info: + Original SPDX id: MIT + Score : 100.00 + Match type : TAG + Links : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT + Files with this license: + README.md [217:217] SKIP Apache-2.0 500a503129337bb5adf5977ce11879cd BELONGS ya.make License text: - This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html). + This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html) as well as under the MIT License. As a user, you can pick the license you prefer. Scancode info: Original SPDX id: Apache-2.0 Score : 100.00 Match type : NOTICE Links : http://www.apache.org/licenses/, http://www.apache.org/licenses/LICENSE-2.0, https://spdx.org/licenses/Apache-2.0 Files with this license: - README.md [223:223] + README.md [229:229] SKIP BSL-1.0 77dd56e30840a227692d435b4aecdb95 BELONGS ya.make @@ -113,30 +148,44 @@ BELONGS ya.make Match type : REFERENCE Links : http://www.boost.org/LICENSE_1_0.txt, http://www.boost.org/users/license.html, https://spdx.org/licenses/BSL-1.0 Files with this license: - README.md [227:227] + README.md [233:233] + +KEEP MIT 7f0bdbc0a0545831259b66259ac6b604 +BELONGS ya.make +FILE_INCLUDE LICENSE-MIT found in files: README.md at line 216 + License text: + [licensemit]: LICENSE-MIT + Scancode info: + Original SPDX id: MIT + Score : 100.00 + Match type : TAG + Links : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT + Files with this license: + README.md [216:216] -SKIP Apache-2.0 871555b1be031365ad101c8aa7104482 +KEEP Apache-2.0 82e76bbc1841bd5886297e795c72bfa5 BELONGS ya.make License text: - This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html). + This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html) as well as under the MIT License. As a user, you can pick the license you prefer. Scancode info: Original SPDX id: Apache-2.0 Score : 100.00 Match type : REFERENCE Links : http://www.apache.org/licenses/, http://www.apache.org/licenses/LICENSE-2.0, https://spdx.org/licenses/Apache-2.0 Files with this license: - README.md [223:223] + README.md [229:229] -KEEP Apache-2.0 97b415d82a3bce8bcbc7213fa2ac85c1 +KEEP MIT a6e9f2d79eb73e6e422759b53da6152a BELONGS ya.make +FILE_INCLUDE AUTHORS found in files: LICENSE-MIT at line 15 Note: matched license text is too long. Read it in the source files. Scancode info: - Original SPDX id: Apache-2.0 - Score : 99.81 + Original SPDX id: MIT + Score : 100.00 Match type : TEXT - Links : http://www.apache.org/licenses/, http://www.apache.org/licenses/LICENSE-2.0, https://spdx.org/licenses/Apache-2.0 + Links : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT Files with this license: - LICENSE [1:201] + LICENSE-MIT [3:18] SKIP Apache-2.0 a7953e3caf13357c57a3aadc5910c07c BELONGS ya.make @@ -159,7 +208,7 @@ BELONGS ya.make Match type : NOTICE Links : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT Files with this license: - README.md [229:229] + README.md [235:235] SKIP Apache-2.0 c23a044f4165feb9568f486ca3b30fc8 BELONGS ya.make @@ -170,7 +219,7 @@ BELONGS ya.make Match type : NOTICE Links : http://www.apache.org/licenses/, http://www.apache.org/licenses/LICENSE-2.0, https://spdx.org/licenses/Apache-2.0 Files with this license: - README.md [227:227] + README.md [233:233] SKIP BSD-3-Clause d77bd60dc7ee5f9c3b221f6edd94bbac BELONGS ya.make @@ -182,7 +231,7 @@ BELONGS ya.make Match type : REFERENCE Links : http://www.opensource.org/licenses/BSD-3-Clause, https://spdx.org/licenses/BSD-3-Clause Files with this license: - README.md [231:231] + README.md [237:237] SKIP MIT dd09705e3ec59af63c705c8f5f3eadb2 BELONGS ya.make @@ -194,7 +243,7 @@ BELONGS ya.make Match type : REFERENCE Links : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT Files with this license: - README.md [225:225] + README.md [231:231] KEEP MIT f0fe4686586f118327c3bc63fe4027de BELONGS ya.make diff --git a/contrib/libs/simdjson/.yandex_meta/licenses.list.txt b/contrib/libs/simdjson/.yandex_meta/licenses.list.txt index ac7d9c3350..94c440eb17 100644 --- a/contrib/libs/simdjson/.yandex_meta/licenses.list.txt +++ b/contrib/libs/simdjson/.yandex_meta/licenses.list.txt @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2023 The simdjson authors + Copyright 2018-2025 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. @@ -201,6 +201,10 @@ See the License for the specific language governing permissions and limitations under the License. +====================Apache-2.0==================== +This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html) as well as under the MIT License. As a user, you can pick the license you prefer. + + ====================BSD-3-Clause==================== Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -231,7 +235,7 @@ POSSIBILITY OF SUCH DAMAGE. ====================COPYRIGHT==================== - Copyright 2018-2023 The simdjson authors + Copyright 2018-2025 The simdjson authors ====================COPYRIGHT==================== @@ -257,6 +261,13 @@ Accurately", Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language Design and Implementation, PLDI 1996 +====================File: AUTHORS==================== +# List of authors for copyright purposes, in no particular order +Daniel Lemire +Geoff Langdale +John Keiser + + ====================File: CONTRIBUTORS==================== # contributors (in no particular order) Thomas Navennec @@ -305,5 +316,56 @@ Fangzheng Zhang and Weiqiang Wan (AVX-512 kernel) # appear in this list, please let us know! +====================File: LICENSE-MIT==================== +Copyright 2018-2025 The simdjson authors + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +====================MIT==================== +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + ====================MIT==================== The code is distributed under the MIT license, Copyright (c) 2009 Florian + + +====================MIT==================== +This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html) as well as under the MIT License. As a user, you can pick the license you prefer. + + +====================MIT==================== +[licensemit img]: https://img.shields.io/badge/License-MIT-blue.svg + + +====================MIT==================== +[licensemit]: LICENSE-MIT diff --git a/contrib/libs/simdjson/.yandex_meta/override.nix b/contrib/libs/simdjson/.yandex_meta/override.nix index 07f31be0fe..3dc9e380ec 100644 --- a/contrib/libs/simdjson/.yandex_meta/override.nix +++ b/contrib/libs/simdjson/.yandex_meta/override.nix @@ -1,11 +1,11 @@ pkgs: attrs: with pkgs; rec { - version = "3.11.6"; + version = "3.12.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - hash = "sha256-599gzxJ53nHVo6MkEICzHxaQl0s1vZRjySSRUxC7ZXA="; + hash = "sha256-F5yqhDBDoWgB4YkFOYUFEczdu24aBdbsTly4LcFZqDQ="; }; cmakeFlags = attrs.cmakeFlags ++ [ diff --git a/contrib/libs/simdjson/LICENSE b/contrib/libs/simdjson/LICENSE index 71f65b598d..57fc54cc1f 100644 --- a/contrib/libs/simdjson/LICENSE +++ b/contrib/libs/simdjson/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018-2023 The simdjson authors + Copyright 2018-2025 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. diff --git a/contrib/libs/simdjson/LICENSE-MIT b/contrib/libs/simdjson/LICENSE-MIT new file mode 100644 index 0000000000..86a11f2f65 --- /dev/null +++ b/contrib/libs/simdjson/LICENSE-MIT @@ -0,0 +1,18 @@ +Copyright 2018-2025 The simdjson authors + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/contrib/libs/simdjson/README.md b/contrib/libs/simdjson/README.md index 2cc209eafd..a0c4a109c9 100644 --- a/contrib/libs/simdjson/README.md +++ b/contrib/libs/simdjson/README.md @@ -1,7 +1,8 @@ [/badge.svg)](https://simdjson.org/plots.html) [](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:simdjson) -[![][license img]][license] +[![][license img]][license] [![][licensemit img]][licensemit] + [](https://simdjson.github.io/simdjson/) @@ -211,6 +212,11 @@ RGPIN-2017-03910 and RGPIN-2024-03787. [license]: LICENSE [license img]: https://img.shields.io/badge/License-Apache%202-blue.svg + +[licensemit]: LICENSE-MIT +[licensemit img]: https://img.shields.io/badge/License-MIT-blue.svg + + Contributing to simdjson ------------------------ @@ -220,7 +226,7 @@ Head over to [CONTRIBUTING.md](CONTRIBUTING.md) for information on contributing License ------- -This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html). +This code is made available under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html) as well as under the MIT License. As a user, you can pick the license you prefer. Under Windows, we build some tools using the windows/dirent_portable.h file (which is outside our library code): it is under the liberal (business-friendly) MIT license. diff --git a/contrib/libs/simdjson/include/simdjson/simdjson_version.h b/contrib/libs/simdjson/include/simdjson/simdjson_version.h index 7a1dd634ac..dd6bfbe073 100644 --- a/contrib/libs/simdjson/include/simdjson/simdjson_version.h +++ b/contrib/libs/simdjson/include/simdjson/simdjson_version.h @@ -4,7 +4,7 @@ #define SIMDJSON_SIMDJSON_VERSION_H /** The version of simdjson being used (major.minor.revision) */ -#define SIMDJSON_VERSION "3.11.6" +#define SIMDJSON_VERSION "3.12.0" namespace simdjson { enum { @@ -15,11 +15,11 @@ enum { /** * The minor version (major.MINOR.revision) of simdjson being used. */ - SIMDJSON_VERSION_MINOR = 11, + SIMDJSON_VERSION_MINOR = 12, /** * The revision (major.minor.REVISION) of simdjson being used. */ - SIMDJSON_VERSION_REVISION = 6 + SIMDJSON_VERSION_REVISION = 0 }; } // namespace simdjson diff --git a/contrib/libs/simdjson/ya.make b/contrib/libs/simdjson/ya.make index 067cfe3dec..d774b26cfb 100644 --- a/contrib/libs/simdjson/ya.make +++ b/contrib/libs/simdjson/ya.make @@ -10,9 +10,9 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(3.11.6) +VERSION(3.12.0) -ORIGINAL_SOURCE(https://github.com/simdjson/simdjson/archive/v3.11.6.tar.gz) +ORIGINAL_SOURCE(https://github.com/simdjson/simdjson/archive/v3.12.0.tar.gz) ADDINCL( GLOBAL contrib/libs/simdjson/include |