From 6584a3dc1ff3ae9720b32e38ad7ff5038aa463e2 Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Thu, 25 Jan 2024 08:24:56 +0200 Subject: [PATCH 01/12] zlib: Update to 1.3.1 --- HISTORY.md | 1 + Makefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index db2af7c1bc..8d4f84cf34 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -33,6 +33,7 @@ RocksDB has a value of 10 by default and we've added the option to randomize the * Remove leftover references to ROCKSDB_LITE (#755). * Options: Set compaction_readahead_size default to 0. The current default of 2Mb is not optimal for most of our use cases. Having a value of 0 means that the FS will use its default size for prefetching (true only with https://github.com/speedb-io/speedb/pull/788). * Options: Set level_compaction_dynamic_level_bytes as false by default. This flag is not working properly with Speedb. see https://github.com/speedb-io/speedb/issues/786 for more details. +* zlib: Update to 1.3.1 ## Hazlenut 2.7.0 (27/10/2023) Based on RocksDB 8.1.1 diff --git a/Makefile b/Makefile index 081c11a75d..8f44ebc465 100644 --- a/Makefile +++ b/Makefile @@ -2001,8 +2001,8 @@ LIB_JAVADOCS_JAR = $(PROJECT_NAME)jni-$(LIB_JAVA_VERSION)-javadoc.jar LIB_SOURCES_JAR = $(PROJECT_NAME)jni-$(LIB_JAVA_VERSION)-sources.jar SHA256_CMD = sha256sum -ZLIB_VER ?= 1.3 -ZLIB_SHA256 ?= ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e +ZLIB_VER ?= 1.3.1 +ZLIB_SHA256 ?= 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 ZLIB_DOWNLOAD_BASE ?= http://zlib.net BZIP2_VER ?= 1.0.8 BZIP2_SHA256 ?= ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269 From 028f1129285b00bd98c2add07ba952d866ba462e Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Thu, 25 Jan 2024 08:59:30 +0200 Subject: [PATCH 02/12] added license in makefile --- Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Makefile b/Makefile index 8f44ebc465..e96bed6c14 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,17 @@ +# Copyright (C) 2023 Speedb Ltd. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# 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. + # Copyright (c) 2011 The LevelDB Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. See the AUTHORS file for names of contributors. From ba2d97105f74b4bce2e43d0579f4a8905f3b2d06 Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Thu, 25 Jan 2024 11:36:45 +0200 Subject: [PATCH 03/12] update wind build pipeline as well --- .github/workflows/build_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 4d649aba30..94d4a52c02 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -99,7 +99,7 @@ jobs: shell: powershell run: | cd $Env:THIRDPARTY_HOME - curl https://zlib.net/zlib13.zip -o zlib13.zip + curl http://zlib.net/zlib-1.3.1.zip -o zlib13.zip Expand-Archive -Path zlib13.zip -DestinationPath zlib-tmp mv .\zlib-tmp\zlib-1.3\ . rmdir zlib-tmp From 99880de655da0b1456d13b48cbbdb6f009c07869 Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Thu, 25 Jan 2024 12:31:07 +0200 Subject: [PATCH 04/12] in both places and correct link --- .github/workflows/build_windows.yml | 2 +- .github/workflows/ci_pipeline.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 94d4a52c02..f95a8acfae 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -99,7 +99,7 @@ jobs: shell: powershell run: | cd $Env:THIRDPARTY_HOME - curl http://zlib.net/zlib-1.3.1.zip -o zlib13.zip + curl https://www.zlib.net/zlib131.zip -o zlib13.zip Expand-Archive -Path zlib13.zip -DestinationPath zlib-tmp mv .\zlib-tmp\zlib-1.3\ . rmdir zlib-tmp diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml index 886393e3f5..692f2a7829 100644 --- a/.github/workflows/ci_pipeline.yml +++ b/.github/workflows/ci_pipeline.yml @@ -201,7 +201,7 @@ jobs: shell: powershell run: | cd $Env:THIRDPARTY_HOME - curl https://zlib.net/zlib13.zip -o zlib13.zip + curl https://www.zlib.net/zlib131.zip -o zlib13.zip Expand-Archive -Path zlib13.zip -DestinationPath zlib-tmp mv .\zlib-tmp\zlib-1.3\ . rmdir zlib-tmp From 1e7b68e8547ce3d77130e032f4bd2a0e47980ee9 Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Thu, 25 Jan 2024 12:57:07 +0200 Subject: [PATCH 05/12] some more fixes --- .github/workflows/build_windows.yml | 8 ++++---- .github/workflows/ci_pipeline.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index f95a8acfae..bed1d555a7 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -99,11 +99,11 @@ jobs: shell: powershell run: | cd $Env:THIRDPARTY_HOME - curl https://www.zlib.net/zlib131.zip -o zlib13.zip - Expand-Archive -Path zlib13.zip -DestinationPath zlib-tmp - mv .\zlib-tmp\zlib-1.3\ . + curl https://www.zlib.net/zlib131.zip -o zlib131.zip + Expand-Archive -Path zlib131.zip -DestinationPath zlib-tmp + mv .\zlib-tmp\zlib-1.3.1\ . rmdir zlib-tmp - cd zlib-1.3\contrib\vstudio\vc14 + cd zlib-1.3.1\contrib\vstudio\vc14 devenv zlibvc.sln /upgrade cp ../../../zlib.h . msbuild zlibvc.sln /p:Configuration=Debug /p:Platform=x64 diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml index 692f2a7829..d25bfdecfa 100644 --- a/.github/workflows/ci_pipeline.yml +++ b/.github/workflows/ci_pipeline.yml @@ -201,11 +201,11 @@ jobs: shell: powershell run: | cd $Env:THIRDPARTY_HOME - curl https://www.zlib.net/zlib131.zip -o zlib13.zip - Expand-Archive -Path zlib13.zip -DestinationPath zlib-tmp - mv .\zlib-tmp\zlib-1.3\ . + curl https://www.zlib.net/zlib131.zip -o zlib131.zip + Expand-Archive -Path zlib131.zip -DestinationPath zlib-tmp + mv .\zlib-tmp\zlib-1.3.1\ . rmdir zlib-tmp - cd zlib-1.3\contrib\vstudio\vc14 + cd zlib-1.3.1\contrib\vstudio\vc14 devenv zlibvc.sln /upgrade cp ../../../zlib.h . msbuild zlibvc.sln /p:Configuration=Debug /p:Platform=x64 From 9d4d72899c8ea6f9bf9b30a6b15d9fc2891512db Mon Sep 17 00:00:00 2001 From: maxb-io <105273783+maxb-io@users.noreply.github.com> Date: Thu, 25 Jan 2024 17:04:43 +0200 Subject: [PATCH 06/12] Update build_windows.yml --- .github/workflows/build_windows.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index bed1d555a7..310e1ba069 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -99,11 +99,8 @@ jobs: shell: powershell run: | cd $Env:THIRDPARTY_HOME - curl https://www.zlib.net/zlib131.zip -o zlib131.zip - Expand-Archive -Path zlib131.zip -DestinationPath zlib-tmp - mv .\zlib-tmp\zlib-1.3.1\ . - rmdir zlib-tmp - cd zlib-1.3.1\contrib\vstudio\vc14 + git clone https://github.com/madler/zlib.git -b v1.3 zlib-1.3 + cd zlib-1.3\contrib\vstudio\vc14 devenv zlibvc.sln /upgrade cp ../../../zlib.h . msbuild zlibvc.sln /p:Configuration=Debug /p:Platform=x64 From 0e08ff759494789b6d5a2cebdb83887d41d4b976 Mon Sep 17 00:00:00 2001 From: maxb-io <105273783+maxb-io@users.noreply.github.com> Date: Thu, 25 Jan 2024 17:23:01 +0200 Subject: [PATCH 07/12] Update ci_pipeline.yml --- .github/workflows/ci_pipeline.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml index d25bfdecfa..4e577b77d1 100644 --- a/.github/workflows/ci_pipeline.yml +++ b/.github/workflows/ci_pipeline.yml @@ -201,13 +201,10 @@ jobs: shell: powershell run: | cd $Env:THIRDPARTY_HOME - curl https://www.zlib.net/zlib131.zip -o zlib131.zip - Expand-Archive -Path zlib131.zip -DestinationPath zlib-tmp - mv .\zlib-tmp\zlib-1.3.1\ . - rmdir zlib-tmp - cd zlib-1.3.1\contrib\vstudio\vc14 + git clone https://github.com/madler/zlib.git -b v1.3 zlib-1.3 + cd zlib-1.3\contrib\vstudio\vc14 devenv zlibvc.sln /upgrade - cp ../../../zlib.h . + cp ../../../zlib.h . msbuild zlibvc.sln /p:Configuration=Debug /p:Platform=x64 msbuild zlibvc.sln /p:Configuration=Release /p:Platform=x64 copy x64\ZlibDllRelease\zlibwapi.lib x64\ZlibStatRelease\ From 13ed25a6393861fd7e31c0a4e52a990842979a73 Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Thu, 25 Jan 2024 19:42:50 +0200 Subject: [PATCH 08/12] Revert "zlib: Update to 1.3.1" This reverts commit 6584a3dc1ff3ae9720b32e38ad7ff5038aa463e2. --- HISTORY.md | 1 - Makefile | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 8d4f84cf34..db2af7c1bc 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -33,7 +33,6 @@ RocksDB has a value of 10 by default and we've added the option to randomize the * Remove leftover references to ROCKSDB_LITE (#755). * Options: Set compaction_readahead_size default to 0. The current default of 2Mb is not optimal for most of our use cases. Having a value of 0 means that the FS will use its default size for prefetching (true only with https://github.com/speedb-io/speedb/pull/788). * Options: Set level_compaction_dynamic_level_bytes as false by default. This flag is not working properly with Speedb. see https://github.com/speedb-io/speedb/issues/786 for more details. -* zlib: Update to 1.3.1 ## Hazlenut 2.7.0 (27/10/2023) Based on RocksDB 8.1.1 diff --git a/Makefile b/Makefile index e96bed6c14..6991070fd7 100644 --- a/Makefile +++ b/Makefile @@ -2015,8 +2015,8 @@ LIB_JAVADOCS_JAR = $(PROJECT_NAME)jni-$(LIB_JAVA_VERSION)-javadoc.jar LIB_SOURCES_JAR = $(PROJECT_NAME)jni-$(LIB_JAVA_VERSION)-sources.jar SHA256_CMD = sha256sum -ZLIB_VER ?= 1.3.1 -ZLIB_SHA256 ?= 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 +ZLIB_VER ?= 1.3 +ZLIB_SHA256 ?= ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e ZLIB_DOWNLOAD_BASE ?= http://zlib.net BZIP2_VER ?= 1.0.8 BZIP2_SHA256 ?= ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269 From 4c5f0406f27db06ca913ccd451c22af7437d1656 Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Sun, 28 Jan 2024 09:05:58 +0200 Subject: [PATCH 09/12] Revert "added license in makefile" This reverts commit 028f1129285b00bd98c2add07ba952d866ba462e. --- Makefile | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Makefile b/Makefile index 6991070fd7..081c11a75d 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,3 @@ -# Copyright (C) 2023 Speedb Ltd. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# 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. - # Copyright (c) 2011 The LevelDB Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. See the AUTHORS file for names of contributors. From c54463ed0d64dde1a539125e97d5f67490ae6e29 Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Sun, 28 Jan 2024 09:07:11 +0200 Subject: [PATCH 10/12] remove extra space --- .github/workflows/ci_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml index 4e577b77d1..263c0df69b 100644 --- a/.github/workflows/ci_pipeline.yml +++ b/.github/workflows/ci_pipeline.yml @@ -204,7 +204,7 @@ jobs: git clone https://github.com/madler/zlib.git -b v1.3 zlib-1.3 cd zlib-1.3\contrib\vstudio\vc14 devenv zlibvc.sln /upgrade - cp ../../../zlib.h . + cp ../../../zlib.h . msbuild zlibvc.sln /p:Configuration=Debug /p:Platform=x64 msbuild zlibvc.sln /p:Configuration=Release /p:Platform=x64 copy x64\ZlibDllRelease\zlibwapi.lib x64\ZlibStatRelease\ From 3947220354234043b6f8bfa0c54fdad99132337e Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Sun, 28 Jan 2024 10:44:25 +0200 Subject: [PATCH 11/12] add in makefile as well --- Makefile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 081c11a75d..58fc949248 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,17 @@ +# Copyright (C) 2023 Speedb Ltd. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# 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. + # Copyright (c) 2011 The LevelDB Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. See the AUTHORS file for names of contributors. @@ -2003,7 +2017,7 @@ SHA256_CMD = sha256sum ZLIB_VER ?= 1.3 ZLIB_SHA256 ?= ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e -ZLIB_DOWNLOAD_BASE ?= http://zlib.net +ZLIB_DOWNLOAD_BASE ?= https://github.com/madler/zlib/releases/download/v1.3 BZIP2_VER ?= 1.0.8 BZIP2_SHA256 ?= ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269 BZIP2_DOWNLOAD_BASE ?= http://sourceware.org/pub/bzip2 From 09693910ba519688b9cfcb20967dff8de8deec71 Mon Sep 17 00:00:00 2001 From: Yuval Ariel Date: Sun, 28 Jan 2024 10:49:37 +0200 Subject: [PATCH 12/12] update history --- HISTORY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/HISTORY.md b/HISTORY.md index db2af7c1bc..1947a2a954 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -33,6 +33,7 @@ RocksDB has a value of 10 by default and we've added the option to randomize the * Remove leftover references to ROCKSDB_LITE (#755). * Options: Set compaction_readahead_size default to 0. The current default of 2Mb is not optimal for most of our use cases. Having a value of 0 means that the FS will use its default size for prefetching (true only with https://github.com/speedb-io/speedb/pull/788). * Options: Set level_compaction_dynamic_level_bytes as false by default. This flag is not working properly with Speedb. see https://github.com/speedb-io/speedb/issues/786 for more details. +* zlib: Update links to zlib 1.3 in CI and Makefile since the link in zlib.net is dead. ## Hazlenut 2.7.0 (27/10/2023) Based on RocksDB 8.1.1