natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.1' into cassandra-5.0 

* cassandra-4.1:
  Fix bash-completion for debian distro
This commit is contained in:
mck 2024-10-15 10:30:39 +02:00
parent f278f6774f 7b612a8493
commit 18960d6e34
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.build/docker/_build-debian.sh
View File

@ -21,6 +21,8 @@
# #
################################ ################################
[ $DEBUG ] && set -x
# variables, with defaults # variables, with defaults
[ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname "$0")/..)" [ "x${CASSANDRA_DIR}" != "x" ] || CASSANDRA_DIR="$(readlink -f $(dirname "$0")/..)"
[ "x${DIST_DIR}" != "x" ] || DIST_DIR="${CASSANDRA_DIR}/build" [ "x${DIST_DIR}" != "x" ] || DIST_DIR="${CASSANDRA_DIR}/build"
@ -96,7 +98,7 @@ else
# if CASSANDRA_VERSION is -alphaN, -betaN, -rcN, it fails on the '-' char; replace with '~' # if CASSANDRA_VERSION is -alphaN, -betaN, -rcN, it fails on the '-' char; replace with '~'
CASSANDRA_VERSION=${buildxml_version/-/\~} CASSANDRA_VERSION=${buildxml_version/-/\~}
dt=`date +"%Y%m%d"` dt=`date +"%Y%m%d"`
ref=`git rev-parse --short HEAD || grep -q GitSHA src/resources/org/apache/cassandra/config/version.properties && grep GitSHA src/resources/org/apache/cassandra/config/version.properties | cut -d"=" -f2 || echo unknown` ref=`git rev-parse --short HEAD || ( grep -q GitSHA src/resources/org/apache/cassandra/config/version.properties && grep GitSHA src/resources/org/apache/cassandra/config/version.properties | cut -d"=" -f2 ) || echo unknown`
CASSANDRA_REVISION="${dt}git${ref}" CASSANDRA_REVISION="${dt}git${ref}"
dch -D unstable -v "${CASSANDRA_VERSION}-${CASSANDRA_REVISION}" --package "cassandra" "building ${CASSANDRA_VERSION}-${CASSANDRA_REVISION}" dch -D unstable -v "${CASSANDRA_VERSION}-${CASSANDRA_REVISION}" --package "cassandra" "building ${CASSANDRA_VERSION}-${CASSANDRA_REVISION}"
fi fi
@ -128,4 +130,4 @@ rm -f cassandra-build-deps_*
# restore debian/changelog # restore debian/changelog
git restore debian/changelog || true git restore debian/changelog || true
popd >/dev/null popd >/dev/null

4
.build/docker/_docker_run.sh
View File

@ -116,6 +116,8 @@ random_string="$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 6 ; echo '')"
run_script_name=$(echo ${run_script} | sed 's/.sh//' | sed 's/_//') run_script_name=$(echo ${run_script} | sed 's/.sh//' | sed 's/_//')
container_name="cassandra_${dockerfile/.docker/}_${un_script_name}_jdk${java_version}__${random_string}" container_name="cassandra_${dockerfile/.docker/}_${un_script_name}_jdk${java_version}__${random_string}"
[ $DEBUG ] && docker_envs="${docker_envs} --env DEBUG=1"
# Docker commands: # Docker commands:
# change ant's build directory to $DIST_DIR # change ant's build directory to $DIST_DIR
# set java to java_version # set java to java_version
@ -128,7 +130,7 @@ docker_command="export ANT_OPTS=\"-Dbuild.dir=\${DIST_DIR} ${CASSANDRA_DOCKER_AN
# re-use the host's maven repository # re-use the host's maven repository
container_id=$(docker run --name ${container_name} -d --security-opt seccomp=unconfined --rm \ container_id=$(docker run --name ${container_name} -d --security-opt seccomp=unconfined --rm \
-v "${cassandra_dir}":/home/build/cassandra -v ${m2_dir}:/home/build/.m2/repository/ -v "${build_dir}":/dist \ -v "${cassandra_dir}":/home/build/cassandra -v ${m2_dir}:/home/build/.m2/repository/ -v "${build_dir}":/dist \
${docker_volume_opt} \ ${docker_envs} ${docker_volume_opt} \
${image_name} sleep 1h) ${image_name} sleep 1h)
echo "Running container ${container_name} ${container_id} using image ${image_name}" echo "Running container ${container_name} ${container_id} using image ${image_name}"

1
.build/docker/build-debian.sh
View File

@ -15,6 +15,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
[ $DEBUG ] && set -x
if [ "$1" == "-h" ]; then if [ "$1" == "-h" ]; then
echo "$0 [-h] [<java_version>]" echo "$0 [-h] [<java_version>]"

1
CHANGES.txt
View File

@ -7,6 +7,7 @@
Merged from 4.1: Merged from 4.1:
* Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365) * Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365)
Merged from 4.0: Merged from 4.0:
* Fix bash-completion for debian distro (CASSANDRA-19999)
* Ensure thread-safety for CommitLogArchiver in CommitLog (CASSANDRA-19960) * Ensure thread-safety for CommitLogArchiver in CommitLog (CASSANDRA-19960)
* Fix text containing "/*" being interpreted as multiline comment in cqlsh (CASSANDRA-17667) * Fix text containing "/*" being interpreted as multiline comment in cqlsh (CASSANDRA-17667)
* Fix indexing of a frozen collection that is the clustering key and reversed (CASSANDRA-19889) * Fix indexing of a frozen collection that is the clustering key and reversed (CASSANDRA-19889)

2
debian/nodetool-completion vendored
View File

@ -15,7 +15,7 @@
# limitations under the License. # limitations under the License.
# #
# #
have nodetool && have cqlsh && _have nodetool && _have cqlsh &&
{ {
show_keyspaces() show_keyspaces()