Skip to content

Implement Structured MemcachedError for Enhanced Error Handling #33

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.

Sign up for GitHub

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 18 commits into from
Aug 18, 2023
Merged

Implement Structured MemcachedError for Enhanced Error Handling #33

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
764e3f7
add + replace #25
dkz2 Aug 6, 2023
882b5a0
soundness
dkz2 Aug 6, 2023
f504be3
more test for add + replace
dkz2 Aug 6, 2023
b124153
build faiure fix?
dkz2 Aug 6, 2023
0bb4f8b
closes #26
dkz2 Aug 8, 2023
eac8f0a
merge main
dkz2 Aug 8, 2023
1e79a89
mr conflict clean up
dkz2 Aug 8, 2023
c486acc
detla is now associated value
dkz2 Aug 9, 2023
f863db2
precondition that both storage and arth mode are not set
dkz2 Aug 9, 2023
153b018
make sure of writeIntAsASCII
dkz2 Aug 10, 2023
ea8a16a
closes #30
dkz2 Aug 11, 2023
b1174b1
merge main fixes
dkz2 Aug 11, 2023
bcc69b7
soundness
dkz2 Aug 11, 2023
bf23544
added unit test
dkz2 Aug 11, 2023
e6bd8dc
unit test refactor no string formatting
dkz2 Aug 11, 2023
fe93dfa
MemcachedConnection clean up
dkz2 Aug 15, 2023
ae2e9ed
Merge branch 'main' of https://github.com/dkz2/swift-memcache-gsoc in…
dkz2 Aug 15, 2023
545e643
merge main update
dkz2 Aug 15, 2023
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
Prev Previous commit
Next Next commit
mr conflict clean up
  • Loading branch information
@dkz2
dkz2 committed Aug 8, 2023
commit 1e79a89d92ae377edf37dde4e743581b1f816624
3 changes: 0 additions & 3 deletions Sources/SwiftMemcache/Extensions/ByteBuffer+SwiftMemcache.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ extension ByteBuffer {
self.writeInteger(UInt8.P)
case .replace:
self.writeInteger(UInt8.R)
<<<<<<< HEAD
}
}

Expand All @@ -116,8 +115,6 @@ extension ByteBuffer {
self.writeInteger(UInt8.whitespace)
self.writeInteger(UInt8.D)
self.writeIntegerAsASCII(arithmeticDelta)
=======
>>>>>>> 9ae24ae6c441eaa6db85fab9671433c65de999b4
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions Sources/SwiftMemcache/Extensions/UInt8+Characters.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ extension UInt8 {
static var A: UInt8 = .init(ascii: "A")
static var E: UInt8 = .init(ascii: "E")
static var R: UInt8 = .init(ascii: "R")
<<<<<<< HEAD
static var D: UInt8 = .init(ascii: "D")
=======
>>>>>>> 9ae24ae6c441eaa6db85fab9671433c65de999b4
static var zero: UInt8 = .init(ascii: "0")
static var nine: UInt8 = .init(ascii: "9")
static var increment: UInt8 = .init(ascii: "+")
Expand Down
3 changes: 0 additions & 3 deletions Sources/SwiftMemcache/MemcachedConnection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,6 @@ public actor MemcachedConnection {
throw MemcachedConnectionError.connectionShutdown
}
}
<<<<<<< HEAD

// MARK: - Increment a Value

Expand Down Expand Up @@ -479,6 +478,4 @@ public actor MemcachedConnection {
throw MemcachedConnectionError.connectionShutdown
}
}
=======
>>>>>>> 9ae24ae6c441eaa6db85fab9671433c65de999b4
}
3 changes: 0 additions & 3 deletions Sources/SwiftMemcache/MemcachedFlags.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ enum StorageMode: Equatable, Hashable {
case prepend
/// The "replace" command. The new value is set only if the item already exists.
case replace
<<<<<<< HEAD
}

/// Enum representing the mode for the 'ma' (meta arithmetic) command in Memcached (corresponding to the 'M' flag).
Expand All @@ -77,8 +76,6 @@ enum ArithmeticMode: Equatable, Hashable {
case increment
/// 'decrement' command. If applied, it decreases the numerical value of the item.
case decrement
=======
>>>>>>> 9ae24ae6c441eaa6db85fab9671433c65de999b4
}

extension MemcachedFlags: Hashable {}
3 changes: 0 additions & 3 deletions Tests/SwiftMemcacheTests/IntegrationTest/MemcachedIntegrationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,6 @@ final class MemcachedIntegrationTest: XCTestCase {
}
}

<<<<<<< HEAD
func testIncrementValue() async throws {
let group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
defer {
Expand Down Expand Up @@ -491,8 +490,6 @@ final class MemcachedIntegrationTest: XCTestCase {
}
}

=======
>>>>>>> 9ae24ae6c441eaa6db85fab9671433c65de999b4
func testMemcachedConnectionWithUInt() async throws {
let group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
defer {
Expand Down