Skip to content

Parsing optimizations #85

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

Open
scuml wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Parsing optimizations #85

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
623897c
Parsing optimizations
scuml Oct 14, 2020
aeb9a5b
Update RedisResp.swift
scuml Oct 14, 2020
553528a
Update .travis.yml
scuml Oct 14, 2020
79524c7
Revert "Update .travis.yml"
scuml Oct 15, 2020
5d363f1
Restoring with.count
scuml Oct 15, 2020
a185eca
Merge branch 'master' into optimizations2
Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ branches:
# by .swift-version, unless SWIFT_SNAPSHOT is specified.
matrix:
include:
- os: linux
dist: xenial
sudo: required
services: docker
env: DOCKER_IMAGE=swift:4.0.3 SWIFT_SNAPSHOT=4.0.3
- os: linux
dist: xenial
sudo: required
Expand Down
105 changes: 61 additions & 44 deletions Sources/SwiftRedis/RedisResp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,32 +114,30 @@ class RedisResp {
private func parseByPrefix(_ buffer: inout Data, from: Int) throws -> (RedisResponse, Int) {
var response: RedisResponse

var (matched, offset) = try compare(&buffer, at: from, with: RedisResp.plus)
if matched {
(response, offset) = try parseSimpleString(&buffer, offset: offset)
} else {
(matched, offset) = try compare(&buffer, at: from, with: RedisResp.colon)
if matched {
(response, offset) = try parseInteger(&buffer, offset: offset)
} else {
(matched, offset) = try compare(&buffer, at: from, with: RedisResp.dollar)
if matched {
(response, offset) = try parseBulkString(&buffer, offset: offset)
} else {
(matched, offset) = try compare(&buffer, at: from, with: RedisResp.asterisk)
if matched {
(response, offset) = try parseArray(&buffer, offset: offset)
} else {
(matched, offset) = try compare(&buffer, at: from, with: RedisResp.minus)
if matched {
(response, offset) = try parseError(&buffer, offset: offset)
} else {
response = RedisResponse.Error("Unknown response type")
}
}
}
var offset = from

while offset+1 >= buffer.count {
let length = try socket?.read(into: &buffer)

if length == 0 {
throw RedisRespError(code: .EOF)
}
}

switch (buffer[offset..<offset+1]){
case RedisResp.plus:
(response, offset) = try parseSimpleString(&buffer, offset: offset+1)
case RedisResp.colon:
(response, offset) = try parseInteger(&buffer, offset: offset+1)
case RedisResp.dollar:
(response, offset) = try parseBulkString(&buffer, offset: offset+1)
case RedisResp.asterisk:
(response, offset) = try parseArray(&buffer, offset: offset+1)
case RedisResp.minus:
(response, offset) = try parseError(&buffer, offset: offset+1)
default:
response = RedisResponse.Error("Unknown response type")
}
return (response, offset)
}

Expand Down Expand Up @@ -169,18 +167,16 @@ class RedisResp {
throw RedisRespError(code: .EOF)
}
}
let data = buffer.subdata(in: newOffset..<newOffset+strLen)
let redisString = RedisString(data)
let redisString = RedisString(buffer[newOffset..<newOffset+strLen])
return (RedisResponse.StringValue(redisString), totalLength)
} else {
return (RedisResponse.Nil, newOffset)
}
}

private func parseError(_ buffer: inout Data, offset: Int) throws -> (RedisResponse, Int) {
let eos = try find(&buffer, from: offset, data: RedisResp.crLf)
let data = buffer.subdata(in: offset..<eos)
let optStr = String(data: data as Data, encoding: String.Encoding.utf8)
let eos = try findCrlf(&buffer, from: offset)
let optStr = String(data: buffer[offset..<eos], encoding: String.Encoding.utf8)
let length = eos+RedisResp.crLf.count
guard let str = optStr else {
throw RedisRespError(code: .notUTF8)
Expand All @@ -194,9 +190,8 @@ class RedisResp {
}

private func parseSimpleString(_ buffer: inout Data, offset: Int) throws -> (RedisResponse, Int) {
let eos = try find(&buffer, from: offset, data: RedisResp.crLf)
let data = buffer.subdata(in: offset..<eos)
let optStr = String(data: data, encoding: String.Encoding.utf8)
let eos = try findCrlf(&buffer, from: offset)
let optStr = String(data: buffer[offset..<eos], encoding: String.Encoding.utf8)
let length = eos+RedisResp.crLf.count
guard let str = optStr else {
throw RedisRespError(code: .notUTF8)
Expand All @@ -207,30 +202,28 @@ class RedisResp {
// Mark: Parser helper functions

private func compare(_ buffer: inout Data, at offset: Int, with: Data) throws -> (Bool, Int) {
while offset+with.count >= buffer.count {
// use offset+1 instead of offset+with.count as with.count is always == 1
while offset+1 >= buffer.count {
let length = try socket?.read(into: &buffer)
if length == 0 {
throw RedisRespError(code: .EOF)
}
}

let range = buffer.range(of: with, options: [], in: offset..<offset+with.count)
if range != nil {
return (true, offset+with.count)
if (buffer[offset..<offset+1] == with){
return (true, offset+1)
} else {
return (false, offset)
}
}

private func find(_ buffer: inout Data, from: Int, data: Data) throws -> Int {
var offset = from
var notFound = true

while notFound {

while true {
let range = buffer.range(of: data, options: [], in: offset..<buffer.count)
if range != nil {
offset = (range?.lowerBound)!
notFound = false
return range!.lowerBound
} else {
let length = try socket?.read(into: &buffer)
if length == 0 {
Expand All @@ -241,10 +234,34 @@ class RedisResp {
return offset
}

private func findCrlf(_ buffer: inout Data, from: Int) throws -> Int {
/* 5X faster than using find() above. range() is expensive */
var i = from
while true {
while i < buffer.count - 1 {
if buffer[i+1] == 10{
if buffer[i] == 13{
return i
} else {
i+=2
}
} else {
i+=1
}
}

let length = try socket?.read(into: &buffer)
if length == 0 {
throw RedisRespError(code: .EOF)
}
}
return from
}


private func parseIntegerValue(_ buffer: inout Data, offset: Int) throws -> (Int64, Int) {
let eos = try find(&buffer, from: offset, data: RedisResp.crLf)
let data = buffer.subdata(in: offset..<eos)
let optStr = String(data: data as Data, encoding: String.Encoding.utf8)
let eos = try findCrlf(&buffer, from: offset)
let optStr = String(data: buffer[offset..<eos], encoding: String.Encoding.utf8)
let length = eos+RedisResp.crLf.count
guard let str = optStr else {
throw RedisRespError(code: .notUTF8)
Expand Down