Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neoppod
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
neoppod
Commits
511c3c3b
Commit
511c3c3b
authored
Jan 12, 2018
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X move part of xio,xbufio to go123
parent
adc06d1c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
79 deletions
+1
-79
go/xcommon/xbufio/xbufio.go
go/xcommon/xbufio/xbufio.go
+0
-54
go/xcommon/xio/xio.go
go/xcommon/xio/xio.go
+0
-23
go/zodb/storage/fs1/index.go
go/zodb/storage/fs1/index.go
+1
-2
No files found.
go/xcommon/xbufio/xbufio.go
deleted
100644 → 0
View file @
adc06d1c
// Copyright (C) 2017 Nexedi SA and Contributors.
// Kirill Smelkov <kirr@nexedi.com>
//
// This program is free software: you can Use, Study, Modify and Redistribute
// it under the terms of the GNU General Public License version 3, or (at your
// option) any later version, as published by the Free Software Foundation.
//
// You can also Link and Combine this program with other software covered by
// the terms of any of the Free Software licenses or any of the Open Source
// Initiative approved licenses and Convey the resulting work. Corresponding
// source of such a combination shall include the source code for all other
// software used.
//
// This program is distributed WITHOUT ANY WARRANTY; without even the implied
// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
//
// See COPYING file for full licensing terms.
// See https://www.nexedi.com/licensing for rationale and options.
// Package xbufio provides addons to std bufio package.
package
xbufio
import
(
"bufio"
"io"
"lab.nexedi.com/kirr/neo/go/xcommon/xio"
)
// Reader is a bufio.Reader that also reports current logical position in input stream.
type
Reader
struct
{
*
bufio
.
Reader
cr
*
xio
.
CountedReader
}
func
NewReader
(
r
io
.
Reader
)
*
Reader
{
// idempotent(Reader)
if
r
,
ok
:=
r
.
(
*
Reader
);
ok
{
return
r
}
// idempotent(xio.CountedReader)
cr
,
ok
:=
r
.
(
*
xio
.
CountedReader
)
if
!
ok
{
cr
=
xio
.
CountReader
(
r
)
}
return
&
Reader
{
bufio
.
NewReader
(
cr
),
cr
}
}
// InputOffset returns current logical position in input stream.
func
(
r
*
Reader
)
InputOffset
()
int64
{
return
r
.
cr
.
InputOffset
()
-
int64
(
r
.
Reader
.
Buffered
())
}
go/xcommon/xio/xio.go
View file @
511c3c3b
...
...
@@ -28,29 +28,6 @@ import (
"lab.nexedi.com/kirr/neo/go/xcommon/xcontext"
)
// CountedReader is an io.Reader that count total bytes read.
type
CountedReader
struct
{
r
io
.
Reader
nread
int64
}
func
(
cr
*
CountedReader
)
Read
(
p
[]
byte
)
(
int
,
error
)
{
n
,
err
:=
cr
.
r
.
Read
(
p
)
cr
.
nread
+=
int64
(
n
)
return
n
,
err
}
// InputOffset returns the number of bytes read.
func
(
cr
*
CountedReader
)
InputOffset
()
int64
{
return
cr
.
nread
}
// CountReader wraps r with CountedReader
func
CountReader
(
r
io
.
Reader
)
*
CountedReader
{
return
&
CountedReader
{
r
,
0
}
}
// CloseWhenDone arranges for c to be closed either when ctx is cancelled or
// surrounding function returns.
//
...
...
go/zodb/storage/fs1/index.go
View file @
511c3c3b
...
...
@@ -39,9 +39,8 @@ import (
pickle
"github.com/kisielk/og-rek"
"lab.nexedi.com/kirr/go123/mem"
"lab.nexedi.com/kirr/go123/xbufio"
"lab.nexedi.com/kirr/go123/xerr"
"lab.nexedi.com/kirr/neo/go/xcommon/xbufio"
)
// Index is in-RAM Oid -> Data record position mapping used to associate Oid
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment