mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-29 10:57:44 +09:00 
			
		
		
		
	Correct broken unaligned load/store in armv5 (#1355)
Update vendor github.com/boltdb/bolt to take care of the issue #1354.
This commit is contained in:
		
				
					committed by
					
						 Lunny Xiao
						Lunny Xiao
					
				
			
			
				
	
			
			
			
						parent
						
							d800305b34
						
					
				
				
					commit
					a78a0266c4
				
			
							
								
								
									
										35
									
								
								vendor/github.com/boltdb/bolt/bucket.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										35
									
								
								vendor/github.com/boltdb/bolt/bucket.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -130,9 +130,17 @@ func (b *Bucket) Bucket(name []byte) *Bucket { | ||||
| func (b *Bucket) openBucket(value []byte) *Bucket { | ||||
| 	var child = newBucket(b.tx) | ||||
|  | ||||
| 	// If unaligned load/stores are broken on this arch and value is | ||||
| 	// unaligned simply clone to an aligned byte array. | ||||
| 	unaligned := brokenUnaligned && uintptr(unsafe.Pointer(&value[0]))&3 != 0 | ||||
|  | ||||
| 	if unaligned { | ||||
| 		value = cloneBytes(value) | ||||
| 	} | ||||
|  | ||||
| 	// If this is a writable transaction then we need to copy the bucket entry. | ||||
| 	// Read-only transactions can point directly at the mmap entry. | ||||
| 	if b.tx.writable { | ||||
| 	if b.tx.writable && !unaligned { | ||||
| 		child.bucket = &bucket{} | ||||
| 		*child.bucket = *(*bucket)(unsafe.Pointer(&value[0])) | ||||
| 	} else { | ||||
| @@ -167,9 +175,8 @@ func (b *Bucket) CreateBucket(key []byte) (*Bucket, error) { | ||||
| 	if bytes.Equal(key, k) { | ||||
| 		if (flags & bucketLeafFlag) != 0 { | ||||
| 			return nil, ErrBucketExists | ||||
| 		} else { | ||||
| 			return nil, ErrIncompatibleValue | ||||
| 		} | ||||
| 		return nil, ErrIncompatibleValue | ||||
| 	} | ||||
|  | ||||
| 	// Create empty, inline bucket. | ||||
| @@ -329,6 +336,28 @@ func (b *Bucket) Delete(key []byte) error { | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| // Sequence returns the current integer for the bucket without incrementing it. | ||||
| func (b *Bucket) Sequence() uint64 { return b.bucket.sequence } | ||||
|  | ||||
| // SetSequence updates the sequence number for the bucket. | ||||
| func (b *Bucket) SetSequence(v uint64) error { | ||||
| 	if b.tx.db == nil { | ||||
| 		return ErrTxClosed | ||||
| 	} else if !b.Writable() { | ||||
| 		return ErrTxNotWritable | ||||
| 	} | ||||
|  | ||||
| 	// Materialize the root node if it hasn't been already so that the | ||||
| 	// bucket will be saved during commit. | ||||
| 	if b.rootNode == nil { | ||||
| 		_ = b.node(b.root, nil) | ||||
| 	} | ||||
|  | ||||
| 	// Increment and return the sequence. | ||||
| 	b.bucket.sequence = v | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| // NextSequence returns an autoincrementing integer for the bucket. | ||||
| func (b *Bucket) NextSequence() (uint64, error) { | ||||
| 	if b.tx.db == nil { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user