Skip to content

Commit

Permalink
Rename error variable in go tests to err #8828 (#11716)
Browse files Browse the repository at this point in the history 
* Rename error variable in go tests to err #8829

renamed the variables from e to err as mentioned in the https://go.dev/doc/effective_go

* Update packaging/docker/samples/golang/app/main.go

* fixed accidental renames, renamed file from directoryLayer.go to directory_layer.go, to work on go formatting

* Rename error variable in go tests to err #8829

renamed the variables from e to err as mentioned in the https://go.dev/doc/effective_go

* fixed accidental renames, renamed file from directoryLayer.go to directory_layer.go, to work on go formatting

* Update packaging/docker/samples/golang/app/main.go

* renamed directoryPartition.go -> directory_partition.go and directorySubspace.go -> directory_subspace.go

* updated: comments in files that were renamed, fixed accidental rename in bindings/go/src/fdb/fdb.go

* Update doc.go

Removed unintentional whitespaces due to formatter

* Update get_encryption_keys.go

removed unintentional whitespaces in get_encryption_keys.go

* removed accidental whitespaces in get_encryption_keys.go

* fixed few minor issues while renaming variable

* updated: minor tweaks, typos

* updated: CMakeLists

* removed: named return value

* handling nil Pointer exception

---------

Co-authored-by: Vishesh Yadav <[email protected]>
  • Loading branch information
@h4ck3r-04 @vishesh
h4ck3r-04 and vishesh authored Dec 11, 2024
1 parent 0032465 commit e19df49
Show file tree
Hide file tree
Showing 25 changed files with 738 additions and 737 deletions.
6 changes: 3 additions & 3 deletions bindings/go/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ set(SRCS
src/fdb/directory/directory.go
src/fdb/doc.go
src/fdb/transaction.go
src/fdb/directory/directoryLayer.go
src/fdb/directory/directory_layer.go
src/fdb/errors.go
src/fdb/errors_test.go
src/fdb/keyselector.go
src/fdb/tuple/tuple.go
src/fdb/cluster.go
src/fdb/directory/directoryPartition.go
src/fdb/directory/directory_partition.go
src/fdb/fdb.go
src/fdb/range.go
src/fdb/tuple/tuple_test.go
src/fdb/database.go
src/fdb/directory/directorySubspace.go
src/fdb/directory/directory_subspace.go
src/fdb/fdb_test.go
src/fdb/snapshot.go

Expand Down
76 changes: 38 additions & 38 deletions bindings/go/src/_stacktester/directory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func (de *DirectoryExtension) processOp(sm *StackMachine, op string, isDB bool,
}
}()

var e error
var err error

switch {
case op == "CREATE_SUBSPACE":
Expand All @@ -142,9 +142,9 @@ func (de *DirectoryExtension) processOp(sm *StackMachine, op string, isDB bool,
if l != nil {
layer = l.([]byte)
}
d, e := de.cwd().CreateOrOpen(t, tupleToPath(tuples[0]), layer)
if e != nil {
panic(e)
d, err := de.cwd().CreateOrOpen(t, tupleToPath(tuples[0]), layer)
if err != nil {
panic(err)
}
de.store(d)
case op == "CREATE":
Expand All @@ -157,13 +157,13 @@ func (de *DirectoryExtension) processOp(sm *StackMachine, op string, isDB bool,
p := sm.waitAndPop().item
var d directory.Directory
if p == nil {
d, e = de.cwd().Create(t, tupleToPath(tuples[0]), layer)
d, err = de.cwd().Create(t, tupleToPath(tuples[0]), layer)
} else {
// p.([]byte) itself may be nil, but CreatePrefix handles that appropriately
d, e = de.cwd().CreatePrefix(t, tupleToPath(tuples[0]), layer, p.([]byte))
d, err = de.cwd().CreatePrefix(t, tupleToPath(tuples[0]), layer, p.([]byte))
}
if e != nil {
panic(e)
if err != nil {
panic(err)
}
de.store(d)
case op == "OPEN":
Expand All @@ -173,9 +173,9 @@ func (de *DirectoryExtension) processOp(sm *StackMachine, op string, isDB bool,
if l != nil {
layer = l.([]byte)
}
d, e := de.cwd().Open(rt, tupleToPath(tuples[0]), layer)
if e != nil {
panic(e)
d, err := de.cwd().Open(rt, tupleToPath(tuples[0]), layer)
if err != nil {
panic(err)
}
de.store(d)
case op == "CHANGE":
Expand All @@ -188,16 +188,16 @@ func (de *DirectoryExtension) processOp(sm *StackMachine, op string, isDB bool,
de.errorIndex = sm.waitAndPop().item.(int64)
case op == "MOVE":
tuples := sm.popTuples(2)
d, e := de.cwd().Move(t, tupleToPath(tuples[0]), tupleToPath(tuples[1]))
if e != nil {
panic(e)
d, err := de.cwd().Move(t, tupleToPath(tuples[0]), tupleToPath(tuples[1]))
if err != nil {
panic(err)
}
de.store(d)
case op == "MOVE_TO":
tuples := sm.popTuples(1)
d, e := de.cwd().MoveTo(t, tupleToPath(tuples[0]))
if e != nil {
panic(e)
d, err := de.cwd().MoveTo(t, tupleToPath(tuples[0]))
if err != nil {
panic(err)
}
de.store(d)
case strings.HasPrefix(op, "REMOVE"):
Expand All @@ -208,10 +208,10 @@ func (de *DirectoryExtension) processOp(sm *StackMachine, op string, isDB bool,
// doesn't end up committing the version key. (Other languages have
// separate remove() and remove_if_exists() so don't have this tricky
// issue).
_, e := t.Transact(func(tr fdb.Transaction) (interface{}, error) {
ok, e := de.cwd().Remove(tr, path)
if e != nil {
panic(e)
_, err := t.Transact(func(tr fdb.Transaction) (interface{}, error) {
ok, err := de.cwd().Remove(tr, path)
if err != nil {
panic(err)
}
switch op[6:] {
case "":
Expand All @@ -222,23 +222,23 @@ func (de *DirectoryExtension) processOp(sm *StackMachine, op string, isDB bool,
}
return nil, nil
})
if e != nil {
panic(e)
if err != nil {
panic(err)
}
case op == "LIST":
subs, e := de.cwd().List(rt, sm.maybePath())
if e != nil {
panic(e)
subs, err := de.cwd().List(rt, sm.maybePath())
if err != nil {
panic(err)
}
t := make(tuple.Tuple, len(subs))
for i, s := range subs {
t[i] = s
}
sm.store(idx, t.Pack())
case op == "EXISTS":
b, e := de.cwd().Exists(rt, sm.maybePath())
if e != nil {
panic(e)
b, err := de.cwd().Exists(rt, sm.maybePath())
if err != nil {
panic(err)
}
if b {
sm.store(idx, int64(1))
Expand All @@ -249,9 +249,9 @@ func (de *DirectoryExtension) processOp(sm *StackMachine, op string, isDB bool,
tuples := sm.popTuples(1)
sm.store(idx, de.css().Pack(tuples[0]))
case op == "UNPACK_KEY":
t, e := de.css().Unpack(fdb.Key(sm.waitAndPop().item.([]byte)))
if e != nil {
panic(e)
t, err := de.css().Unpack(fdb.Key(sm.waitAndPop().item.([]byte)))
if err != nil {
panic(err)
}
for _, el := range t {
sm.store(idx, el)
Expand Down Expand Up @@ -288,9 +288,9 @@ func (de *DirectoryExtension) processOp(sm *StackMachine, op string, isDB bool,
v2 := tuple.Tuple{de.cwd().GetLayer()}.Pack()
k3 := ss.Pack(tuple.Tuple{"exists"})
var v3 []byte
exists, e := de.cwd().Exists(rt, nil)
if e != nil {
panic(e)
exists, err := de.cwd().Exists(rt, nil)
if err != nil {
panic(err)
}
if exists {
v3 = tuple.Tuple{1}.Pack()
Expand All @@ -300,9 +300,9 @@ func (de *DirectoryExtension) processOp(sm *StackMachine, op string, isDB bool,
k4 := ss.Pack(tuple.Tuple{"children"})
var subs []string
if exists {
subs, e = de.cwd().List(rt, nil)
if e != nil {
panic(e)
subs, err = de.cwd().List(rt, nil)
if err != nil {
panic(err)
}
}
v4 := tuplePackStrings(subs)
Expand Down
Loading

0 comments on commit e19df49

Please sign in to comment.