- 
                Notifications
    
You must be signed in to change notification settings  - Fork 1k
 
Handle empty offsets buffer (#1824) #2836
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
                    Changes from all commits
      Commits
    
    
            Show all changes
          
          
            4 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      04a9889
              
                Handle empty offsets buffer (#1824)
              
              
                tustvold 6d8b2cb
              
                Merge remote-tracking branch 'upstream/master' into handle-empty-offsets
              
              
                tustvold 9c7b503
              
                Merge remote-tracking branch 'upstream/master' into handle-empty-offsets
              
              
                tustvold 532cf8b
              
                Review feedback
              
              
                tustvold File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      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
    
  
  
    
              
  
    
      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
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| 
          
            
          
           | 
    @@ -43,6 +43,17 @@ impl OffsetSizeTrait for i64 { | |
| const PREFIX: &'static str = "Large"; | ||
| } | ||
| 
     | 
||
| /// Returns a slice of `OffsetSize` consisting of a single zero value | ||
| #[inline] | ||
| pub(crate) fn empty_offsets<OffsetSize: OffsetSizeTrait>() -> &'static [OffsetSize] { | ||
| static OFFSET: &[i64] = &[0]; | ||
| 
         There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This slightly odd construction is necessary to workaround the fact Rust doesn't allow statics that depend on type parameters. It gets const folded away by the compiler  | 
||
| // SAFETY: | ||
| // OffsetSize is ArrowNativeType and is therefore trivially transmutable | ||
| let (prefix, val, suffix) = unsafe { OFFSET.align_to::<OffsetSize>() }; | ||
| assert!(prefix.is_empty() && suffix.is_empty()); | ||
| val | ||
| } | ||
| 
     | 
||
| /// Generic struct for a variable-size list array. | ||
| /// | ||
| /// Columnar format in Apache Arrow: | ||
| 
          
            
          
           | 
    @@ -240,8 +251,13 @@ impl<OffsetSize: OffsetSizeTrait> GenericListArray<OffsetSize> { | |
| } | ||
| 
     | 
||
| let values = make_array(values); | ||
| let value_offsets = data.buffers()[0].as_ptr(); | ||
| let value_offsets = unsafe { RawPtrBox::<OffsetSize>::new(value_offsets) }; | ||
| // Handle case of empty offsets | ||
| let offsets = match data.is_empty() && data.buffers()[0].is_empty() { | ||
| true => empty_offsets::<OffsetSize>().as_ptr() as *const _, | ||
| false => data.buffers()[0].as_ptr(), | ||
| }; | ||
| 
     | 
||
| let value_offsets = unsafe { RawPtrBox::new(offsets) }; | ||
| Ok(Self { | ||
| data, | ||
| values, | ||
| 
          
            
          
           | 
    @@ -941,4 +957,26 @@ mod tests { | |
| false, | ||
| ); | ||
| } | ||
| 
     | 
||
| #[test] | ||
| fn test_empty_offsets() { | ||
| let f = Box::new(Field::new("element", DataType::Int32, true)); | ||
| let string = ListArray::from( | ||
| ArrayData::builder(DataType::List(f.clone())) | ||
| .buffers(vec![Buffer::from(&[])]) | ||
| .add_child_data(ArrayData::new_empty(&DataType::Int32)) | ||
| .build() | ||
| .unwrap(), | ||
| ); | ||
| assert_eq!(string.value_offsets(), &[0]); | ||
| let string = LargeListArray::from( | ||
| ArrayData::builder(DataType::LargeList(f)) | ||
| .buffers(vec![Buffer::from(&[])]) | ||
| .add_child_data(ArrayData::new_empty(&DataType::Int32)) | ||
| .build() | ||
| .unwrap(), | ||
| ); | ||
| assert_eq!(string.len(), 0); | ||
| assert_eq!(string.value_offsets(), &[0]); | ||
| } | ||
| } | ||
  
    
      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
    
  
  
    
              
  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.
  
    
  
    
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.
I suggest you add a test for
len()as described in the original bug report.This comment applies to all the tests added in this PR