Cleanup 9apr25

.build/build-accord.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<project basedir=".." name="apache-cassandra-accord-build"
+         xmlns:if="ant:if">
+    <target name="_build-accord" depends="init">
+      <exec executable="${basedir}/${accord.dir}/gradlew" dir="${basedir}/${accord.dir}" logError="true" failonerror="true" failifexecutionfails="true">
+        <!-- Need to call clean as a version change with a jar that didn't have code changes will not produce a new jar with the new version... so need clean to make sure build is stable -->
+        <arg value="clean" />
+        <arg value="build" />
+        <arg value="copyDependencies" /> <!-- For IDE support -->
+        <arg value="publishToMavenLocal" />
+        <arg value="-x" />
+        <arg value="test" />
+        <!-- since so much development is done from this hook, by adding checkstyle and rat will avoid issues earlier -->
+        <arg value="rat" />
+        <arg value="checkstyleMain" />
+        <arg value="checkstyleTest" />
+        <arg value="-Paccord_group=org.apache.cassandra" />
+        <arg value="-Paccord_artifactId=cassandra-accord" />
+        <arg value="-Paccord_version=${version}" />
+      </exec>
+      <!-- when dependencies are copied into the build dir they may be ignored if already present, so cleanup to pick up latest changes -->
+      <delete>
+        <!-- Why does this not use ${build.dir.lib}/jar and ${test.lib}/jar?  The reason is that filesets never finds files in that case -->
+        <!-- To handle the case that build or lib dirs do not exist yet, had to push the logic into includes, other solution was to create a task and use if conditions there -->
+        <fileset dir="${basedir}" includes="build/lib/jars/cassandra-accord-*.jar,build/test/lib/jars/cassandra-accord-*.jar" />
+      </delete>
+    </target>
+</project>

.build/build-checkstyle.xml

@@ -19,7 +19,7 @@
     <project basedir="." name="apache-cassandra-checkstyle"
      xmlns:rat="antlib:org.apache.rat.anttasks">
 
-    <target name="init-checkstyle" depends="resolver-retrieve-build,build-project" unless="no-checkstyle">
+    <target name="init-checkstyle" depends="resolver-retrieve-build,_build_subprojects,build-project" unless="no-checkstyle">
         <path id="checkstyle.lib.path">
             <fileset dir="${test.lib}/jars" includes="*.jar"/>
         </path>
@@ -45,7 +45,7 @@
         </checkstyle>
     </target>
 
-    <target name="checkstyle-test" depends="init-checkstyle,resolver-retrieve-build,build-project" description="Run custom checkstyle code analysis on tests" unless="no-checkstyle">
+    <target name="checkstyle-test" depends="init-checkstyle,resolver-retrieve-build,_build_subprojects,build-project" description="Run custom checkstyle code analysis on tests" unless="no-checkstyle">
         <property name="checkstyle.log.dir" value="${build.dir}/checkstyle" />
         <property name="checkstyle_test.report.file" value="${checkstyle.log.dir}/checkstyle_report_test.xml"/>
         <mkdir  dir="${checkstyle.log.dir}" />

.build/build-rat.xml

@@ -78,6 +78,7 @@
                  <exclude NAME="CHANGES.txt"/>
                  <exclude NAME="CASSANDRA-14092.txt"/>
                  <exclude NAME="debian/TODO"/>
+                 <exclude NAME="accord_demo.txt"/>
                  <!-- legal files -->
                  <exclude NAME="NOTICE.txt"/>
                  <exclude NAME="LICENSE.txt"/>

.build/build-resolver.xml

@@ -178,7 +178,7 @@
         <property name="resolver-ant-tasks.initialized" value="true"/>
     </target>
 
-    <target name="resolver-retrieve-build" depends="resolver-init,write-poms">
+    <target name="resolver-retrieve-build" depends="resolver-init,write-poms,_build_subprojects">
         <resolvepom file="${build.dir}/${final.name}.pom" id="all-pom" />
         <resolvepom file="${build.dir}/tmp-${final.name}-deps.pom" id="pom-deps" />
 
@@ -206,7 +206,7 @@
         </unzip>
     </target>
 
-    <target name="resolver-dist-lib" depends="resolver-retrieve-build">
+    <target name="resolver-dist-lib" depends="resolver-retrieve-build,_build_subprojects">
         <resolvepom file="${build.dir}/${final.name}.pom" id="all-pom" />
 
         <retry retrycount="3" retrydelay="10" >

.build/cassandra-build-deps-template.xml

@@ -155,5 +155,10 @@
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcutil-jdk18on</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>cassandra-accord</artifactId>
+      <classifier>tests</classifier>
+    </dependency>
   </dependencies>
 </project>

.build/cassandra-deps-template.xml

@@ -116,6 +116,10 @@
       <groupId>org.mindrot</groupId>
       <artifactId>jbcrypt</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cassandra</groupId>
+      <artifactId>cassandra-accord</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.airlift</groupId>
       <artifactId>airline</artifactId>

.build/checkstyle_suppressions.xml

@@ -21,5 +21,4 @@
         "https://checkstyle.org/dtds/suppressions_1_1.dtd">
 
 <suppressions>
-  <suppress checks="RegexpSinglelineJava" files="Semaphore\.java"/>
 </suppressions>

.build/git/git-hooks/post-checkout/100-update-submodules.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
+# Redirect output to stderr.
+exec 1>&2
+
+#set -o xtrace
+set -o errexit
+set -o pipefail
+set -o nounset
+
+bin="$(cd "$(dirname "$0")" > /dev/null; pwd)"
+
+_main() {
+  # In case the usage happens at a different layer, make sure to cd to the toplevel
+  local root_dir
+  root_dir="$(git rev-parse --show-toplevel)"
+  cd "$root_dir"
+
+  if [[ ! -e .gitmodules ]]; then
+    # nothing to see here, look away!
+    return 0
+  fi
+  git submodule update --init --recursive
+}
+
+_main "$@"

.build/git/git-hooks/post-switch

@@ -0,0 +1 @@
+post-checkout

.build/git/git-hooks/pre-commit/100-verify-submodules-pushed.sh

@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
+##
+## When working with submodules the top level project (Apache Cassandra) needs to commit all submodule
+## changes so the top level knows what SHA to use.  When working in a development environment it is
+## common that multiple commits will exist in both projects, if the submodule has its history
+## rewritten, then historic top level commits are no longer valid unless the SHAs are pushed to a
+## remote repo; this is what the script attempts to do, make sure all SHAs added to the
+## Apache Cassandra are backed up to a remote repo to make the Cassandra SHA buildable.
+##
+
+# Redirect output to stderr.
+exec 1>&2
+
+
+#set -o xtrace
+set -o errexit
+set -o pipefail
+set -o nounset
+
+bin="$(cd "$(dirname "$0")" > /dev/null; pwd)"
+
+_log() {
+  echo -e "[pre-commit]\t$*"
+}
+
+error() {
+  _log "$@" 1>&2
+  exit 1
+}
+
+# Status Table
+# A         Added
+# C         Copied
+# D         Deleted
+# M         Modified
+# R         Renamed
+# T         Type Changed (i.e. regular file, symlink, submodule, …<200b>)
+# U         Unmerged
+# X         Unknown
+# B         Broken
+_main() {
+  # In case the usage happens at a different layer, make sure to cd to the toplevel
+  local root_dir
+  root_dir="$(git rev-parse --show-toplevel)"
+  cd "$root_dir"
+
+  [[ ! -e .gitmodules ]] && return 0
+  local enabled=$(git config --bool cassandra.pre-commit.verify-submodules.enabled || echo true)
+  [ "$enabled" == "false" ] && return 0
+  local submodules=( $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }') )
+
+  local is_submodule=false
+  local git_sub_dir
+  local git_sha
+  while read status file; do
+    is_submodule=false
+    for to_check in "${submodules[*]}"; do
+      if [[ "$to_check" == "$file" ]]; then
+        is_submodule=true
+        break
+      fi
+    done
+    if $is_submodule; then
+      local enabled=$(git config --bool cassandra.pre-commit.verify-submodule-${file}.enabled || echo true)
+      [ "$enabled" == "false" ] && continue
+      _log "Submodule detected: ${file} with status ${status}; attempting a push"
+      _log "\tTo disable pushes, run"
+      _log "\t\tgit config --local cassandra.pre-commit.verify-submodules.enabled false"
+      _log "\tOr"
+      _log "\t\tgit config --local cassandra.pre-commit.verify-submodule-${file}.enabled false"
+      git_sub_dir="${file}/.git"
+      branch="$(git config -f .gitmodules "submodule.${file}.branch")"
+      [[ -z "${branch:-}" ]] && error "Submodule ${file} does not define a branch"
+      git_sha="$(git --git-dir "${git_sub_dir}" rev-parse HEAD)"
+      local remote="$(git --git-dir "${git_sub_dir}" config --get "branch.${branch}.remote" || error "Git branch ${branch} is not set up to track any remote in submodule ${file}")"
+      git --git-dir "${git_sub_dir}" fetch "${remote}"
+      git --git-dir "${git_sub_dir}" branch "${remote}/${branch}" --contains "${git_sha}" || error "Git commit ${git_sha} not found in $(git remote get-url "${remote}") on branch ${branch}"
+    fi
+  done < <(git diff --cached --name-status)
+}
+
+_main "$@"

.build/git/install-git-defaults.sh

@@ -0,0 +1,116 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
+#set -o xtrace
+set -o errexit
+set -o pipefail
+set -o nounset
+
+bin="$(cd "$(dirname "$0")" > /dev/null; pwd)"
+
+install_template_script() {
+  local -r name="$1"
+  local -r d_dir="$2"
+
+  cat <<EOF > "$name"
+#!/usr/bin/env bash
+
+# This script is autogenerated by the Apache Cassandra build; DO NOT CHANGE!
+# When this script is not found it will be installed automatically by the build
+# If an existing script is found, that script will be reloated under ${d_dir} as 000-original.sh
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Find all scripts to run
+for path in \$(find "$d_dir" -name '*.sh' | perl -e "print sort{(split '/', \\\$a)[-1] <=> (split '/', \\\$b)[-1]}<>"); do
+  "\$path" "\$@"
+done
+EOF
+  chmod a+x "$name"
+}
+
+install_hook() {
+  local -r git_dir="$1"
+  local -r hooks_dir="${git_dir}/hooks"
+  local -r name="$2"
+  local -r d_dir="${hooks_dir}/${name}.d"
+  local -r trigger_on_install=$3
+
+  mkdir "${d_dir}" &> /dev/null || true
+  local -r script_name="${hooks_dir}/${name}"
+  local installed=true
+  if [[ -e "$script_name" ]]; then
+    # was the script already installed?
+    if ! grep "This script is autogenerated by the Apache Cassandra build" "$script_name" &> /dev/null ; then
+      echo "$script_name found, but was not generated by the Apache Cassandra build; please remove or move to ${d_dir}/000-original.sh; creating and moving to ${d_dir} will cause it to run as expected, but won't conflict with hooks this build adds" 1>&2
+      exit 1
+    else
+      installed=false
+    fi
+  fi
+  # install all hooks
+  cp "$bin"/git-hooks/"${name}"/* "$d_dir"/
+
+  # install coordinator hook
+  install_template_script "$script_name" "$d_dir"
+  if $installed && $trigger_on_install ; then
+    echo "Running script $script_name"
+    "$script_name"
+  fi
+}
+
+_install_hooks() {
+  local git_dir
+  # make sure to use --git-common-dir and not --git-dir to support worktrees
+  git_dir="$(git rev-parse --git-common-dir 2> /dev/null || true)"
+  if [[ -z "${git_dir:-}" ]]; then
+    # not in a git repo, noop
+    return 0
+  fi
+
+  # make sure hooks directory exists; does not exist by default for worktrees
+  mkdir -p "${git_dir}/hooks" &> /dev/null || true
+
+  install_hook "$git_dir" "post-checkout" true
+  install_hook "$git_dir" "post-switch"   false
+  install_hook "$git_dir" "pre-commit"    false
+}
+
+_git_config_set() {
+  local -r name="$1"
+  # only care about rc
+  git config --local --get "$name" &> /dev/null
+}
+
+_install_configs() {
+  # when doing pull, this makes sure submodules are updated
+  _git_config_set submodule.recurse || git config --local submodule.recurse true
+}
+
+_main() {
+  local git_dir
+  # make sure to use --git-common-dir and not --git-dir to support worktrees
+  git_dir="$(git rev-parse --git-common-dir 2> /dev/null || true)"
+  # not in a git repo, noop
+  [[ -z "${git_dir:-}" ]] && return 0
+
+  _install_configs
+  _install_hooks
+}
+
+_main "$@"