tleyden
commented
7 years ago @adamcfraser after this change, should it be possible to remove this type assertion?
func (k *KvChangeIndexWriter) rollbackView(vbNo uint16, seq uint64) (channelNames []string, err error) {
channelNames = make([]string, 0)
startKey := []interface{}{vbNo, seq}
endKey := []interface{}{vbNo, uint64(math.MaxUint64)}
if goCbBucket, err := base.GetGoCBBucketFromBaseBucket(k.indexWriteBucket); err == nil {
viewQuery := gocb.NewViewQuery("sg-accel", "rollback")
viewQuery.Range(startKey, endKey, true)
viewQuery.Stale(gocb.Before)
results, err := goCbBucket.Bucket.ExecuteViewQuery(viewQuery)
if err != nil {
return channelNames, err
}
if results != nil {
var vrow struct {
Value string
}
for results.Next(&vrow) {
channelNames = append(channelNames, vrow.Value)
rollbackViewRows.Add(int64(1))
}
// Any error processing view results is returned on Close
err := results.Close()
if err != nil {
return channelNames, err
}
}
} else {
// walrus/go-couchbase view retrieval
var vres struct {
Rows []struct {
Value string
}
}
opts := map[string]interface{}{"stale": false, "startkey": startKey, "endkey": endKey}
err := k.indexWriteBucket.ViewCustom("sg-accel", "rollback", opts, &vres)
if err != nil {
return channelNames, err
}
for _, row := range vres.Rows {
channelNames = append(channelNames, row.Value)
}
rollbackViewRows.Add(int64(len(vres.Rows)))
}
return channelNames, nil
}and just call down to the ViewCustom() method in the bucket, even if it's a gocb bucket? I noticed this when looking at the places we do type assertions on buckets.
adamcfraser
The GoCB hybrid bucket was basically a crutch to scope limit the transition.
However, certain things that require type assertions get complicated, and it's probably better to drop the gocb hybrid bucket.
For example, when dealing with error handling, you might not know which bucket was actually used for the call to Couchbase Server, and so trying to figure out which kind of error it is gets complicated.
From last jenkins runs, looks like there is only one failing functional test at this point.
Failing functional tests
Base CC
Topology specific CC
Base DI
NOTE: test_continuous_changes_sanity[sync_gateway_default_functional_tests-10-10 failed in cen7-sync-gateway-functional-tests-base-di/496 but passed in a later rerun. More reruns in progress: rerun2 rerun3
Topology specific DI