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.

Sign up for GitHub

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

Jump to bottom

Switch MapBlock compression to zstd #10788

Merged
merged 20 commits into from
Sep 1, 2021
Merged

Switch MapBlock compression to zstd #10788

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
97982c7
Add zstd support.
lhofhansl Jan 5, 2021
f6186e4
Compress entire mapblock
lhofhansl Jan 9, 2021
2170e13
Fix Windows build.
lhofhansl Jan 10, 2021
d244a46
Docker fix
lhofhansl Apr 26, 2021
25c831c
buildwin fixes
lhofhansl Apr 26, 2021
2861bb3
avoid copy during compression
lhofhansl May 18, 2021
be33e08
Android fix
lhofhansl Jun 6, 2021
9ad130d
Recompress/Decompresstimes
lhofhansl Jun 7, 2021
2b16f09
Address review comments
lhofhansl Jul 2, 2021
73108c4
Write length of metadata
lhofhansl Aug 28, 2021
21e369d
Fix world format doc
lhofhansl Aug 28, 2021
deb99f3
remove benchmarking code
lhofhansl Aug 28, 2021
3c62a3f
Determine metadata length without an extra ostringstream
lhofhansl Aug 29, 2021
24031a5
Rearrange serialization order
lhofhansl Aug 29, 2021
141d053
(hopefully) fix MacOS build
lhofhansl Aug 29, 2021
fc1348e
Remove last benchmark code
lhofhansl Aug 29, 2021
5bee89d
update world_format.txt
lhofhansl Aug 29, 2021
21a94e3
move meta back
sfan5 Aug 31, 2021
3e2e347
apply other suggestions
sfan5 Aug 31, 2021
e4ff440
minor things
sfan5 Aug 31, 2021
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
Prev Previous commit
minor things
  • Loading branch information
@sfan5
sfan5 committed Aug 31, 2021
commit e4ff4402889c76c4d7dd83abeeed1992272e318c
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ variables:
stage: build
before_script:
- apt-get update
- apt-get -y install build-essential git cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libleveldb-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev
- apt-get -y install build-essential git cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libleveldb-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev
script:
- git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG lib/irrlichtmt
- mkdir cmakebuild
Expand Down Expand Up @@ -187,7 +187,7 @@ build:fedora-28:
extends: .build_template
image: fedora:28
before_script:
- dnf -y install make git gcc gcc-c++ kernel-devel cmake libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel
- dnf -y install make git gcc gcc-c++ kernel-devel cmake libjpeg-devel libpng-devel libcurl-devel openal-soft-devel libvorbis-devel libXxf86vm-devel libogg-devel freetype-devel mesa-libGL-devel zlib-devel jsoncpp-devel gmp-devel sqlite-devel luajit-devel leveldb-devel ncurses-devel spatialindex-devel libzstd-devel

##
## MinGW for Windows
Expand Down
2 changes: 1 addition & 1 deletion misc/debpkg-control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Priority: extra
Standards-Version: 3.6.2
Package: minetest-staging
Version: 5.4.0-DATEPLACEHOLDER
Depends: libc6, libcurl3-gnutls, libfreetype6, libgl1, JPEG_PLACEHOLDER, JSONCPP_PLACEHOLDER, LEVELDB_PLACEHOLDER, libopenal1, libpng16-16, libsqlite3-0, libstdc++6, libvorbisfile3, libx11-6, libxxf86vm1, zlib1g
Depends: libc6, libcurl3-gnutls, libfreetype6, libgl1, JPEG_PLACEHOLDER, JSONCPP_PLACEHOLDER, LEVELDB_PLACEHOLDER, libopenal1, libpng16-16, libsqlite3-0, libstdc++6, libvorbisfile3, libx11-6, libxxf86vm1, libzstd1, zlib1g
Maintainer: Loic Blot <[email protected]>
Homepage: https://www.minetest.net/
Vcs-Git: https://github.com/minetest/minetest.git
Expand Down
2 changes: 1 addition & 1 deletion src/serialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ void decompressZstd(std::istream &is, std::ostream &os)
for (u32 i = 0; i < input.size - input.pos; i++) {
is.unget();
if (is.fail() || is.bad())
throw SerializationError("decompressZlib: unget failed");
throw SerializationError("decompressZstd: unget failed");
}
}

Expand Down