test/cluster: add cluster test for prepared metadata_id promotion

Add a regression test that verifies the server correctly promotes the prepared metadata_id for statements whose PREPARE response carries empty result metadata (NO_METADATA), such as LIST ROLES OF. The standard Python driver does not negotiate SCYLLA_USE_METADATA_ID and cannot exercise this path, so the test uses a minimal raw CQL v5 socket implementation that negotiates the extension directly in the STARTUP options and includes result_metadata_id in EXECUTE frames. Two test cases are added: - test_list_roles_of_prepared_metadata_promotion: happy path — verifies that an EXECUTE carrying a stale empty metadata_id receives a METADATA_CHANGED response with the real metadata_id. - test_list_roles_of_prepared_metadata_promotion_suppressed_by_injection: negative path — activates the skip_rows_metadata_changed_response error injection point and verifies that the promotion is suppressed, confirming the happy-path test is not a false positive. To support the injection-based negative test, two error injection points are added to transport/server.cc: - skip_prepared_result_metadata_promotion: bypasses the promotion logic in process_execute_internal so the cached prepared entry is not updated. - skip_rows_metadata_changed_response: suppresses the METADATA_CHANGED flag and NO_METADATA clearance in response::write so the client sees the stale NO_METADATA response as if the fix were absent. Tests: test/cluster/auth_cluster/test_prepared_metadata_promotion.py (dev/dbg)
transport/server: Promote prepared metadata_id after first rows response
2026-04-20 00:20:47 +00:00 · 2026-03-30 10:48:17 +03:00 · 2026-03-29 15:52:31 +03:00
2688 changed files with 9560 additions and 19640 deletions
--- a/.github/scripts/check-license.py
+++ b/.github/scripts/check-license.py
@@ -4,7 +4,7 @@
 # Copyright (C) 2024-present ScyllaDB
 #
 #
-# SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+# SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 #

 import argparse
--- a/.github/workflows/call_validate_pr_author_email.yml
+++ b/.github/workflows/call_validate_pr_author_email.yml
@@ -7,11 +7,6 @@ on:
      - synchronize
      - reopened

-permissions:
-  contents: read
-  pull-requests: write
-  statuses: write
-
 jobs:
  validate_pr_author_email:
    uses: scylladb/github-automation/.github/workflows/validate_pr_author_email.yml@main
--- a/.github/workflows/check-license-header.yaml
+++ b/.github/workflows/check-license-header.yaml
@@ -7,7 +7,7 @@ on:

 env:
  HEADER_CHECK_LINES: 10
-  LICENSE: "LicenseRef-ScyllaDB-Source-Available-1.1"
+  LICENSE: "LicenseRef-ScyllaDB-Source-Available-1.0"
  CHECKED_EXTENSIONS: ".cc .hh .py"

 jobs:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,12 +2,6 @@ cmake_minimum_required(VERSION 3.27)

 project(scylla)

-# Disable CMake's automatic -fcolor-diagnostics injection (CMake 3.24+ adds
-# it for Clang+Ninja). configure.py does not add any color diagnostics flags,
-# so we clear the internal CMake variable to prevent injection.
-set(CMAKE_CXX_COMPILE_OPTIONS_COLOR_DIAGNOSTICS "")
-set(CMAKE_C_COMPILE_OPTIONS_COLOR_DIAGNOSTICS "")
-
 list(APPEND CMAKE_MODULE_PATH
  ${CMAKE_CURRENT_SOURCE_DIR}/cmake
  ${CMAKE_CURRENT_SOURCE_DIR}/seastar/cmake)
@@ -57,16 +51,6 @@ set(CMAKE_CXX_EXTENSIONS ON CACHE INTERNAL "")
 set(CMAKE_CXX_SCAN_FOR_MODULES OFF CACHE INTERNAL "")
 set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)

-# Global defines matching configure.py
-# Since gcc 13, libgcc doesn't need the exception workaround
-add_compile_definitions(SEASTAR_NO_EXCEPTION_HACK)
-# Hacks needed to expose internal APIs for xxhash dependencies
-add_compile_definitions(XXH_PRIVATE_API)
-# SEASTAR_TESTING_MAIN is added later (after add_subdirectory(seastar) and
-# add_subdirectory(abseil)) to avoid leaking into the seastar subdirectory.
-# If SEASTAR_TESTING_MAIN is defined globally before seastar, it causes a
-# duplicate 'main' symbol in seastar_testing.
-
 if(is_multi_config)
    find_package(Seastar)
    # this is atypical compared to standard ExternalProject usage:
@@ -112,33 +96,12 @@ else()
    set(Seastar_EXCLUDE_APPS_FROM_ALL ON CACHE BOOL "" FORCE)
    set(Seastar_EXCLUDE_TESTS_FROM_ALL ON CACHE BOOL "" FORCE)
    set(Seastar_IO_URING ON CACHE BOOL "" FORCE)
-    set(Seastar_SCHEDULING_GROUPS_COUNT 24 CACHE STRING "" FORCE)
+    set(Seastar_SCHEDULING_GROUPS_COUNT 21 CACHE STRING "" FORCE)
    set(Seastar_UNUSED_RESULT_ERROR ON CACHE BOOL "" FORCE)
-    # Match configure.py's build_seastar_shared_libs: Debug and Dev
-    # build Seastar as a shared library, others build it static.
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "Dev")
-        set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
-    else()
-        set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
-    endif()
    add_subdirectory(seastar)
-
-    # Coverage mode sets cmake_build_type='Debug' for Seastar
-    # (configure.py:515), so Seastar's pkg-config output includes sanitizer
-    # link flags in seastar_libs_coverage (configure.py:2514,2649).
-    # Seastar's own CMake only activates sanitizer targets for Debug/Sanitize
-    # configs, so we inject link options on the seastar target for Coverage.
-    # Using PUBLIC ensures they propagate to all targets linking Seastar
-    # (but not standalone tools like patchelf), matching configure.py's
-    # behavior.  Compile-time flags and defines are handled globally in
-    # cmake/mode.Coverage.cmake.
-    if(CMAKE_BUILD_TYPE STREQUAL "Coverage")
-        target_link_options(seastar
-            PUBLIC
-                -fsanitize=address
-                -fsanitize=undefined
-                -fsanitize=vptr)
-    endif()
+    target_compile_definitions (seastar
+      PRIVATE
+        SEASTAR_NO_EXCEPTION_HACK)
 endif()

 set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "" FORCE)
@@ -148,10 +111,8 @@ if(Scylla_ENABLE_LTO)
 endif()

 find_package(Sanitizers QUIET)
-# Match configure.py:2192 — abseil gets sanitizer flags with -fno-sanitize=vptr
-# to exclude vptr checks which are incompatible with abseil's usage.
 list(APPEND absl_cxx_flags
-    $<$<CONFIG:Debug,Sanitize>:$<TARGET_PROPERTY:Sanitizers::address,INTERFACE_COMPILE_OPTIONS>;$<TARGET_PROPERTY:Sanitizers::undefined_behavior,INTERFACE_COMPILE_OPTIONS>;-fno-sanitize=vptr>)
+    $<$<CONFIG:Debug,Sanitize>:$<TARGET_PROPERTY:Sanitizers::address,INTERFACE_COMPILE_OPTIONS>;$<TARGET_PROPERTY:Sanitizers::undefined_behavior,INTERFACE_COMPILE_OPTIONS>>)
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
    list(APPEND ABSL_GCC_FLAGS ${absl_cxx_flags})
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
@@ -176,38 +137,9 @@ add_library(absl::headers ALIAS absl-headers)
 # unfortunately.
 set_target_properties(absl_strerror PROPERTIES EXCLUDE_FROM_ALL TRUE)

-# Now that seastar and abseil subdirectories are fully processed, add
-# SEASTAR_TESTING_MAIN globally. This matches configure.py's global define
-# without leaking into seastar (which would cause duplicate main symbols).
-add_compile_definitions(SEASTAR_TESTING_MAIN)
-
 # System libraries dependencies
 find_package(Boost REQUIRED
    COMPONENTS filesystem program_options system thread regex unit_test_framework)
-# When using shared Boost libraries, define BOOST_ALL_DYN_LINK (matching configure.py)
-if(NOT Boost_USE_STATIC_LIBS)
-    add_compile_definitions(BOOST_ALL_DYN_LINK)
-endif()
-
-# CMake's Boost package config adds per-component defines like
-# BOOST_UNIT_TEST_FRAMEWORK_DYN_LINK, BOOST_REGEX_DYN_LINK, etc. on the
-# imported targets. configure.py only uses BOOST_ALL_DYN_LINK (which covers
-# all components), so strip the per-component defines to align the two build
-# systems.
-foreach(_boost_target
-    Boost::unit_test_framework
-    Boost::regex
-    Boost::filesystem
-    Boost::program_options
-    Boost::system
-    Boost::thread)
-  if(TARGET ${_boost_target})
-    # Completely remove all INTERFACE_COMPILE_DEFINITIONS from the Boost target.
-    # This prevents per-component *_DYN_LINK and *_NO_LIB defines from
-    # propagating. BOOST_ALL_DYN_LINK (set globally) covers all components.
-    set_property(TARGET ${_boost_target} PROPERTY INTERFACE_COMPILE_DEFINITIONS)
-  endif()
-endforeach()
 target_link_libraries(Boost::regex
  INTERFACE
    ICU::i18n
@@ -234,9 +166,6 @@ generate_scylla_version()

 option(Scylla_USE_PRECOMPILED_HEADER "Use precompiled header for Scylla" ON)
 add_library(scylla-precompiled-header STATIC exported_templates.cc)
-target_include_directories(scylla-precompiled-header PRIVATE
-    "${CMAKE_CURRENT_SOURCE_DIR}"
-    "${scylla_gen_build_dir}")
 target_link_libraries(scylla-precompiled-header PRIVATE
    absl::headers
    absl::btree
@@ -267,10 +196,6 @@ if (Scylla_USE_PRECOMPILED_HEADER)
    message(STATUS "Using precompiled header for Scylla - remember to add `sloppiness = pch_defines,time_macros` to ccache.conf, if you're using ccache.")
    target_precompile_headers(scylla-precompiled-header PRIVATE "stdafx.hh")
    target_compile_definitions(scylla-precompiled-header PRIVATE SCYLLA_USE_PRECOMPILED_HEADER)
-    # Match configure.py: -fpch-validate-input-files-content tells the compiler
-    # to check content of stdafx.hh if timestamps don't match (important for
-    # ccache/git workflows where timestamps may not be preserved).
-    add_compile_options(-fpch-validate-input-files-content)
  endif()
 else()
  set(Scylla_USE_PRECOMPILED_HEADER_USE OFF)
--- a/LICENSE-ScyllaDB-Source-Available.md
+++ b/LICENSE-ScyllaDB-Source-Available.md
@@ -1,8 +1,8 @@
 ## **SCYLLADB SOFTWARE LICENSE AGREEMENT**

-| Version: | 1.1 |
+| Version: | 1.0 |
 | :---- | :---- |
-| Last updated: | April 12, 2026 |
+| Last updated: | December 18, 2024 |

 **Your Acceptance**

@@ -12,48 +12,20 @@ The terms "**You**" or "**Licensee**" refer to any individual accessing or using

 **Grant of License**

-* **Definitions:**
-  1. **Software:** Software means the ScyllaDB software provided by Licensor, including the source code, object code, and any accompanying documentation or tools, or any part thereof, as made available under this Agreement.
-  2. **Commercial Customer**: means any legal entity (including its Affiliates) that has entered into a transaction with Licensor, or an authorized reseller/distributor, for the provision of any ScyllaDB products or services. This includes, without limitation:  (a) Scope of Service: Any paid subscription, enterprise license, "BYOA" or Database-as-a-Service (DBaaS) offering, technical support, professional services, consulting, or training. (b) Scale and Volume: Any deployment regardless of size, capacity, or performance metrics (c) Payment Method: Any compensation model, including but not limited to, fixed-fee, consumption-based (On-Demand), committed spend, third-party marketplace credits (e.g., AWS, GCP, Azure), or promotional credits and discounts.
-* **Grant of License:** Subject to the terms and conditions of this Agreement, including the Eligibility and Exclusive Use Restrictions clause, Licensor grants You a limited, non-exclusive, revocable, non-sublicensable, non-transferable, royalty free license to Use the Software, in each case solely for the purposes of:
+* **Software Definitions:** Software means the ScyllaDB software provided by Licensor, including the source code, object code, and any accompanying documentation or tools, or any part thereof, as made available under this Agreement.
+* **Grant of License:** Subject to the terms and conditions of this Agreement, Licensor grants You a limited, non-exclusive, revocable, non-sublicensable, non-transferable, royalty free license to Use the Software, in each case solely for the purposes of:
  1) Copying, distributing, evaluating (including performing benchmarking or comparative tests or evaluations , subject to the limitations below) and improving the Software and ScyllaDB; and
  2) create a modified version of the Software (each, a "**Licensed Work**"); provided however, that each such Licensed Work keeps all or substantially all of the functions and features of the Software, and/or using all or substantially all of the source code of the Software. You hereby agree that all the Licensed Work are, upon creation, considered Licensed Work of the Licensor, shall be the sole property of the Licensor and its assignees, and the Licensor and its assignees shall be the sole owner of all rights of any kind or nature, in connection with such Licensed Work. You hereby irrevocably and unconditionally assign to the Licensor all the Licensed Work and any part thereof.  This License applies separately for each version of the Licensed Work, which shall be considered "Software" for the purpose of this Agreement.

-* **Eligibility and Exclusive Use Restrictions**

-i. 	Restricted to "Never Customers" Only. The license granted under this Agreement is strictly limited to Never Customers. For purposes of this Agreement, a "Never Customer" is an entity (including its Affiliates) that does not have, and has not had within the previous twelve (12) months, a paid commercial subscription, professional services agreement, or any other commercial relationship with Licensor. Satisfaction of the Never Customer criteria is a strict condition precedent to the effectiveness of this License. 
-
-ii. 	Total Prohibition for Existing Commercial Customers. If You (or any of Your Affiliates) are an existing Commercial Customer of Licensor within the last twelve (12) months, no license is deemed to have been offered or extended to You, and any download or installation of the Software by You is unauthorized. This prohibition applies to all deployments, including but not limited to:
-
-(a) existing commercial workloads;
-
-(b) any new use cases, new applications, or new workloads
-
-iii. **No "Hybrid" Usage**. Licensee is expressly prohibited from combining free tier usage under this Agreement with paid commercial units. 
-
-If You are a Commercial Customer, all use of the Software across Your entire organization (and any of your Affiliates) must be governed by a valid, paid commercial agreement. Use of the Software under this license by a Commercial Customer (which is not a "Never Customer") shall:
-
-(a) Void this license *ab initio*;
-
-(b) Be deemed a material breach of both this Agreement and any existing commercial terms; and
-
-(c) Entitle Licensor to invoice Licensee for such unauthorized usage at Licensor's standard list prices, retroactive to the date of first use.
-
-Notwithstanding anything to the contrary in the Eligibility or License Limitations sections above a Commercial Customer may use the Software exclusively for non-production purposes, including Continuous Integration (CI), automated testing, and quality assurance environments, provided that such use at all times remains compliant with the Usage Limit.
-
-iv. **Verification**. Licensor reserves the right to audit Licensee's environment and corporate identity to ensure compliance with these eligibility criteria.
-
-For the purposes of this Agreement an "**Affiliate**" means any entity that directly or indirectly controls, is controlled by, or is under common control with a party, where "control" means ownership of more than 50% of the voting stock or decision-making authority
-
-
-**License Limitations, Restrictions and Obligations:** The license grant above is subject to the following limitations, restrictions, and obligations. If Licensee’s Use of the Software does not comply with the above license grant or the terms of this section (including exceeding the Usage Limit set forth below), Licensee must: (i) refrain from any Use of the Software; and (ii) unless Licensee is a Never Customer, purchase a [commercial paid license](https://www.scylladb.com/scylladb-proprietary-software-license-agreement/) from the Licensor.
+**License Limitations, Restrictions and Obligations:** The license grant above is subject to the following limitations, restrictions, and obligations. If Licensee’s Use of the Software does not comply with the above license grant or the terms of this section (including exceeding the Usage Limit set forth below), Licensee must: (i) refrain from any Use of the Software; and (ii) purchase a [commercial paid license](https://www.scylladb.com/scylladb-proprietary-software-license-agreement/) from the Licensor.

 * **Updates:** You shall be solely responsible for providing all equipment, systems, assets, access, and ancillary goods and services needed to access and Use the Software.  Licensor may modify or update the Software at any time, without notification, in its sole and absolute discretion.  After the effective date of each such update, Licensor shall bear no obligation to run, provide or support legacy versions of the Software.
 * **"Usage Limit":** Licensee's total overall available storage across all deployments and clusters of the Software and the Licensed Work under this License shall not exceed 10TB and/or an upper limit of 50 VCPUs (hyper threads).
 * **IP Markings:** Licensee must retain all copyright, trademark, and other proprietary notices contained in the Software. You will not modify, delete, alter, remove, or obscure any intellectual property, including without limitations licensing, copyright, trademark, or any other notices of Licensor in the Software.
 * **License Reproduction:** You must conspicuously display this Agreement on each copy of the Software. If You receive the Software from a third party, this Agreement still applies to Your Use of the Software. You will be responsible for any breach of this Agreement by any such third-party.
 * Distribution of any Licensed Works is permitted, provided that: (i) You must include in any Licensed Work prominent notices stating that You have modified the Software, (ii) You include a copy of this Agreement with the Licensed Work, and (iii) You clearly identify all modifications made in the Licensed Work and provides attribution to the Licensor as the original author(s) of the Software.
-* **Commercial Use Restrictions:** Licensee may not offer the Software as a software-as-a-service (SaaS) or commercial database-as-as-service (dBaaS) offering.  Licensee may not use the Software to compete with Licensor's existing or future products or services. If your Use of the Software does not comply with the requirements currently in effect as described in this License, you must purchase a commercial license from the Licensor, its Affiliated entities, or you must refrain from using the Software and all Licensed Work. Furthermore, if You make any written claim of patent infringement relating to the Software, Your patent license for the Software granted under this Agreement terminates immediately.
+* **Commercial Use Restrictions:** Licensee may not offer the Software as a software-as-a-service (SaaS) or commercial database-as-as-service (dBaaS) offering.  Licensee may not use the Software to compete with Licensor's existing or future products or services. If your Use of the Software does not comply with the requirements currently in effect as described in this License, you must purchase a commercial license from the Licensor, its affiliated entities, or you must refrain from using the Software and all Licensed Work. Furthermore, if You make any written claim of patent infringement relating to the Software, Your patent license for the Software granted under this Agreement terminates immediately.
 * Notwithstanding anything to the contrary, under the License granted hereunder, You shall not and shall not permit others to: (i) transfer the Software or any portions thereof to any other party except as expressly permitted herein; (ii) attempt to circumvent or overcome any technological protection measures incorporated into the Software; (iii) incorporate the Software into the structure, machinery or controls of any aircraft, other aerial device, military vehicle, hovercraft, waterborne craft or any medical equipment of any kind; or (iv) use the Software or any part thereof in any unlawful, harmful or illegal manner, or in a manner which infringes third parties’ rights in any way, including intellectual property rights.

 **Monitoring; Audit**
@@ -69,14 +41,14 @@ For the purposes of this Agreement an "**Affiliate**" means any entity that dire

 **Indemnity; Disclaimer; Limitation of Liability**

-* **Indemnity:** Licensee hereby agrees to indemnify, defend and hold harmless Licensor and its Affiliates from any losses or damages incurred due to a third party claim arising out of: (i) Licensee’s breach of this Agreement; (ii) Licensee’s negligence, willful misconduct or violation of law, or (iii) Licensee’s products or services.
+* **Indemnity:** Licensee hereby agrees to indemnify, defend and hold harmless Licensor and its affiliates from any losses or damages incurred due to a third party claim arising out of: (i) Licensee’s breach of this Agreement; (ii) Licensee’s negligence, willful misconduct or violation of law, or (iii) Licensee’s products or services.
 * DISCLAIMER OF WARRANTIES:  LICENSEE AGREES THAT LICENSOR HAS MADE NO EXPRESS WARRANTIES REGARDING THE SOFTWARE AND THAT THE SOFTWARE IS BEING PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. LICENSOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THE SOFTWARE, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE; TITLE; MERCHANTABILITY;  OR NON-INFRINGEMENT OF THIRD PARTY RIGHTS. LICENSOR DOES NOT WARRANT THAT THE SOFTWARE WILL OPERATE UNINTERRUPTED OR ERROR FREE, OR THAT ALL ERRORS WILL BE CORRECTED.  LICENSOR DOES NOT GUARANTEE ANY PARTICULAR RESULTS FROM THE USE OF THE SOFTWARE, AND DOES NOT WARRANT THAT THE SOFTWARE IS FIT FOR ANY PARTICULAR PURPOSE.
 * LIMITATION OF LIABILITY:  TO THE FULLEST EXTENT PERMISSIBLE UNDER APPLICABLE LAW, IN NO EVENT WILL LICENSOR AND/OR ITS AFFILIATES, EMPLOYEES, OFFICERS AND DIRECTORS BE LIABLE TO LICENSEE FOR (I) ANY LOSS OF USE OR DATA; INTERRUPTION OF BUSINESS; OR ANY INDIRECT; SPECIAL; INCIDENTAL; OR CONSEQUENTIAL DAMAGES OF ANY KIND (INCLUDING LOST PROFITS); AND (II) ANY DIRECT DAMAGES EXCEEDING THE TOTAL AMOUNT OF ONE THOUSAND US DOLLARS ($1,000).  THE FOREGOING PROVISIONS LIMITING THE LIABILITY OF LICENSOR SHALL APPLY REGARDLESS OF THE FORM OR CAUSE OF ACTION, WHETHER IN STRICT LIABILITY, CONTRACT OR TORT.

 **Proprietary Rights; No Other Rights**

 * **Ownership:** Licensor retains sole and exclusive ownership of all rights, interests and title in the Software and any scripts, processes, techniques, methodologies, inventions, know-how, concepts, formatting, arrangements, visual attributes, ideas, database rights, copyrights, patents, trade secrets, and other intellectual property related thereto, and all derivatives, enhancements, modifications and improvements thereof. Except for the limited license rights granted herein, Licensee has no rights in or to the Software and/ or Licensor’s trademarks, logo, or branding and You acknowledge that such Software, trademarks, logo, or branding is the sole property of Licensor.
-* **Feedback:** Licensee is not required to provide any suggestions, enhancement requests, recommendations or other feedback regarding the Software ("Feedback").  If, notwithstanding this policy, Licensee submits Feedback, Licensee understands and acknowledges that such Feedback is not submitted in confidence and Licensor assumes no obligation, expressed or implied, by considering it.  All right in any trademark or logo of Licensor or its Affiliates and You shall make no claim of right to the Software or any part thereof to be supplied by Licensor hereunder and acknowledges that as between Licensor and You, such Software is the sole proprietary, title and interest in and to Licensor.such Feedback shall be assigned to, and shall become the sole and exclusive property of, Licensor upon its creation.
+* **Feedback:** Licensee is not required to provide any suggestions, enhancement requests, recommendations or other feedback regarding the Software ("Feedback").  If, notwithstanding this policy, Licensee submits Feedback, Licensee understands and acknowledges that such Feedback is not submitted in confidence and Licensor assumes no obligation, expressed or implied, by considering it.  All right in any trademark or logo of Licensor or its affiliates and You shall make no claim of right to the Software or any part thereof to be supplied by Licensor hereunder and acknowledges that as between Licensor and You, such Software is the sole proprietary, title and interest in and to Licensor.such Feedback shall be assigned to, and shall become the sole and exclusive property of, Licensor upon its creation.
 * Except for the rights expressly granted to You under this Agreement, You are not granted any other licenses or rights in the Software or otherwise. This Agreement constitutes the entire agreement between You and the Licensor with respect to the subject matter hereof and supersedes all prior or contemporaneous communications, representations, or agreements, whether oral or written.
 * **Third-Party Software:** Customer acknowledges that the Software may contain open and closed source components (“OSS Components”) that are governed separately by certain licenses, in each case as further provided by Company upon request. Any applicable OSS Component license is solely between Licensee and the applicable licensor of the OSS Component and Licensee shall comply with the applicable OSS Component license.
 * If any provision of this Agreement is held to be invalid or unenforceable, such provision shall be struck and the remaining provisions shall remain in full force and effect.
@@ -84,7 +56,7 @@ For the purposes of this Agreement an "**Affiliate**" means any entity that dire
 **Miscellaneous**

 * **Miscellaneous:** This Agreement may be modified at any time by Licensor, and constitutes the entire agreement between the parties with respect to the subject matter hereof. Licensee may not assign or subcontract its rights or obligations under this Agreement.  This Agreement does not, and shall not be construed to create any relationship, partnership, joint venture, employer-employee, agency, or franchisor-franchisee relationship between the parties.
-* **Modifications**: Licensor reserves the right to modify this Agreement at any time. Changes will be effective upon posting to the Website or within the Software repository. Continued use of the Software after such changes constitutes acceptance.
 * **Governing Law & Jurisdiction:** This Agreement shall be governed and construed in accordance with the laws of Israel, without giving effect to their respective conflicts of laws provisions, and the competent courts situated in Tel Aviv, Israel, shall have sole and exclusive jurisdiction over the parties and any conflict and/or dispute arising out of, or in connection to, this Agreement

 \[*End of ScyllaDB Software License Agreement*\]
+
--- a/2
+++ b/2
--- a/absl-flat_hash_map.cc
+++ b/absl-flat_hash_map.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "absl-flat_hash_map.hh"
--- a/absl-flat_hash_map.hh
+++ b/absl-flat_hash_map.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/auth.cc
+++ b/alternator/auth.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "alternator/error.hh"
--- a/alternator/auth.hh
+++ b/alternator/auth.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/conditions.cc
+++ b/alternator/conditions.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <string_view>
--- a/alternator/conditions.hh
+++ b/alternator/conditions.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 /*
--- a/alternator/consumed_capacity.cc
+++ b/alternator/consumed_capacity.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "consumed_capacity.hh"
--- a/alternator/consumed_capacity.hh
+++ b/alternator/consumed_capacity.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/controller.cc
+++ b/alternator/controller.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <seastar/core/with_scheduling_group.hh>
--- a/alternator/controller.hh
+++ b/alternator/controller.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/error.hh
+++ b/alternator/error.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/executor.cc
+++ b/alternator/executor.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <fmt/ranges.h>
--- a/alternator/executor.hh
+++ b/alternator/executor.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/expressions.cc
+++ b/alternator/expressions.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "expressions.hh"
--- a/alternator/expressions.g
+++ b/alternator/expressions.g
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 /*
--- a/alternator/expressions.hh
+++ b/alternator/expressions.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/expressions_types.hh
+++ b/alternator/expressions_types.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/extract_from_attrs.hh
+++ b/alternator/extract_from_attrs.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/http_compression.cc
+++ b/alternator/http_compression.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "alternator/http_compression.hh"
--- a/alternator/http_compression.hh
+++ b/alternator/http_compression.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/parsed_expression_cache.cc
+++ b/alternator/parsed_expression_cache.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "expressions.hh"
--- a/alternator/rmw_operation.hh
+++ b/alternator/rmw_operation.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/serialization.cc
+++ b/alternator/serialization.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "utils/base64.hh"
--- a/alternator/serialization.hh
+++ b/alternator/serialization.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/server.cc
+++ b/alternator/server.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "alternator/server.hh"
@@ -699,17 +699,6 @@ future<executor::request_return_type> server::handle_api_request(std::unique_ptr
        // for such a size.
        co_return api_error::payload_too_large(fmt::format("Request content length limit of {} bytes exceeded", request_content_length_limit));
    }
-    // Check the concurrency limit early, before acquiring memory and
-    // reading the request body, to avoid piling up memory from excess
-    // requests that will be rejected anyway. This mirrors the CQL
-    // transport which also checks concurrency before memory acquisition
-    // (transport/server.cc).
-    if (_pending_requests.get_count() >= _max_concurrent_requests) {
-        _executor._stats.requests_shed++;
-        co_return api_error::request_limit_exceeded(format("too many in-flight requests (configured via max_concurrent_requests_per_shard): {}", _pending_requests.get_count()));
-    }
-    _pending_requests.enter();
-    auto leave = defer([this] () noexcept { _pending_requests.leave(); });
    // JSON parsing can allocate up to roughly 2x the size of the raw
    // document, + a couple of bytes for maintenance.
    // If the Content-Length of the request is not available, we assume
@@ -771,6 +760,12 @@ future<executor::request_return_type> server::handle_api_request(std::unique_ptr
        _executor._stats.unsupported_operations++;
        co_return api_error::unknown_operation(fmt::format("Unsupported operation {}", op));
    }
+    if (_pending_requests.get_count() >= _max_concurrent_requests) {
+        _executor._stats.requests_shed++;
+        co_return api_error::request_limit_exceeded(format("too many in-flight requests (configured via max_concurrent_requests_per_shard): {}", _pending_requests.get_count()));
+    }
+    _pending_requests.enter();
+    auto leave = defer([this] () noexcept { _pending_requests.leave(); });
    executor::client_state client_state(service::client_state::external_tag(),
        _auth_service, &_sl_controller, _timeout_config.current_values(), req->get_client_address());
    if (!username.empty()) {
--- a/alternator/server.hh
+++ b/alternator/server.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/stats.cc
+++ b/alternator/stats.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "stats.hh"
--- a/alternator/stats.hh
+++ b/alternator/stats.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/streams.cc
+++ b/alternator/streams.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <type_traits>
@@ -33,7 +33,7 @@
 #include "data_dictionary/data_dictionary.hh"
 #include "utils/rjson.hh"

-static logging::logger slogger("alternator-streams");
+static logging::logger elogger("alternator-streams");

 /**
 * Base template type to implement  rapidjson::internal::TypeHelper<...>:s
@@ -437,7 +437,7 @@ const cdc::stream_id& find_parent_shard_in_previous_generation(db_clock::time_po
    if (prev_streams.empty()) {
        // something is really wrong - streams are empty
        // let's try internal_error in hope it will be notified and fixed
-        on_internal_error(slogger, fmt::format("streams are empty for cdc generation at {} ({})", prev_timestamp, prev_timestamp.time_since_epoch().count()));
+        on_internal_error(elogger, fmt::format("streams are empty for cdc generation at {} ({})", prev_timestamp, prev_timestamp.time_since_epoch().count()));
    }
    auto it = std::lower_bound(prev_streams.begin(), prev_streams.end(), child.token(), [](const cdc::stream_id& id, const dht::token& t) {
        return id.token() < t;
@@ -787,18 +787,16 @@ future<executor::request_return_type> executor::get_shard_iterator(client_state&
 struct event_id {
    cdc::stream_id stream;
    utils::UUID timestamp;
-    size_t index = 0;

    static constexpr auto marker = 'E';

-    event_id(cdc::stream_id s, utils::UUID ts, size_t index)
+    event_id(cdc::stream_id s, utils::UUID ts)
        : stream(s)
        , timestamp(ts)
-        , index(index)
    {}
    
    friend std::ostream& operator<<(std::ostream& os, const event_id& id) {
-        fmt::print(os, "{}{}:{}:{}", marker, id.stream.to_bytes(), id.timestamp, id.index);
+        fmt::print(os, "{}{}:{}", marker, id.stream.to_bytes(), id.timestamp);
        return os;
    }
 };
@@ -810,19 +808,7 @@ struct rapidjson::internal::TypeHelper<ValueType, alternator::event_id>
 {};

 namespace alternator {
-    namespace {
-        struct managed_bytes_ptr_hash {
-            size_t operator()(const managed_bytes *k) const noexcept {
-                return std::hash<managed_bytes>{}(*k);
-            }
-        };
-        struct managed_bytes_ptr_equal {
-            bool operator()(const managed_bytes *a, const managed_bytes *b) const noexcept {
-                return *a == *b;
-            }
-        };
-    }
-
+    
 future<executor::request_return_type> executor::get_records(client_state& client_state, tracing::trace_state_ptr trace_state, service_permit permit, rjson::value request) {
    _stats.api_operations.get_records++;
    auto start_time = std::chrono::steady_clock::now();
@@ -893,12 +879,6 @@ future<executor::request_return_type> executor::get_records(client_state& client

    auto pks = schema->partition_key_columns();
    auto cks = schema->clustering_key_columns();
-    
-    auto base_cks = base->clustering_key_columns();
-    if (base_cks.size() > 1) {
-        throw api_error::internal(fmt::format("invalid alternator table, clustering key count ({}) is bigger than one", base_cks.size()));
-    }
-    const bytes *clustering_key_column_name = !base_cks.empty() ? &base_cks.front().name() : nullptr;

    std::transform(pks.begin(), pks.end(), std::back_inserter(columns), [](auto& c) { return &c; });
    std::transform(cks.begin(), cks.end(), std::back_inserter(columns), [](auto& c) { return &c; });
@@ -953,40 +933,42 @@ future<executor::request_return_type> executor::get_records(client_state& client
            return cdef->name->name() == eor_column_name;
        })
    );
-    auto clustering_key_index = clustering_key_column_name ? std::distance(metadata.get_names().begin(), 
-        std::find_if(metadata.get_names().begin(), metadata.get_names().end(), [&](const lw_shared_ptr<cql3::column_specification>& cdef) {
-            return cdef->name->name() == *clustering_key_column_name;
-        })
-    ) : 0;

    std::optional<utils::UUID> timestamp;
-    struct Record {
-        rjson::value record;
-        rjson::value dynamodb;
-    };
-    const managed_bytes empty_managed_bytes;
-    std::unordered_map<const managed_bytes*, Record, managed_bytes_ptr_hash, managed_bytes_ptr_equal> records_map;
+    auto dynamodb = rjson::empty_object();
+    auto record = rjson::empty_object();
    const auto dc_name = _proxy.get_token_metadata_ptr()->get_topology().get_datacenter();

    using op_utype = std::underlying_type_t<cdc::operation>;

+    auto maybe_add_record = [&] {
+        if (!dynamodb.ObjectEmpty()) {
+            rjson::add(record, "dynamodb", std::move(dynamodb));
+            dynamodb = rjson::empty_object();
+        }
+        if (!record.ObjectEmpty()) {
+            rjson::add(record, "awsRegion", rjson::from_string(dc_name));
+            rjson::add(record, "eventID", event_id(iter.shard.id, *timestamp));
+            rjson::add(record, "eventSource", "scylladb:alternator");
+            rjson::add(record, "eventVersion", "1.1");
+            rjson::push_back(records, std::move(record));
+            record = rjson::empty_object();
+            --limit;
+        }
+    };
+
    for (auto& row : result_set->rows()) {
        auto op = static_cast<cdc::operation>(value_cast<op_utype>(data_type_for<op_utype>()->deserialize(*row[op_index])));
        auto ts = value_cast<utils::UUID>(data_type_for<utils::UUID>()->deserialize(*row[ts_index]));
        auto eor = row[eor_index].has_value() ? value_cast<bool>(boolean_type->deserialize(*row[eor_index])) : false;
-        const managed_bytes* cs_ptr = clustering_key_column_name ? &*row[clustering_key_index] : &empty_managed_bytes;
-        auto records_it = records_map.emplace(cs_ptr, Record{});
-        auto &record = records_it.first->second;

-        if (records_it.second) {
-            record.dynamodb = rjson::empty_object();
-            record.record = rjson::empty_object();
+        if (!dynamodb.HasMember("Keys")) {
            auto keys = rjson::empty_object();
            describe_single_item(*selection, row, key_names, keys);
-            rjson::add(record.dynamodb, "Keys", std::move(keys));
-            rjson::add(record.dynamodb, "ApproximateCreationDateTime", utils::UUID_gen::unix_timestamp_in_sec(ts).count());
-            rjson::add(record.dynamodb, "SequenceNumber", sequence_number(ts));
-            rjson::add(record.dynamodb, "StreamViewType", type);
+            rjson::add(dynamodb, "Keys", std::move(keys));
+            rjson::add(dynamodb, "ApproximateCreationDateTime", utils::UUID_gen::unix_timestamp_in_sec(ts).count());
+            rjson::add(dynamodb, "SequenceNumber", sequence_number(ts));
+            rjson::add(dynamodb, "StreamViewType", type);
            // TODO: SizeBytes
        }

@@ -1010,10 +992,6 @@ future<executor::request_return_type> executor::get_records(client_state& client
         * flags on CDC log, instead we use data to 
         * drive what is returned. This is (afaict)
         * consistent with dynamo streams
-         * 
-         * Note: BatchWriteItem will generate multiple records with
-         * the same timestamp, when write isolation is set to always
-         * (which triggers lwt), so we need to unpack them based on clustering key.
         */
        switch (op) {
        case cdc::operation::pre_image:
@@ -1022,14 +1000,14 @@ future<executor::request_return_type> executor::get_records(client_state& client
            auto item = rjson::empty_object();
            describe_single_item(*selection, row, attr_names, item, nullptr, true);
            describe_single_item(*selection, row, key_names, item);
-            rjson::add(record.dynamodb, op == cdc::operation::pre_image ? "OldImage" : "NewImage", std::move(item));
+            rjson::add(dynamodb, op == cdc::operation::pre_image ? "OldImage" : "NewImage", std::move(item));
            break;
        }
        case cdc::operation::update:
-            rjson::add(record.record, "eventName", "MODIFY");
+            rjson::add(record, "eventName", "MODIFY");
            break;
        case cdc::operation::insert:
-            rjson::add(record.record, "eventName", "INSERT");
+            rjson::add(record, "eventName", "INSERT");
            break;
        case cdc::operation::service_row_delete:
        case cdc::operation::service_partition_delete:
@@ -1037,41 +1015,28 @@ future<executor::request_return_type> executor::get_records(client_state& client
            auto user_identity = rjson::empty_object();
            rjson::add(user_identity, "Type", "Service");
            rjson::add(user_identity, "PrincipalId", "dynamodb.amazonaws.com");
-            rjson::add(record.record, "userIdentity", std::move(user_identity));
-            rjson::add(record.record, "eventName", "REMOVE");
+            rjson::add(record, "userIdentity", std::move(user_identity));
+            rjson::add(record, "eventName", "REMOVE");
            break;
        }
        default:
-            rjson::add(record.record, "eventName", "REMOVE");
+            rjson::add(record, "eventName", "REMOVE");
            break;
        }
        if (eor) {
-            size_t index = 0;
-            for (auto& [_, rec] : records_map) {
-                rjson::add(rec.record, "awsRegion", rjson::from_string(dc_name));
-                rjson::add(rec.record, "eventID", event_id(iter.shard.id, *timestamp, index++));
-                rjson::add(rec.record, "eventSource", "scylladb:alternator");
-                rjson::add(rec.record, "eventVersion", "1.1");
-
-                rjson::add(rec.record, "dynamodb", std::move(rec.dynamodb));
-                rjson::push_back(records, std::move(rec.record));
-            }
-
-            records_map.clear();
+            maybe_add_record();
            timestamp = ts;
-            if (records.Size() >= limit) {
-                // Note: we might have more than limit rows here - BatchWriteItem will emit multiple items
-                // with the same timestamp and we have no way of resume iteration midway through those,
-                // so we return all of them here.
+            if (limit == 0) {
                break;
            }
        }
    }

    auto ret = rjson::empty_object();
+    auto nrecords = records.Size();
    rjson::add(ret, "Records", std::move(records));

-    if (timestamp) {
+    if (nrecords != 0) {
        // #9642. Set next iterators threshold to > last
        shard_iterator next_iter(iter.table, iter.shard, *timestamp, false);
        // Note that here we unconditionally return NextShardIterator,
@@ -1122,7 +1087,6 @@ bool executor::add_stream_options(const rjson::value& stream_specification, sche

        cdc::options opts;
        opts.enabled(true);
-        // cdc::delta_mode is ignored by Alternator, so aim for the least overhead.
        opts.set_delta_mode(cdc::delta_mode::keys);
        opts.ttl(std::chrono::duration_cast<std::chrono::seconds>(dynamodb_streams_max_window).count());

--- a/alternator/ttl.cc
+++ b/alternator/ttl.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <chrono>
--- a/alternator/ttl.hh
+++ b/alternator/ttl.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/alternator/ttl_tag.hh
+++ b/alternator/ttl_tag.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/api-doc/storage_service.json
+++ b/api/api-doc/storage_service.json
@@ -743,7 +743,7 @@
               "parameters":[
                  {
                     "name":"tag",
-                     "description":"The snapshot tag to delete. If omitted, all snapshots are removed.",
+                     "description":"the tag given to the snapshot",
                     "required":false,
                     "allowMultiple":false,
                     "type":"string",
@@ -751,7 +751,7 @@
                  },
                  {
                     "name":"kn",
-                     "description":"Comma-separated list of keyspace names to delete snapshots from. If omitted, snapshots are deleted from all keyspaces.",
+                     "description":"Comma-separated keyspaces name that their snapshot will be deleted",
                     "required":false,
                     "allowMultiple":false,
                     "type":"string",
@@ -759,7 +759,7 @@
                  },
                  {
                     "name":"cf",
-                     "description":"A table name used to filter which table's snapshots are deleted. If omitted or empty, snapshots for all tables are eligible. When provided together with 'kn', the table is looked up in each listed keyspace independently. For secondary indexes, the logical index name (e.g. 'myindex') can be used and is resolved automatically.",
+                     "description":"an optional table name that its snapshot will be deleted",
                     "required":false,
                     "allowMultiple":false,
                     "type":"string",
@@ -3166,83 +3166,6 @@
         ]
      },

-      {
-         "path":"/storage_service/vnode_tablet_migrations/keyspaces/{keyspace}",
-         "operations":[{
-             "method":"POST",
-             "summary":"Start vnodes-to-tablets migration for all tables in a keyspace",
-             "type":"void",
-             "nickname":"create_vnode_tablet_migration",
-             "produces":["application/json"],
-             "parameters":[
-                 {
-                     "name":"keyspace",
-                     "description":"Keyspace name",
-                     "required":true,
-                     "allowMultiple":false,
-                     "type":"string",
-                     "paramType":"path"
-                 }
-             ]
-         },
-         {
-             "method":"GET",
-             "summary":"Get a keyspace's vnodes-to-tablets migration status",
-             "type":"vnode_tablet_migration_status",
-             "nickname":"get_vnode_tablet_migration",
-             "produces":["application/json"],
-             "parameters":[
-                 {
-                     "name":"keyspace",
-                     "description":"Keyspace name",
-                     "required":true,
-                     "allowMultiple":false,
-                     "type":"string",
-                     "paramType":"path"
-                 }
-             ]
-         }]
-      },
-      {
-         "path":"/storage_service/vnode_tablet_migrations/node/storage_mode",
-         "operations":[{
-             "method":"PUT",
-             "summary":"Set the intended storage mode for this node during vnodes-to-tablets migration",
-             "type":"void",
-             "nickname":"set_vnode_tablet_migration_node_storage_mode",
-             "produces":["application/json"],
-             "parameters":[
-                 {
-                     "name":"intended_mode",
-                     "description":"Intended storage mode (tablets or vnodes)",
-                     "required":true,
-                     "allowMultiple":false,
-                     "type":"string",
-                     "paramType":"query"
-                 }
-             ]
-         }]
-      },
-      {
-         "path":"/storage_service/vnode_tablet_migrations/keyspaces/{keyspace}/finalization",
-         "operations":[{
-             "method":"POST",
-             "summary":"Finalize vnodes-to-tablets migration for all tables in a keyspace",
-             "type":"void",
-             "nickname":"finalize_vnode_tablet_migration",
-             "produces":["application/json"],
-             "parameters":[
-                 {
-                     "name":"keyspace",
-                     "description":"Keyspace name",
-                     "required":true,
-                     "allowMultiple":false,
-                     "type":"string",
-                     "paramType":"path"
-                 }
-             ]
-         }]
-      },
      {
         "path":"/storage_service/quiesce_topology",
         "operations":[
@@ -3860,45 +3783,6 @@
               "description":"The resulting compression ratio (estimated on a random sample of files)"
            }
         }
-      },
-      "vnode_tablet_migration_node_status":{
-         "id":"vnode_tablet_migration_node_status",
-         "description":"Node storage mode info during vnodes-to-tablets migration",
-         "properties":{
-            "host_id":{
-               "type":"string",
-               "description":"The host ID"
-            },
-            "current_mode":{
-               "type":"string",
-               "description":"The current storage mode: `vnodes` or `tablets`"
-            },
-            "intended_mode":{
-               "type":"string",
-               "description":"The intended storage mode: `vnodes` or `tablets`"
-            }
-         }
-      },
-      "vnode_tablet_migration_status":{
-         "id":"vnode_tablet_migration_status",
-         "description":"Vnodes-to-tablets migration status for a keyspace",
-         "properties":{
-            "keyspace":{
-               "type":"string",
-               "description":"The keyspace name"
-            },
-            "status":{
-               "type":"string",
-               "description":"The migration status: `vnodes` (not started), `migrating_to_tablets` (in progress), or `tablets` (complete)"
-            },
-            "nodes":{
-               "type":"array",
-               "items":{
-                  "$ref":"vnode_tablet_migration_node_status"
-               },
-               "description":"Per-node storage mode information. Empty if the keyspace is not being migrated."
-            }
-         }
      }
   }
 }
--- a/api/api.cc
+++ b/api/api.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "api.hh"
--- a/api/api.hh
+++ b/api/api.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/api_init.hh
+++ b/api/api_init.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */
 #pragma once

--- a/api/authorization_cache.cc
+++ b/api/authorization_cache.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "api/api-doc/authorization_cache.json.hh"
--- a/api/authorization_cache.hh
+++ b/api/authorization_cache.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/cache_service.cc
+++ b/api/cache_service.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "cache_service.hh"
--- a/api/cache_service.hh
+++ b/api/cache_service.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/client_routes.cc
+++ b/api/client_routes.cc
@@ -4,7 +4,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <seastar/http/short_streams.hh>
--- a/api/client_routes.hh
+++ b/api/client_routes.hh
@@ -4,7 +4,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */
 #pragma once

--- a/api/collectd.cc
+++ b/api/collectd.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "collectd.hh"
--- a/api/collectd.hh
+++ b/api/collectd.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/column_family.cc
+++ b/api/column_family.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <fmt/ranges.h>
--- a/api/column_family.hh
+++ b/api/column_family.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/commitlog.cc
+++ b/api/commitlog.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "commitlog.hh"
--- a/api/commitlog.hh
+++ b/api/commitlog.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/compaction_manager.cc
+++ b/api/compaction_manager.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <seastar/core/coroutine.hh>
--- a/api/compaction_manager.hh
+++ b/api/compaction_manager.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/config.cc
+++ b/api/config.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "api/api.hh"
--- a/api/config.hh
+++ b/api/config.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/cql_server_test.cc
+++ b/api/cql_server_test.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "build_mode.hh"
--- a/api/cql_server_test.hh
+++ b/api/cql_server_test.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #ifndef SCYLLA_BUILD_MODE_RELEASE
--- a/api/endpoint_snitch.cc
+++ b/api/endpoint_snitch.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "locator/snitch_base.hh"
--- a/api/endpoint_snitch.hh
+++ b/api/endpoint_snitch.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/error_injection.cc
+++ b/api/error_injection.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "api/api-doc/error_injection.json.hh"
@@ -23,7 +23,7 @@ void set_error_injection(http_context& ctx, routes& r) {

    hf::enable_injection.set(r, [](std::unique_ptr<request> req) -> future<json::json_return_type> {
        sstring injection = req->get_path_param("injection");
-        bool one_shot = strcasecmp(req->get_query_param("one_shot").c_str(), "true") == 0;
+        bool one_shot = req->get_query_param("one_shot") == "True";
        auto params = co_await util::read_entire_stream_contiguous(*req->content_stream);

        const size_t max_params_size = 1024 * 1024;
--- a/api/error_injection.hh
+++ b/api/error_injection.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/failure_detector.cc
+++ b/api/failure_detector.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "failure_detector.hh"
--- a/api/failure_detector.hh
+++ b/api/failure_detector.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/gossiper.cc
+++ b/api/gossiper.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <seastar/core/coroutine.hh>
--- a/api/gossiper.hh
+++ b/api/gossiper.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/hinted_handoff.cc
+++ b/api/hinted_handoff.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <vector>
--- a/api/hinted_handoff.hh
+++ b/api/hinted_handoff.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/lsa.cc
+++ b/api/lsa.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "api/api-doc/lsa.json.hh"
--- a/api/lsa.hh
+++ b/api/lsa.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/messaging_service.cc
+++ b/api/messaging_service.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "messaging_service.hh"
--- a/api/messaging_service.hh
+++ b/api/messaging_service.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/raft.cc
+++ b/api/raft.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <seastar/core/coroutine.hh>
--- a/api/raft.hh
+++ b/api/raft.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/scrub_status.hh
+++ b/api/scrub_status.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/service_levels.cc
+++ b/api/service_levels.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "service_levels.hh"
--- a/api/service_levels.hh
+++ b/api/service_levels.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/storage_proxy.cc
+++ b/api/storage_proxy.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "storage_proxy.hh"
--- a/api/storage_proxy.hh
+++ b/api/storage_proxy.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/storage_service.cc
+++ b/api/storage_service.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "storage_service.hh"
@@ -30,7 +30,6 @@
 #include <fmt/ranges.h>
 #include "service/raft/raft_group0_client.hh"
 #include "service/storage_service.hh"
-#include "service/topology_state_machine.hh"
 #include "service/load_meter.hh"
 #include "gms/feature_service.hh"
 #include "gms/gossiper.hh"
@@ -573,6 +572,14 @@ void unset_view_builder(http_context& ctx, routes& r) {
    cf::get_built_indexes.unset(r);
 }

+static future<json::json_return_type> describe_ring_as_json(sharded<service::storage_service>& ss, sstring keyspace) {
+    co_return json::json_return_type(stream_range_as_array(co_await ss.local().describe_ring(keyspace), token_range_endpoints_to_json));
+}
+
+static future<json::json_return_type> describe_ring_as_json_for_table(const sharded<service::storage_service>& ss, sstring keyspace, sstring table) {
+    co_return json::json_return_type(stream_range_as_array(co_await ss.local().describe_ring_for_table(keyspace, table), token_range_endpoints_to_json));
+}
+
 namespace {
 template <typename Key, typename Value>
 storage_service_json::mapper map_to_json(const std::pair<Key, Value>& i) {
@@ -670,16 +677,13 @@ rest_describe_ring(http_context& ctx, sharded<service::storage_service>& ss, std
        if (!req->param.exists("keyspace")) {
            throw bad_param_exception("The keyspace param is not provided");
        }
-        auto keyspace = validate_keyspace(ctx, req);
+        auto keyspace = req->get_path_param("keyspace");
        auto table = req->get_query_param("table");
-        utils::chunked_vector<dht::token_range_endpoints> ranges;
        if (!table.empty()) {
-            auto table_id = validate_table(ctx.db.local(), keyspace, table);
-            ranges = co_await ss.local().describe_ring_for_table(table_id);
-        } else {
-            ranges = co_await ss.local().describe_ring(keyspace);
+            validate_table(ctx.db.local(), keyspace, table);
+            return describe_ring_as_json_for_table(ss, keyspace, table);
        }
-        co_return json::json_return_type(stream_range_as_array(std::move(ranges), token_range_endpoints_to_json));
+        return describe_ring_as_json(ss, validate_keyspace(ctx, req));
 }

 static
@@ -1723,69 +1727,6 @@ rest_tablet_balancing_enable(sharded<service::storage_service>& ss, std::unique_
        co_return json_void();
 }

-static
-future<json::json_return_type>
-rest_create_vnode_tablet_migration(http_context& ctx, sharded<service::storage_service>& ss, std::unique_ptr<http::request> req) {
-    if (!ss.local().get_feature_service().vnodes_to_tablets_migrations) {
-        apilog.warn("create_vnode_tablet_migration: called before the cluster feature was enabled");
-        throw std::runtime_error("vnodes-to-tablets migration requires all nodes to support the VNODES_TO_TABLETS_MIGRATIONS cluster feature");
-    }
-    auto keyspace = validate_keyspace(ctx, req);
-    co_await ss.local().prepare_for_tablets_migration(keyspace);
-    co_return json_void();
-}
-
-static
-future<json::json_return_type>
-rest_get_vnode_tablet_migration(http_context& ctx, sharded<service::storage_service>& ss, std::unique_ptr<http::request> req) {
-    if (!ss.local().get_feature_service().vnodes_to_tablets_migrations) {
-        apilog.warn("get_vnode_tablet_migration: called before the cluster feature was enabled");
-        throw std::runtime_error("vnodes-to-tablets migration requires all nodes to support the VNODES_TO_TABLETS_MIGRATIONS cluster feature");
-    }
-    auto keyspace = validate_keyspace(ctx, req);
-    auto status = co_await ss.local().get_tablets_migration_status(keyspace);
-
-    ss::vnode_tablet_migration_status result;
-    result.keyspace = status.keyspace;
-    result.status = status.status;
-    result.nodes._set = true;
-    for (const auto& node : status.nodes) {
-        ss::vnode_tablet_migration_node_status n;
-        n.host_id = fmt::to_string(node.host_id);
-        n.current_mode = node.current_mode;
-        n.intended_mode = node.intended_mode;
-        result.nodes.push(n);
-    }
-    co_return result;
-}
-
-static
-future<json::json_return_type>
-rest_set_vnode_tablet_migration_node_storage_mode(http_context& ctx, sharded<service::storage_service>& ss, std::unique_ptr<http::request> req) {
-    if (!ss.local().get_feature_service().vnodes_to_tablets_migrations) {
-        apilog.warn("set_vnode_tablet_migration_node_storage_mode: called before the cluster feature was enabled");
-        throw std::runtime_error("vnodes-to-tablets migration requires all nodes to support the VNODES_TO_TABLETS_MIGRATIONS cluster feature");
-    }
-    auto mode_str = req->get_query_param("intended_mode");
-    auto mode = service::intended_storage_mode_from_string(mode_str);
-    co_await ss.local().set_node_intended_storage_mode(mode);
-    co_return json_void();
-}
-
-static
-future<json::json_return_type>
-rest_finalize_vnode_tablet_migration(http_context& ctx, sharded<service::storage_service>& ss, std::unique_ptr<http::request> req) {
-    if (!ss.local().get_feature_service().vnodes_to_tablets_migrations) {
-        apilog.warn("finalize_vnode_tablet_migration: called before the cluster feature was enabled");
-        throw std::runtime_error("vnodes-to-tablets migration requires all nodes to support the VNODES_TO_TABLETS_MIGRATIONS cluster feature");
-    }
-    auto keyspace = validate_keyspace(ctx, req);
-    validate_keyspace(ctx, keyspace);
-
-    co_await ss.local().finalize_tablets_migration(keyspace);
-    co_return json_void();
-}
-
 static
 future<json::json_return_type>
 rest_quiesce_topology(sharded<service::storage_service>& ss, std::unique_ptr<http::request> req) {
@@ -1936,10 +1877,6 @@ void set_storage_service(http_context& ctx, routes& r, sharded<service::storage_
    ss::del_tablet_replica.set(r, rest_bind(rest_del_tablet_replica, ctx, ss));
    ss::repair_tablet.set(r, rest_bind(rest_repair_tablet, ctx, ss));
    ss::tablet_balancing_enable.set(r, rest_bind(rest_tablet_balancing_enable, ss));
-    ss::create_vnode_tablet_migration.set(r, rest_bind(rest_create_vnode_tablet_migration, ctx, ss));
-    ss::get_vnode_tablet_migration.set(r, rest_bind(rest_get_vnode_tablet_migration, ctx, ss));
-    ss::set_vnode_tablet_migration_node_storage_mode.set(r, rest_bind(rest_set_vnode_tablet_migration_node_storage_mode, ctx, ss));
-    ss::finalize_vnode_tablet_migration.set(r, rest_bind(rest_finalize_vnode_tablet_migration, ctx, ss));
    ss::quiesce_topology.set(r, rest_bind(rest_quiesce_topology, ss));
    sp::get_schema_versions.set(r, rest_bind(rest_get_schema_versions, ss));
    ss::drop_quarantined_sstables.set(r, rest_bind(rest_drop_quarantined_sstables, ctx, ss));
@@ -2019,10 +1956,6 @@ void unset_storage_service(http_context& ctx, routes& r) {
    ss::del_tablet_replica.unset(r);
    ss::repair_tablet.unset(r);
    ss::tablet_balancing_enable.unset(r);
-    ss::create_vnode_tablet_migration.unset(r);
-    ss::get_vnode_tablet_migration.unset(r);
-    ss::set_vnode_tablet_migration_node_storage_mode.unset(r);
-    ss::finalize_vnode_tablet_migration.unset(r);
    ss::quiesce_topology.unset(r);
    sp::get_schema_versions.unset(r);
    ss::drop_quarantined_sstables.unset(r);
@@ -2113,8 +2046,6 @@ void set_snapshot(http_context& ctx, routes& r, sharded<db::snapshot_ctl>& snap_
                co_await snap_ctl.local().take_column_family_snapshot(keynames[0], column_families, tag, opts);
            }
            co_return json_void();
-        } catch (const data_dictionary::no_such_column_family& e) {
-            throw httpd::bad_param_exception(e.what());
        } catch (...) {
            apilog.error("take_snapshot failed: {}", std::current_exception());
            throw;
@@ -2151,8 +2082,6 @@ void set_snapshot(http_context& ctx, routes& r, sharded<db::snapshot_ctl>& snap_
        try {
            co_await snap_ctl.local().clear_snapshot(tag, keynames, column_family);
            co_return json_void();
-        } catch (const data_dictionary::no_such_column_family& e) {
-            throw httpd::bad_param_exception(e.what());
        } catch (...) {
            apilog.error("del_snapshot failed: {}", std::current_exception());
            throw;
--- a/api/storage_service.hh
+++ b/api/storage_service.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/stream_manager.cc
+++ b/api/stream_manager.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "stream_manager.hh"
--- a/api/stream_manager.hh
+++ b/api/stream_manager.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/system.cc
+++ b/api/system.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "api/api_init.hh"
--- a/api/system.hh
+++ b/api/system.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/task_manager.cc
+++ b/api/task_manager.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <seastar/core/chunked_fifo.hh>
--- a/api/task_manager.hh
+++ b/api/task_manager.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/task_manager_test.cc
+++ b/api/task_manager_test.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */


--- a/api/task_manager_test.hh
+++ b/api/task_manager_test.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #ifndef SCYLLA_BUILD_MODE_RELEASE
--- a/api/tasks.cc
+++ b/api/tasks.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <seastar/core/coroutine.hh>
--- a/api/tasks.hh
+++ b/api/tasks.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/api/token_metadata.cc
+++ b/api/token_metadata.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "api/api.hh"
--- a/api/token_metadata.hh
+++ b/api/token_metadata.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #pragma once
--- a/audit/audit.cc
+++ b/audit/audit.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <seastar/core/future-util.hh>
--- a/audit/audit.hh
+++ b/audit/audit.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */
 #pragma once

--- a/audit/audit_cf_storage_helper.cc
+++ b/audit/audit_cf_storage_helper.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include "audit/audit_cf_storage_helper.hh"
--- a/audit/audit_cf_storage_helper.hh
+++ b/audit/audit_cf_storage_helper.hh
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */
 #pragma once

--- a/audit/audit_composite_storage_helper.cc
+++ b/audit/audit_composite_storage_helper.cc
@@ -3,7 +3,7 @@
 */

 /*
- * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.1
+ * SPDX-License-Identifier: LicenseRef-ScyllaDB-Source-Available-1.0
 */

 #include <seastar/core/loop.hh>
--- a/Show More
+++ b/Show More