RepoMirrors
/
go-ceph
mirror of https://github.com/ceph/go-ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48 from immesys/master 

Get luminous working
This commit is contained in:
Noah Watkins 2018-01-04 14:54:52 -06:00 committed by GitHub
parent 2d7cf82ea7 a97ce4a032
commit bd5bc6d4cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rados/ioctx.go
View File

@ -234,15 +234,15 @@ type ObjectListFunc func(oid string)
// to the function the name of the object. // to the function the name of the object.
func (ioctx *IOContext) ListObjects(listFn ObjectListFunc) error { func (ioctx *IOContext) ListObjects(listFn ObjectListFunc) error {
var ctx C.rados_list_ctx_t var ctx C.rados_list_ctx_t
ret := C.rados_objects_list_open(ioctx.ioctx, &ctx) ret := C.rados_nobjects_list_open(ioctx.ioctx, &ctx)
if ret < 0 { if ret < 0 {
return GetRadosError(int(ret)) return GetRadosError(int(ret))
} }
defer func() { C.rados_objects_list_close(ctx) }() defer func() { C.rados_nobjects_list_close(ctx) }()
for { for {
var c_entry *C.char var c_entry *C.char
ret := C.rados_objects_list_next(ctx, &c_entry, nil) ret := C.rados_nobjects_list_next(ctx, &c_entry, nil, nil)
if ret == -2 { // FIXME if ret == -2 { // FIXME
return nil return nil
} else if ret < 0 { } else if ret < 0 {
@ -590,7 +590,7 @@ type IterToken uint32
// Return a Iterator object that can be used to list the object names in the current pool // Return a Iterator object that can be used to list the object names in the current pool
func (ioctx *IOContext) Iter() (*Iter, error) { func (ioctx *IOContext) Iter() (*Iter, error) {
iter := Iter{} iter := Iter{}
if cerr := C.rados_objects_list_open(ioctx.ioctx, &iter.ctx); cerr < 0 { if cerr := C.rados_nobjects_list_open(ioctx.ioctx, &iter.ctx); cerr < 0 {
return nil, GetRadosError(int(cerr)) return nil, GetRadosError(int(cerr))
} }
return &iter, nil return &iter, nil
@ -598,11 +598,11 @@ func (ioctx *IOContext) Iter() (*Iter, error) {
// Returns a token marking the current position of the iterator. To be used in combination with Iter.Seek() // Returns a token marking the current position of the iterator. To be used in combination with Iter.Seek()
func (iter *Iter) Token() IterToken { func (iter *Iter) Token() IterToken {
return IterToken(C.rados_objects_list_get_pg_hash_position(iter.ctx)) return IterToken(C.rados_nobjects_list_get_pg_hash_position(iter.ctx))
} }
func (iter *Iter) Seek(token IterToken) { func (iter *Iter) Seek(token IterToken) {
C.rados_objects_list_seek(iter.ctx, C.uint32_t(token)) C.rados_nobjects_list_seek(iter.ctx, C.uint32_t(token))
} }
// Next retrieves the next object name in the pool/namespace iterator. // Next retrieves the next object name in the pool/namespace iterator.
@ -621,7 +621,7 @@ func (iter *Iter) Seek(token IterToken) {
// //
func (iter *Iter) Next() bool { func (iter *Iter) Next() bool {
var c_entry *C.char var c_entry *C.char
if cerr := C.rados_objects_list_next(iter.ctx, &c_entry, nil); cerr < 0 { if cerr := C.rados_nobjects_list_next(iter.ctx, &c_entry, nil, nil); cerr < 0 {
iter.err = GetRadosError(int(cerr)) iter.err = GetRadosError(int(cerr))
return false return false
} }
@ -648,7 +648,7 @@ func (iter *Iter) Err() error {
// Closes the iterator cursor on the server. Be aware that iterators are not closed automatically // Closes the iterator cursor on the server. Be aware that iterators are not closed automatically
// at the end of iteration. // at the end of iteration.
func (iter *Iter) Close() { func (iter *Iter) Close() {
C.rados_objects_list_close(iter.ctx) C.rados_nobjects_list_close(iter.ctx)
} }
// Take an exclusive lock on an object. // Take an exclusive lock on an object.