Daniel Black added a comment - 2022-04-26 23:00 - edited The idempotent is provided by + ' [' '!' -f debian/mariadb-plugin-columnstore.install '] ' . Is that not being picked up? I guess that git checkout . is still leaving the file around. I'll look at doing something better still. root@4405d53ce3e1:/source# ls -la debian/mariadb-plugin-columnstore.install ls: cannot access 'debian/mariadb-plugin-columnstore.install': No such file or directory root@4405d53ce3e1:/source# AUTOBAKE_PREP_CONTROL_RULES_ONLY=1 bash -x debian/autobake-deb.sh + set -e + export 'DEB_BUILD_OPTIONS=nocheck ' + DEB_BUILD_OPTIONS='nocheck ' + source ./VERSION ++ MYSQL_VERSION_MAJOR=10 ++ MYSQL_VERSION_MINOR=5 ++ MYSQL_VERSION_PATCH=16 ++ SERVER_MATURITY=stable + [[ -n '' ]] + '[' -d storage/columnstore/columnstore/debian ']' + sed /-DPLUGIN_COLUMNSTORE=NO/d -i debian/rules + '[' '!' -f debian/mariadb-plugin-columnstore.install ']' + cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.install storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.postinst storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.postrm storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.prerm storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.triggers debian/ 'storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.install' -> 'debian/mariadb-plugin-columnstore.install' 'storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.postinst' -> 'debian/mariadb-plugin-columnstore.postinst' 'storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.postrm' -> 'debian/mariadb-plugin-columnstore.postrm' 'storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.prerm' -> 'debian/mariadb-plugin-columnstore.prerm' 'storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.triggers' -> 'debian/mariadb-plugin-columnstore.triggers' + echo + cat storage/columnstore/columnstore/debian/control ++ dpkg-architecture -q DEB_BUILD_ARCH + architecture=amd64 ++ lsb_release -sc + CODENAME=sid + case "${CODENAME}" in + '[' -n 1 ']' + exit 0 diff --git a/debian/control b/debian/control index 5352e9902ed..560cd409611 100644 --- a/debian/control +++ b/debian/control @@ -861,3 +861,24 @@ Description: MariaDB database regression test suite - data files ease of use. . This package has the architecture independent data files for the test suite. + +Package: mariadb-plugin-columnstore +Architecture: amd64 +Depends: binutils, + libjemalloc1 | libjemalloc2, + libsnappy1 | libsnappy1v5, + mariadb-server-10.5 (= ${server:Version}), + net-tools, + python3, + ${misc:Depends}, + ${shlibs:Depends} +Breaks: libthrift-dev, + mariadb-columnstore-libs, + mariadb-columnstore-platform +Replaces: libthrift-dev, + mariadb-columnstore-libs, + mariadb-columnstore-platform +Description: MariaDB ColumnStore storage engine + The MariaDB ColumnStore storage engine is a high-performance columnar + analytical engine, aimed at rapid processing of analytical queries on very + large amounts of data. diff --git a/debian/rules b/debian/rules index 57636eb028a..713970bb9d7 100755 --- a/debian/rules +++ b/debian/rules @@ -45,7 +45,6 @@ endif # ColumnStore can build only on amd64 and arm64 ifneq (,$(filter $(DEB_HOST_ARCH_CPU),amd64 arm64)) - CMAKEFLAGS += -DPLUGIN_COLUMNSTORE=NO endif ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) @@ -100,7 +99,6 @@ endif -DPLUGIN_TOKUDB=NO \ -DPLUGIN_CASSANDRA=NO \ -DPLUGIN_AWS_KEY_MANAGEMENT=NO \ - -DPLUGIN_COLUMNSTORE=NO \ -DDEB=$(DEB_VENDOR) # This is needed, otherwise 'make test' will run before binaries have been built root@4405d53ce3e1:/source# AUTOBAKE_PREP_CONTROL_RULES_ONLY=1 bash -x debian/autobake-deb.sh + set -e + export 'DEB_BUILD_OPTIONS=nocheck ' + DEB_BUILD_OPTIONS='nocheck ' + source ./VERSION ++ MYSQL_VERSION_MAJOR=10 ++ MYSQL_VERSION_MINOR=5 ++ MYSQL_VERSION_PATCH=16 ++ SERVER_MATURITY=stable + [[ -n '' ]] + '[' -d storage/columnstore/columnstore/debian ']' + sed /-DPLUGIN_COLUMNSTORE=NO/d -i debian/rules + '[' '!' -f debian/mariadb-plugin-columnstore.install ']' ++ dpkg-architecture -q DEB_BUILD_ARCH + architecture=amd64 ++ lsb_release -sc + CODENAME=sid + case "${CODENAME}" in + '[' -n 1 ']' + exit 0 ~/repos/mariadb-server-10.5 10.5 $ git diff diff --git a/debian/control b/debian/control index 5352e9902ed..560cd409611 100644 --- a/debian/control +++ b/debian/control @@ -861,3 +861,24 @@ Description: MariaDB database regression test suite - data files ease of use. . This package has the architecture independent data files for the test suite. + +Package: mariadb-plugin-columnstore +Architecture: amd64 +Depends: binutils, + libjemalloc1 | libjemalloc2, + libsnappy1 | libsnappy1v5, + mariadb-server-10.5 (= ${server:Version}), + net-tools, + python3, + ${misc:Depends}, + ${shlibs:Depends} +Breaks: libthrift-dev, + mariadb-columnstore-libs, + mariadb-columnstore-platform +Replaces: libthrift-dev, + mariadb-columnstore-libs, + mariadb-columnstore-platform +Description: MariaDB ColumnStore storage engine + The MariaDB ColumnStore storage engine is a high-performance columnar + analytical engine, aimed at rapid processing of analytical queries on very + large amounts of data. diff --git a/debian/rules b/debian/rules index 57636eb028a..713970bb9d7 100755 --- a/debian/rules +++ b/debian/rules @@ -45,7 +45,6 @@ endif # ColumnStore can build only on amd64 and arm64 ifneq (,$(filter $(DEB_HOST_ARCH_CPU),amd64 arm64)) - CMAKEFLAGS += -DPLUGIN_COLUMNSTORE=NO endif ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) @@ -100,7 +99,6 @@ endif -DPLUGIN_TOKUDB=NO \ -DPLUGIN_CASSANDRA=NO \ -DPLUGIN_AWS_KEY_MANAGEMENT=NO \ - -DPLUGIN_COLUMNSTORE=NO \ -DDEB=$(DEB_VENDOR) # This is needed, otherwise 'make test' will run before binaries have been built

Daniel Black added a comment - 2022-04-26 23:33 Acceptable? https://github.com/MariaDB/server/pull/2104 there for review

Sergei Golubchik added a comment - 2022-04-27 00:39 I don't understand how you use "git checkout . is still leaving the file around" to explain that "subsequent runs of debian/autobake-deb.sh are not idempotent". It seems that your PR#2104 has nothing to do with autobake-deb.sh not being idempotent

Daniel Black added a comment - 2022-04-27 01:17 Wrong git command - git clean -dfx will remove debian/mariadb-plugin-columnstore.* files as they aren't checked but leave debian/control with the added package. I'm assuming this was dbart 's patten. So if that was used between consecutive debian/autobake-deb.sh then multiple Package: mariadb-plugin-columnstore in debian/control instances will result. So the PR purges an existing Package: mariadb-plugin-columnstore in debian/control before pulling the definition from the submodule and also unconditionally copies the other columnstore files. I saw this useful in case the submodule was updated between subsequent runs.