Merge branch 'develop' into main

Author: helje5

.github/workflows/swift.yml

@@ -0,0 +1,45 @@
+name: Build and Test
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "5 7 * * 1"
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        image:
+          - swift:5.0.3-xenial
+          - swift:5.1.5-xenial
+          - swift:5.2.5-xenial
+          - swift:5.3.2-xenial
+          - swift:5.3.2-bionic
+    container: ${{ matrix.image }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Build Swift Debug Package
+        run: swift build -c debug
+      - name: Build Swift Release Package
+        run: swift build -c release
+      - name: Run Tests
+        run: swift test
+  nextstep:
+    runs-on: macos-latest
+    steps:
+      - name: Select latest available Xcode
+        uses: maxim-lobanov/[email protected]
+        with:
+          xcode-version: 12.2
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Build Swift Debug Package
+        run: swift build -c debug
+      - name: Build Swift Release Package
+        run: swift build -c release
+      - name: Run Tests
+        run: swift test

.gitignore

@@ -70,4 +70,5 @@ fastlane/test_output
 .build-linux
 Package.resolved
 .swiftpm
+.docker.build
 

.travis.d/before-install.sh

@@ -1,6 +1,5 @@
 # SwiftNIO Redis
 
-![Swift4](https://img.shields.io/badge/swift-4-blue.svg)
 ![Swift5](https://img.shields.io/badge/swift-5-blue.svg)
 ![macOS](https://img.shields.io/badge/os-macOS-green.svg?style=flat)
 ![tuxOS](https://img.shields.io/badge/os-tuxOS-green.svg?style=flat)

.travis.d/install.sh

@@ -2,7 +2,7 @@
 //
 // This source file is part of the swift-nio-redis open source project
 //
-// Copyright (c) 2018 ZeeZide GmbH. and the swift-nio-redis project authors
+// Copyright (c) 2018-2021 ZeeZide GmbH. and the swift-nio-redis project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -14,69 +14,30 @@
 
 import struct NIO.ByteBuffer
 
-fileprivate extension BinaryInteger {
-  
-  var numberOfDecimalDigits : Int {
-    @inline(__always) get {
-      var value = self
-      var count = 0
-      
-      repeat {
-        value /= 10
-        count += 1
-      }
-      while value != 0
-      
-      return count
-    }
-  }
-}
-
-extension ByteBuffer {
+public extension ByteBuffer {
+  // This looks expensive, but isn't. As per @weissi String's store up to 15
+  // bytes inline, no alloc necessary.
 
+  /**
+   * Write an Integer as an ASCII String.
+   */
+  @inlinable
   @discardableResult
-  public mutating func write<T: SignedInteger>(integerAsString integer: T,
-                                               as: T.Type = T.self) -> Int
+  mutating func write<T: SignedInteger>(integerAsString integer: T,
+                                        as: T.Type = T.self) -> Int
   {
-    let bytesWritten = set(integerAsString: integer, at: self.writerIndex)
-    moveWriterIndex(forwardBy: bytesWritten)
-    return Int(bytesWritten)
+    return self.writeString(String(integer, radix: 10))
   }
 
+  /**
+   * Set an Integer as an ASCII String.
+   */
+  @inlinable
   @discardableResult
-  public mutating func set<T: SignedInteger>(integerAsString integer: T,
-                                             at index: Int,
-                                             as: T.Type = T.self) -> Int
+  mutating func set<T: SignedInteger>(integerAsString integer: T,
+                                      at index: Int,
+                                      as: T.Type = T.self) -> Int
   {
-    let charCount = integer.numberOfDecimalDigits + (integer < 0 ? 1 : 0)
-    let avail     = capacity - index
-    
-    if avail < charCount {
-      reserveCapacity(capacity + (charCount - avail))
-    }
-
-    self.withVeryUnsafeBytes { rbpp in
-      let mrbpp  = UnsafeMutableRawBufferPointer(mutating: rbpp)
-      let base   = mrbpp.baseAddress!.assumingMemoryBound(to: UInt8.self)
-                        .advanced(by: index)
-      var cursor = base.advanced(by: charCount)
-      
-      let c0 : T = 48
-      var negativeAbsoluteValue = integer < 0 ? integer : -integer
-      repeat {
-        cursor -= 1
-        cursor.pointee = UInt8(c0 - (negativeAbsoluteValue % 10))
-        negativeAbsoluteValue /= 10;
-      }
-      while negativeAbsoluteValue != 0
-      
-      if integer < 0 {
-        cursor -= 1
-        cursor.pointee = 45 // -
-      }
-
-    }
-    
-    return charCount
+    return self.setString(String(integer, radix: 10), at: index)
   }
 }

.travis.yml

@@ -133,7 +133,7 @@ open class RESPChannelHandler : ChannelDuplexHandler {
     context.write(wrapOutboundOut(out), promise: promise)
   }
 
-  @inline(__always)
+  @inlinable
   final func encode<S: Collection>(simpleString bytes: S,
                                    out: inout ByteBuffer)
         where S.Element == UInt8
@@ -143,15 +143,15 @@ open class RESPChannelHandler : ChannelDuplexHandler {
     out.writeBytes(eol)
   }
 
-  @inline(__always)
+  @inlinable
   final func encode(simpleString bytes: ByteBuffer, out: inout ByteBuffer) {
     var s = bytes
     out.writeInteger(UInt8(43)) // +
     out.writeBuffer(&s)
     out.writeBytes(eol)
   }
 
-  @inline(__always)
+  @inlinable
   final func encode(bulkString bytes: ByteBuffer?, out: inout ByteBuffer) {
     if var s = bytes {
       out.writeInteger(UInt8(36)) // $
@@ -165,7 +165,7 @@ open class RESPChannelHandler : ChannelDuplexHandler {
     }
   }
 
-  @inline(__always)
+  @inlinable
   final func encode<S: Collection>(bulkString bytes: S?,
                                    out: inout ByteBuffer)
          where S.Element == UInt8
@@ -182,14 +182,14 @@ open class RESPChannelHandler : ChannelDuplexHandler {
     }
   }
 
-  @inline(__always)
+  @inlinable
   final func encode(integer i: Int, out: inout ByteBuffer) {
     out.writeInteger(UInt8(58)) // :
     out.write(integerAsString : i)
     out.writeBytes(eol)
   }
 
-  @inline(__always)
+  @inlinable
   final func encode(error: RESPError, out: inout ByteBuffer) {
     out.writeInteger(UInt8(45)) // -
     out.writeString(error.code)
@@ -241,8 +241,10 @@ open class RESPChannelHandler : ChannelDuplexHandler {
   }
 }
 
-private let eol       : ContiguousArray<UInt8> = [ 13, 10 ] // \r\n
-private let nilString : ContiguousArray<UInt8> = [ 36, 45, 49, 13, 10 ] // $-1\r\n
+@usableFromInline
+let eol       : ContiguousArray<UInt8> = [ 13, 10 ] // \r\n
+@usableFromInline
+let nilString : ContiguousArray<UInt8> = [ 36, 45, 49, 13, 10 ] // $-1\r\n
 private let nilArray  : ContiguousArray<UInt8> = [ 42, 45, 49, 13, 10 ] // *-1\r\n
 
 fileprivate enum ConstantBuffers {