Sorted collections #65

vihanb · 2021-07-21T17:00:55Z

This introduces two new sorted collections within a SortedCollections subpackage as initially
discussed in #1.

These sorted collections maintain their order by internally maintaining in-memory B-trees which allows them to balance the performance benefits of contiguous buffers and trees.

Currently, this contains an implementation of SortedSet and SortedDictionary which are designed to mimic the API of the standard library’s Set and Dictionary as closely as possible and provide additional methods and properties specific to sorted collection types.

Checklist

I've read the Contribution Guidelines
My contributions are licensed under the Swift license.
I've followed the coding style of the rest of the project.
I've added tests covering all new code paths my change adds to the project (if appropriate).
I've added benchmarks covering new functionality (if appropriate).
I've verified that my change does not break any existing tests or introduce unexplained benchmark regressions.
I've updated the documentation if necessary.

ishantheperson · 2021-07-22T21:24:53Z

Sources/SortedCollections/BTree/_BTree.PackedList.swift

+extension _BTree {
+ /// A stack-allocated list of some values.
+ /// 
+ /// - Warning: This may hold strong references to objects after they


After they what?

Signed-off-by: Vihan Bhargava <[email protected]>

Key Changes: - Implement deficiency correction methods - Remove inlining from _Node.ensureUnique to better inline closures - Add new computed properties to _Node.UnsafeHandle Minor changes - Added missing mutability checks to certain _Node.UnsafeHandle methods - Remove unneeded _Node.UnsafeHandle.findValue(key:) method - Allow _Node.UnsafeHandle.removeElement(at:) to be called on non-leaves - Expand doc comments and fix typos

Key Changes: - Implement removal through SortedDictionary subscript - Implement _BTree.contains for efficient existence checking - Add tests - _Node.UnsafeHandle.rotation/collapse tests - _BTree.removeAny tests - Expand benchmarks - Add C++ reference lookup benchmarks - Correct old benchmarks Minor Changes: - Remove B-Tree benchmarks, correct SortedDictionary benchmarks - Adjust debug B-Tree printer to show both numElements and numTotalElements - Add total count synchronization invariant check - Implement CustomReflectable for B-Tree

…Set. Key Changes: - SortedSet - Implement BidirectionalCollection - SortedDictionary - Implement Codable - Implement Partial RangeReplaceableCollection - Includes remove*() operations - init(grouping:by:) - var keys: Keys (aka SortedSet<Key>) - func (compact)mapValues(_:) Minor Changes: - Correct time documented complexities of various methods - Implement more variations of removal methods.

Using an array was very heavy, now using a stack-allocated 64-byte wide type which mimics an array.

@Freeze

Key Changes: - SortedSet - Implement Partial RangeReplaceableCollection - Implement ExpressibleByArrayLiteral - Implement init<S: Sequence>(_: S) - Implement Set methods: - update(with:) / insert(_:) / contains(_:) - SortedDictionary - Implement SortedDictionary.Values: BidirectionalCollection - Implement SortedDictionary.Keys: BidirectionalCollection - _BTree - Implement Partial RangeReplaceableCollection - Implement Sequence - Add high performance linear iterator Minor Changes: - Benchmarks - Clean up benchmarks - _Node.UnsafeHandle - @Freeze enum InsertionResult - _Node.Storage - Use UnsafeMutablePointer instead of ManagedBuffer Refactors: - Various refactors for method signatures and documentation.

Key Changes: - _BTree.init() dynamically computes capacity from stride - _BTree.UnsafePath uses Unmanaged +0 references. Minor Changes: - Fix _BTree.Iterator bug on single-leaf trees.

Key Changes: - SortedSet - Implement SetAlgebra - Implement Hashable - Implement Equatable - Implement Custom(Debug)StringConvertible - Implement CustomReflectable - Implement Codable - Implement subscript(range: Range<Element>) - Implement subscript(offset:) - Implement remove(atOffset:) Minor Changes: - Fix inefficiency on SortedDictionary.customMirror - Optimize to O(1) _BTree.UnsafePath comparator - Optimize away ARC traffic on findAnyPath(forKey:) Various additional refactors and renames.

Key Changes: - Implement _BTree.Cursor for performing efficient mutations on a tree Minor Changes: - New implementation of _BTree.Index and iteration

Major Changes: - Implement Sequence for SortedSet Minor Changes: - Fix bug within _Node.UnsafeHandle.pointerToChild(atSlot:) - Cleanup cursor implementation and fix bugs. - Fix various bugs in _BTree.FixedSizeArray

@inline

Key Changes: - Add custom SubSequences - Custom SortedDictionary.(Keys|Values).Sequence iterator - Add SortedDictionary.modifyValue(forKey:default:_:) Minor Changes: - Update documentation - Various API optimizations - Fix bug where offsetBy:limitedBy: calls did not validate indices - Remove unique initializers with documented duplicate handling behavior. - Implement _Node.UnsafeHandle.append*() methods - SortedSet no longer allocates a 'values' buffer (_Node.Header.values is now optional) Documentation: - Complexity guarantees - BidirectionalCollection conformances - Sequence/IteratorProtocol methods Optimizations: - Add optimized dictionary value mapping (through Node.init(mappingFrom:_:)) - Custom _BTree.forEach - Greater explicit @inline(__always) annotations throughout. - Simplify _BTree: Sequence implementation - Move methods to using _BTree.Builder - _BTree.FixedSizeArray now uses `withUnsafePointer` to prevent branching.

Dante-Broggi · 2021-08-11T05:04:59Z

Sources/SortedCollections/BTree/_BTree+Partial RangeReplaceableCollection.swift

+
+ /// Removes the first element of a tree, if it exists.
+ ///
+ /// - Returns: The moved first element of the tree.


Suggested change

/// - Returns: The moved first element of the tree.

/// - Returns: The moved last element of the tree.

Key Changes: - Implement Equatable, Hashable for SubSequences - Implement SortedDictionary initializers - init(keysWithValues:) and init(sortedKeysAndValues:) with named and unnamed variants. - Expand benchmark suite for SortedDictionary - Commit _BTree.Builder Minor Changes: - Update documentation - Expand test suits - Fix bug where SubSequences did not define subscript(bounds: Range<Index>) - _Node - Implement `depth` property for `_Node` - Packs both `depth`, `count`, and `capacity` within a single UInt64. - Implement `init(leftChild:seperator:rightChild:capacity:)` for `_Node` - Implement `concatenateWith(node:seperatedBy:)` to `_Node.UnsafeHandle` - Remove bad invariant check on `_Node.UnsafeHandle` deletion subroutines - _BTree - Add invariant checks as `_BTree.checkInvariants()` - Separate `_BTree.*capacity` into `*size` and `*capacity` - Make _FixedSizeArray top-level - Remove deque behavior. Documentation: - Update complexity documentation style from 'n' to `self.count` Testing: - Expand tests for SortedDictionary - Add tests for SortedDictionary.Keys - Add tests for _Node.join(...) routines - Add tests for _BTree.Builder - Restore checkBidirectionalCollection tests for _BTree

vihanb · 2021-08-18T23:41:18Z

Our initial benchmark numbers are promising, in most cases we come close to, when not exceeding, the performance at large collection sizes compared to std::map

Key Changes: - Add duplicate handling functionality to _BTree.Builder - Remove transient allocation in SortedDictionary.values _modify - Add missing SortedDictionary.Values.subscript _modify - Add SortedSet(sortedElements:) - Add optimized SetAlgebra implementations - Remove remaining high-level offset APIs - Various optimizations - Expand internal documentation Minor Changes: - Add ability to create dummy node - _BTree.Builder.append(key: Key) for sets. - Fix bug where findAnyIndex(forKey:) didn't calculate the offset. - Remove old, unused files - findAnyCursor -> takeCursor (to emphasize consuming nature) - Add takeCursor(at: Index) - Optimize init(grouping:by:) to use modifyValue to reduce CoW Optimizations: - Use dummy node for transient _modify state rather than allocating new buffer

Key Changes: - Add tests and benchmarks for SortedSet - Fix bug during _Node.UnsafeHandle.popFirstElement() rebalancing - Enable _Node.UnsafeHandle.subscript(elementAt:) to work on value-less nodes. Minor Changes: - Optimize Codable to use _BTree.Builder and forEach - Codable now checks for order, not strictly uniqueness - Add smaller node size for debug builds to easily catch errors

Signed-off-by: Vihan Bhargava <[email protected]>

tamc · 2021-10-18T09:56:49Z

Anything I can do to help get this over the line?

lorentey · 2021-11-22T23:10:49Z

Merging to feature branch feature/SortedCollections.

mdznr · 2022-12-03T09:18:48Z

Sources/SortedCollections/SortedSet/SortedSet.swift

+ @usableFromInline
+ internal var _root: _Tree
+
+ //// Creates an empty set.


Suggested change

//// Creates an empty set.

/// Creates an empty set.

…v1.1.0 (#906) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [com_github_apple_swift_collections](https://togithub.com/apple/swift-collections) | http_archive | minor | `1.0.6` -> `1.1.0` | --- ### Release Notes <details> <summary>apple/swift-collections (com_github_apple_swift_collections)</summary> ### [`v1.1.0`](https://togithub.com/apple/swift-collections/releases/tag/1.1.0): Swift Collections 1.1.0 [Compare Source](https://togithub.com/apple/swift-collections/compare/1.0.6...1.1.0) This feature release adds a number of new data structure implementations, along with minor changes to existing constructs. ##### New Data Structures - `Heap` implements a min-max heap, backed by a native array. (Contributed by [@AquaGeek](https://togithub.com/AquaGeek)) - `BitSet` and `BitArray` are two alternate representations of a bitmap type, backed by dynamically allocated storage. (Contributed by [@MahanazAtiqullah](https://togithub.com/MahanazAtiqullah)) - `TreeSet` and `TreeDictionary` are hashed collections implementing Compressed Hash-Array Mapped Prefix Trees (CHAMP). They provide similar API as `Set`/`Dictionary` in the Standard Library, but as persistent data structures, supporting incremental mutations of shared instances and efficient structural diffing. (Contributed by [@msteindorfer](https://togithub.com/msteindorfer)) ##### Other Changes - This version of the package can only be built using Swift 5.7 or later. - New methods: the `OrderedSet.isEqualSet` family of functions provide a way to test that two containers contain the same members, ignoring the order of elements. ([apple/swift-collections#183, [apple/swift-collections#234) - New method: `OrderedSet.filter` implements a version of the standard filter operation that returns an `OrderedSet` instead of an `Array`. ([apple/swift-collections#159) - `debugDescription` implementations have been updated to follow Swift best practice. (These are called by container types like `Array` to print their elements, so they work best when they're succinct variants of `description` that are suitable for embedding in structured output: specifically, they must not produce unpaired delimiter characters (`[`/`]`, `(`/`)`, `{`/`}`, `<`/`>` etc), raw top level commas, semicolons, colons, unquoted strings etc. `debugDescription` should not needlessly print type names etc.) ##### New Contributors - [@AquaGeek](https://togithub.com/AquaGeek) made their first contribution in [apple/swift-collections#61 - [@ejmarchant](https://togithub.com/ejmarchant) made their first contribution in [apple/swift-collections#82 - [@just-gull](https://togithub.com/just-gull) made their first contribution in [apple/swift-collections#115 - [@jPaolantonio](https://togithub.com/jPaolantonio) made their first contribution in [apple/swift-collections#121 - [@MahanazAtiqullah](https://togithub.com/MahanazAtiqullah) made their first contribution in [apple/swift-collections#83 - [@hectormatos2011](https://togithub.com/hectormatos2011) made their first contribution in [apple/swift-collections#155 - [@ktoso](https://togithub.com/ktoso) made their first contribution in [apple/swift-collections#159 - [@CTMacUser](https://togithub.com/CTMacUser) made their first contribution in [apple/swift-collections#116 - [@hassila](https://togithub.com/hassila) made their first contribution in [apple/swift-collections#297 Many thanks to our contributors for their great work (and patience)! ##### List of Pull Requests **Full Changelog**: apple/swift-collections@1.0.6...1.1.0 - Add a min-max heap implementation that can be used to back a priority queue by [@AquaGeek](https://togithub.com/AquaGeek) in [apple/swift-collections#61 - \[benchmark] Review and extend Heap benchmarks by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#76 - Add reference benchmarks for bit vector implementations by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#79 - Fix Markdown link in README by [@AquaGeek](https://togithub.com/AquaGeek) in [apple/swift-collections#77 - Fix documentation for types conforming to ExpressibleByArrayLiteral o… by [@ejmarchant](https://togithub.com/ejmarchant) in [apple/swift-collections#82 - \[Heap] Performance tweaks by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#78 - Fix typos: missing subscript parameters by [@ejmarchant](https://togithub.com/ejmarchant) in [apple/swift-collections#81 - \[Heap] Update implementation details section in docs by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#84 - Update CMakeLists.txt by [@compnerd](https://togithub.com/compnerd) in [apple/swift-collections#85 - Stop depending on swift-collections-benchmark by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#86 - \[OrderedDictionary] modifyValue → updateValue by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#91 - Add Benchmarks package to workspace by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#93 - \[OrderedDictionary] Deprecate `subscript(offset:)` for now by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#92 - Documentation: Remove in-place mutation comments by [@ejmarchant](https://togithub.com/ejmarchant) in [apple/swift-collections#96 - \[main] Freeze some types for consistency with their inlinable initializers by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#98 - Follow stdlib's leading underscore rule by [@ejmarchant](https://togithub.com/ejmarchant) in [apple/swift-collections#95 - \[Heap] Disable heap tests in release builds by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#100 - \[NFC] Merge release/1.0 to main by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#105 - Merge `release/1.0` into `main` by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#108 - \[README] Note that `Heap` hasn't been tagged yet & list other enhancements in progress by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#109 - PriorityQueueModule: remove `import Foundation` by [@compnerd](https://togithub.com/compnerd) in [apple/swift-collections#118 - \[Heap] Remove Heap's `ascending` and `descending` views by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#119 - \[Heap] Enable heap tests in optimized builds ([#101](https://togithub.com/apple/swift-collections/issues/101)) by [@just-gull](https://togithub.com/just-gull) in [apple/swift-collections#115 - Update CMakeLists.txt by [@compnerd](https://togithub.com/compnerd) in [apple/swift-collections#122 - Fix link to package internal documentation by [@jPaolantonio](https://togithub.com/jPaolantonio) in [apple/swift-collections#121 - Merge release/1.0 to main by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#130 - BitArray and BitSet data structures by [@MahanazAtiqullah](https://togithub.com/MahanazAtiqullah) in [apple/swift-collections#83 - Sorted collections by [@vihanb](https://togithub.com/vihanb) in [apple/swift-collections#65 - Merge `release/1.0` to `main` by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#141 - Remove Swift PM Artifacts to avoid Generated Schemes in Xcode by [@hectormatos2011](https://togithub.com/hectormatos2011) in [apple/swift-collections#155 - Reinstate custom schemes under Utils/swift-collections.xcworkspace by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#156 - \+OrderedSet add filter [#158](https://togithub.com/apple/swift-collections/issues/158) by [@ktoso](https://togithub.com/ktoso) in [apple/swift-collections#159 - \[Xcode] Update schemes & file template by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#161 - \[OrderedCollection] Use standard temp allocation facility, if available by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#160 - \[OrderedSet] Work around weird name lookup issue in compiler by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#162 - \=OrderedSet.filter Attempt to optimize filter impl by [@ktoso](https://togithub.com/ktoso) in [apple/swift-collections#163 - Force-inline \_modify accessors to work around a performance issue by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#165 - Merge release/1.0 branch to main by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#172 - Incubate persistent data structures by [@msteindorfer](https://togithub.com/msteindorfer) in [apple/swift-collections#31 - Persistent collections updates by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#174 - Persistent collections updates by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#175 - Persistent collections updates (part 3) by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#176 - Persistent collections updates (part 4) by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#177 - \[OrderedDictionary] Tiny documentation fix by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#178 - Persistent collections updates (part 5) by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#179 - Integrate PriorityQueueModule, BitCollections, PersistentCollections, SortedCollections into release/1.1 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#181 - Persistent collections updates (part 6) by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#180 - Persistent collections updates (part 7) by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#182 - \[BitSet] Fix decoding format on 32 bit architectures by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#185 - Persistent collections updates (part 8) by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#184 - Persistent collections updates (part 9) by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#188 - Add Sendable conformances to all public types by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#191 - \[test] Check baseline API expectations for set-like types by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#192 - Fleshing out `PersistentSet` by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#193 - Rename `PriorityQueueModule` to `HeapModule` by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#194 - \[BitSet] Fix invariant violation in member subscript by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#195 - \[1.1.0] Bump minimum required Swift toolchain to 5.5 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#196 - Restore support for building with Swift 5.5 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#198 - Merge release/1.0 to release/1.1 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#199 - Update CMake configuration in preparation for 1.1 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#200 - Update CMakeLists.txt by [@compnerd](https://togithub.com/compnerd) in [apple/swift-collections#202 - \[1.1]\[SortedCollections] Remove for now by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#205 - \[Heap] Change value of minimum or maximum element by [@CTMacUser](https://togithub.com/CTMacUser) in [apple/swift-collections#116 - \[Heap] Prerelease preparations by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#210 - Update README files by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#212 - \[manifest] Exclude CMakeLists.txt; remove unnecessary path settings; reindent file by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#213 - Review and finalize (?) set relation predicates for 1.1 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#216 - Merge.1.0→1.1 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#217 - Update CMake configuration by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#218 - Cherry pick changes from main to release/1.1 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#219 - Fix unusual build problems by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#221 - Review & update descriptions throughout the package by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#222 - Review and finalize (?) binary set operations for 1.1 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#223 - \[Xcode] Disable implicit dependencies by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#227 - \[OrderedSet] Improve sequence-taking initializer by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#226 - \[OrderedSet, BitSet] Fix custom mirror display style by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#225 - Finalize persistent collections API by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#224 - Start working on DocC support by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#228 - Update CMake build configuration by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#230 - \[PersistentSet] Iterator.next(): Make inlinable by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#233 - \[SetAlgebra types] isEqual(to:) → isEqualSet(to:) by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#234 - \[PersistentCollections] Doc & benchmark updates in preparation of API review by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#235 - Apply changes from in-progress review thread by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#237 - \[ShareableHashedCollections] API Review: add missing `mutating` keywords by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#238 - \[Benchmarks] Split default huge library up into individual files, one per type by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#240 - \[ShareableHashedCollections] Add missing import by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#243 - Unify unsafe bit set implementations by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#244 - Fix warnings in development versions of Swift by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#245 - \[HashTreeCollections] Change prefix `Shareable` to `Tree` by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#242 - \[TreeDictionary] Fix in-place merge operation to properly update the count by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#247 - \[cmake] Update CMake configuration by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#249 - Add not so experimental rope implementation by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#264 - Fix off by one error in BitSet by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#267 - Monomodule support by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#266 - Expose a handful of BigString.Index methods by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#269 - BitArray API refinements & additions by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#263 - Make most of Rope inlinable by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#270 - BigString: Fix String.Index.\_knownScalarAligned by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#272 - Rope: Fix `Sendable` conformance by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#271 - Require Swift 5.6 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#273 - \[OrderedDictionary] Explicitly mention in documentation that keys/values are ordered by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#275 - \[HashCollections] Ensure `self` doesn’t get destroyed before we’re done working with it by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#276 - Remove obsolete swift(>=5.5)/swift(>=5.6) checks by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#277 - \[Xcode] Update Xcode project by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#278 - Minor rope updates by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#279 - \[Rope] remove(at:): Fix assertion when removing the last item creates a deficiency by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#280 - Merge changes from release 1.0 to release 1.1 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#283 - \[CollectionUtilities] Silence a warning on 32 bit platforms by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#286 - \[BitSet] Fix a thinko in BitSet.isEqualSet by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#287 - Grab bag of fixes for small test issues by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#288 - \[Xcode] Set a code sign identity in the Xcode project by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#285 - Rope: Fix trap when replaceSubrange is called on an empty rope by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#290 - `Rope.find` returns a bogus remainder for the end position by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#291 - Update TreeSet.md by [@hassila](https://togithub.com/hassila) in [apple/swift-collections#297 - Fix CustomStringConvertible/CustomDebugStringConvertible conformances by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#302 - \[RopeModule] Fix issues in Swift's ABI stable dialect by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#318 - \[CMake, Xcode] Update configurations for alternate build systems by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#319 - \[RopeModule] Remove unnecessary typealiases by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#320 - \[Heap] Improve type-level doc comment by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#326 - \[Heap] insert(contentsOf:) Switch to Floyd’s if we’re inserting too many items by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#327 - \[1.1] build: support building in Debug mode on Windows by [@compnerd](https://togithub.com/compnerd) in [apple/swift-collections#336 - Merge release/1.0 to release/1.1 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#348 - \[Heap] Convert min() and max() to properties by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#328 - \[BitArray] Disable bitwise operators for now by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#353 - \[Heap] Final(?) Heap API adjustments for 1.1 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#354 - \[Benchmarks] Add Collection Equality Benchmarks by [@vanvoorden](https://togithub.com/vanvoorden) in [apple/swift-collections#351 - Release preparations for 1.1 by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#355 - \[1.1] Fix typos by [@lorentey](https://togithub.com/lorentey) in [apple/swift-collections#357 - \[TreeDictionary]\[Keys] Add Equatable and Hashable Conformance to TreeDictionary.Keys by [@vanvoorden](https://togithub.com/vanvoorden) in [apple/swift-collections#352 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate).  Co-authored-by: Self-hosted Renovate Bot <361546+cgrindel-self-hosted-renovate[bot]@users.noreply.github.enterprise.com>

vihanb requested a review from lorentey as a code owner July 21, 2021 17:00

ishantheperson reviewed Jul 22, 2021

View reviewed changes

vihanb force-pushed the sorted-collections branch from 68c737a to 45a989d Compare August 10, 2021 02:05

vihanb added 11 commits August 9, 2021 19:13

Initial commit for SortedCollections

9cf2cda

Signed-off-by: Vihan Bhargava <[email protected]>

Implement and use PackedOffsetList for UnsafePath

761950d

Using an array was very heavy, now using a stack-allocated 64-byte wide type which mimics an array.

Continue applying refactors and optimizations.

98f2785

Key Changes: - _BTree.init() dynamically computes capacity from stride - _BTree.UnsafePath uses Unmanaged +0 references. Minor Changes: - Fix _BTree.Iterator bug on single-leaf trees.

Add cursor type for imperative tree modification.

5690056

Key Changes: - Implement _BTree.Cursor for performing efficient mutations on a tree Minor Changes: - New implementation of _BTree.Index and iteration

Add cursor tests and set iterator.

21d9bde

Major Changes: - Implement Sequence for SortedSet Minor Changes: - Fix bug within _Node.UnsafeHandle.pointerToChild(atSlot:) - Cleanup cursor implementation and fix bugs. - Fix various bugs in _BTree.FixedSizeArray

vihanb force-pushed the sorted-collections branch from 45a989d to 0d0d66f Compare August 10, 2021 02:14

Dante-Broggi reviewed Aug 11, 2021

View reviewed changes

vihanb added 3 commits August 19, 2021 00:02

Update swift-collections-benchmark scheme.

478d3cc

Signed-off-by: Vihan Bhargava <[email protected]>

vihanb force-pushed the sorted-collections branch from 2a509cb to 478d3cc Compare August 21, 2021 08:47

lorentey changed the base branch from main to feature/SortedCollections November 22, 2021 23:10

lorentey merged commit b472a6f into apple:feature/SortedCollections Nov 22, 2021

mdznr reviewed Dec 3, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sorted collections #65

Sorted collections #65

vihanb commented Jul 21, 2021

ishantheperson Jul 22, 2021

Dante-Broggi Aug 11, 2021

vihanb commented Aug 18, 2021

tamc commented Oct 18, 2021

lorentey commented Nov 22, 2021

mdznr Dec 3, 2022

	/// - Returns: The moved first element of the tree.
	/// - Returns: The moved last element of the tree.

Sorted collections #65

Sorted collections #65

Conversation

vihanb commented Jul 21, 2021

Checklist

ishantheperson Jul 22, 2021

Choose a reason for hiding this comment

Dante-Broggi Aug 11, 2021

Choose a reason for hiding this comment

vihanb commented Aug 18, 2021

tamc commented Oct 18, 2021

lorentey commented Nov 22, 2021

mdznr Dec 3, 2022

Choose a reason for hiding this comment