Skip to content

Commit

Permalink
refactor: goimports -w .
Browse files Browse the repository at this point in the history
  • Loading branch information
pzhin committed Feb 18, 2017
1 parent 9714994 commit 1c42d59
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 18 deletions.
4 changes: 2 additions & 2 deletions cursor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func TestCursor(t *testing.T) {
require.Nil(t, schema.AddValue("value", FieldTypeString))

db, err := env.NewDatabase(&DatabaseConfig{
Name: DBName,
Name: DBName,
Schema: schema,
})
require.Nil(t, err, "failed to create database")
Expand Down Expand Up @@ -132,7 +132,7 @@ func TestCursorPrefix(t *testing.T) {
require.Nil(t, schema.AddValue("value", FieldTypeString))

db, err := env.NewDatabase(&DatabaseConfig{
Name: DBName,
Name: DBName,
Schema: schema,
})
require.Nil(t, err, "failed to create database")
Expand Down
1 change: 0 additions & 1 deletion database.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"fmt"
)


// DatabaseConfig a structure for the description of the database to be created.
type DatabaseConfig struct {
// Name of database.
Expand Down
1 change: 0 additions & 1 deletion database_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,6 @@ func TestDatabaseUpsert(t *testing.T) {
require.Nil(t, err)
require.NotNil(t, db)


require.Nil(t, env.Open())

/* increment key 10 times */
Expand Down
28 changes: 14 additions & 14 deletions upsert.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ type UpsertFunc func(count int,

//export goUpsertCall
func goUpsertCall(count C.int,
src **C.char, src_size *C.uint32_t,
upsert **C.char, upsert_size *C.uint32_t,
result **C.char, result_size *C.uint32_t,
arg unsafe.Pointer) {
src **C.char, src_size *C.uint32_t,
upsert **C.char, upsert_size *C.uint32_t,
result **C.char, result_size *C.uint32_t,
arg unsafe.Pointer) {
index := *(*int)(arg)
fn := getUpsert(index)
upsertArg := getUpsertArg(index)
Expand Down Expand Up @@ -81,24 +81,24 @@ func registerUpsert(upsertFunc UpsertFunc) (unsafe.Pointer, int) {
index := upsertIndex
upsertIndex++
upsertMap[index] = func(count C.int,
src **C.char, src_size *C.uint32_t,
upsert **C.char, upsert_size *C.uint32_t,
result **C.char, result_size *C.uint32_t,
src **C.char, srcSize *C.uint32_t,
upsert **C.char, upsertSize *C.uint32_t,
result **C.char, resultSize *C.uint32_t,
arg unsafe.Pointer) C.int {
if src == nil {
return C.int(0)
}
var sSize uint32
if src_size != nil {
sSize = uint32(*src_size)
if srcSize != nil {
sSize = uint32(*srcSize)
}
uSize := uint32(*upsert_size)
rSize := uint32(*result_size)
uSize := uint32(*upsertSize)
rSize := uint32(*resultSize)
countN := int(count)

slice1 := (*[1<<4]unsafe.Pointer)(unsafe.Pointer(src))[:countN:countN]
slice2 := (*[1<<4]unsafe.Pointer)(unsafe.Pointer(upsert))[:countN:countN]
slice3 := (*[1<<4]unsafe.Pointer)(unsafe.Pointer(result))[:countN:countN]
slice1 := (*[1 << 4]unsafe.Pointer)(unsafe.Pointer(src))[:countN:countN]
slice2 := (*[1 << 4]unsafe.Pointer)(unsafe.Pointer(upsert))[:countN:countN]
slice3 := (*[1 << 4]unsafe.Pointer)(unsafe.Pointer(result))[:countN:countN]

res := upsertFunc(countN,
slice1, sSize,
Expand Down

0 comments on commit 1c42d59

Please sign in to comment.