forked from apache/cassandra
    
        
        - 
                Notifications
    
You must be signed in to change notification settings  - Fork 21
 
CNDB-15039: fix AbstractReadQueryToCQLStringTest #1968
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Merged
      
      
    
                
     Merged
            
            
          Conversation
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
    
          Checklist before you submit for review
  | 
    
              
                    djatnieks
  
              
              reviewed
              
                  
                    Aug 27, 2025 
                  
              
              
            
            
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A couple comments for consideration.
        
          
                src/java/org/apache/cassandra/db/filter/ClusteringIndexNamesFilter.java
              
                Outdated
          
            Show resolved
            Hide resolved
        
              
          
                src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
              
                Outdated
          
            Show resolved
            Hide resolved
        
              
          
                src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
              
                Outdated
          
            Show resolved
            Hide resolved
        
              
          
                src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
              
                Outdated
          
            Show resolved
            Hide resolved
        
      …ng filters Refactor CQL string generation in PartitionRangeReadCommand and SinglePartitionReadCommand to properly handle the interaction between row filters and clustering filters. This prevents duplication of clustering column conditions when both regular filters and clustering restrictions are present, particularly in queries using ALLOW FILTERING or secondary indexes on clustering columns.
          
 | 
    
          
❌ Build ds-cassandra-pr-gate/PR-1968 rejected by Butler8 regressions found Found 8 new test failures
 Found 13 known test failures | 
    
              
                    djatnieks
  
              
              approved these changes
              
                  
                    Aug 28, 2025 
                  
              
              
            
            
  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment
  
      
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    


What is the issue
After CNDB-15000, cql string generation for read commands with clustering columns needs to be fixed, and value truncation is not working.
What does this PR fix and why was it fixed
Refactor CQL string generation in PartitionRangeReadCommand and SinglePartitionReadCommand
to properly handle the interaction between row filters and clustering filters. This prevents
duplication of clustering column conditions when both regular filters and clustering
restrictions are present, particularly in queries using ALLOW FILTERING or secondary indexes
on clustering columns.
Fix value truncation in RowFilter CQL string generation.