tidy up

Author: gregns1

db/active_replicator_common.go

@@ -123,8 +123,6 @@ func newActiveReplicatorCommon(ctx context.Context, config *ActiveReplicatorConf
 		statusKey:        metakeys.ReplicationStatusKey(checkpointID),
 		direction:        direction,
 	}
-	// CBG-4780: WIll hard code to use < 4 protocols for now, as the ISGR doesn't support 4+ protocols.
-	//arc.config.SupportedBLIPProtocols = []string{CBMobileReplicationV3.SubprotocolString(), CBMobileReplicationV2.SubprotocolString()}
 
 	if config.CollectionsEnabled {
 		arc.namedCollections = make(map[base.ScopeAndCollectionName]*activeReplicatorCollection)

db/blip_handler.go

@@ -1015,10 +1015,6 @@ func (bh *blipHandler) processRev(rq *blip.Message, stats *processRevStats) (err
 		}
 	}
 
-	//if bh.useHLV() && bh.conflictResolver != nil {
-	//	return base.HTTPErrorf(http.StatusNotImplemented, "conflict resolver handling (ISGR) not yet implemented for v4 protocol")
-	//}
-
 	// throttle concurrent revs
 	if cap(bh.inFlightRevsThrottle) > 0 {
 		select {

db/crud.go

@@ -3131,12 +3131,12 @@ func (db *DatabaseCollectionWithUser) CheckChangeVersion(ctx context.Context, do
 	doc, err := db.GetDocSyncDataNoImport(ctx, docid, DocUnmarshalSync)
 	if err != nil {
 		if !base.IsDocNotFoundError(err) && !base.IsXattrNotFoundError(err) {
-			base.WarnfCtx(ctx, "RevDiff(%q) --> %T %v", base.UD(docid), err, err)
+			base.WarnfCtx(ctx, "Error fetching doc %s during changes handling: %v", base.UD(docid), err)
 		}
 		missing = append(missing, rev)
 		return
 	}
-	// parse in coming version, if it's not know to local doc hlv then it is missing, if it is and is a new version
+	// parse in coming version, if it's not known to local doc hlv then it is marked as missing, if it is and is a newer version
 	// then it is also marked as missing
 	cvValue, err := ParseVersion(rev)
 	if err != nil {

rest/replicatortest/replicator_test.go

@@ -4384,136 +4384,6 @@ func TestActiveReplicatorPushAndPullConflict(t *testing.T) {
 	}
 }
 
-func TestPushNewDoc(t *testing.T) {
-	base.RequireNumTestBuckets(t, 2)
-	base.SetUpTestLogging(t, base.LevelDebug, base.KeyAll)
-
-	// Passive
-	rt2 := rest.NewRestTester(t, nil)
-	defer rt2.Close()
-	username := "alice"
-	rt2.CreateUser(username, []string{username})
-
-	// Active
-	rt1 := rest.NewRestTester(t, &rest.RestTesterConfig{
-		SyncFn: channels.DocChannelsSyncFunction,
-	})
-	defer rt1.Close()
-	ctx1 := rt1.Context()
-
-	docID := t.Name() + "rt1doc1"
-	version := rt1.PutDocDirectly(docID, rest.JsonToMap(t, `{"source":"rt1","channels":["alice"]}`))
-
-	// Make rt2 listen on an actual HTTP port, so it can receive the blipsync request from rt1.
-	srv := httptest.NewTLSServer(rt2.TestPublicHandler())
-	defer srv.Close()
-
-	passiveDBURL, err := url.Parse(srv.URL + "/db")
-	require.NoError(t, err)
-
-	// Add basic auth creds to target db URL
-	passiveDBURL.User = url.UserPassword(username, rest.RestTesterDefaultUserPassword)
-	stats, err := base.SyncGatewayStats.NewDBStats(t.Name(), false, false, false, nil, nil)
-	require.NoError(t, err)
-	dbstats, err := stats.DBReplicatorStats(t.Name())
-	require.NoError(t, err)
-
-	ar, err := db.NewActiveReplicator(ctx1, &db.ActiveReplicatorConfig{
-		ID:          t.Name(),
-		Direction:   db.ActiveReplicatorTypePush,
-		RemoteDBURL: passiveDBURL,
-		ActiveDB: &db.Database{
-			DatabaseContext: rt1.GetDatabase(),
-		},
-		ChangesBatchSize:       200,
-		InsecureSkipVerify:     true,
-		ReplicationStatsMap:    dbstats,
-		CollectionsEnabled:     !rt1.GetDatabase().OnlyDefaultCollection(),
-		SupportedBLIPProtocols: []string{db.CBMobileReplicationV4.SubprotocolString()},
-	})
-	require.NoError(t, err)
-	defer func() { assert.NoError(t, ar.Stop()) }()
-
-	// Start the replicator (implicit connect)
-	require.NoError(t, ar.Start(ctx1))
-
-	// wait for the document originally written to rt1 to arrive at rt2
-	changesResults := rt2.WaitForChanges(1, "/{{.keyspace}}/_changes?since=0", "", true)
-	assert.Equal(t, docID, changesResults.Results[0].ID)
-
-	rt1collection, rt1ctx := rt1.GetSingleTestDatabaseCollection()
-	doc, err := rt1collection.GetDocument(rt1ctx, docID, db.DocUnmarshalAll)
-	assert.NoError(t, err)
-
-	rest.RequireDocVersionEqual(t, version, doc.ExtractDocVersion())
-}
-
-func TestBasicPull(t *testing.T) {
-	base.RequireNumTestBuckets(t, 2)
-	base.SetUpTestLogging(t, base.LevelDebug, base.KeyAll)
-
-	// Passive
-	rt2 := rest.NewRestTester(t, &rest.RestTesterConfig{
-		SyncFn: channels.DocChannelsSyncFunction,
-	})
-	defer rt2.Close()
-	username := "alice"
-	rt2.CreateUser(username, []string{username})
-
-	// Active
-	rt1 := rest.NewRestTester(t, &rest.RestTesterConfig{
-		SyncFn: channels.DocChannelsSyncFunction,
-	})
-	defer rt1.Close()
-	ctx1 := rt1.Context()
-
-	docID := t.Name() + "rt1doc1"
-	version := rt2.PutDocDirectly(docID, rest.JsonToMap(t, `{"source":"rt1","channels":["alice"]}`))
-
-	// Make rt2 listen on an actual HTTP port, so it can receive the blipsync request from rt1.
-	srv := httptest.NewTLSServer(rt2.TestPublicHandler())
-	defer srv.Close()
-
-	passiveDBURL, err := url.Parse(srv.URL + "/db")
-	require.NoError(t, err)
-
-	// Add basic auth creds to target db URL
-	passiveDBURL.User = url.UserPassword(username, rest.RestTesterDefaultUserPassword)
-	stats, err := base.SyncGatewayStats.NewDBStats(t.Name(), false, false, false, nil, nil)
-	require.NoError(t, err)
-	dbstats, err := stats.DBReplicatorStats(t.Name())
-	require.NoError(t, err)
-
-	ar, err := db.NewActiveReplicator(ctx1, &db.ActiveReplicatorConfig{
-		ID:          t.Name(),
-		Direction:   db.ActiveReplicatorTypePull,
-		RemoteDBURL: passiveDBURL,
-		ActiveDB: &db.Database{
-			DatabaseContext: rt1.GetDatabase(),
-		},
-		ChangesBatchSize:       200,
-		InsecureSkipVerify:     true,
-		ReplicationStatsMap:    dbstats,
-		CollectionsEnabled:     !rt1.GetDatabase().OnlyDefaultCollection(),
-		SupportedBLIPProtocols: []string{db.CBMobileReplicationV4.SubprotocolString()},
-	})
-	require.NoError(t, err)
-	defer func() { assert.NoError(t, ar.Stop()) }()
-
-	// Start the replicator (implicit connect)
-	require.NoError(t, ar.Start(ctx1))
-
-	// wait for the document originally written to rt1 to arrive at rt2
-	changesResults := rt1.WaitForChanges(1, "/{{.keyspace}}/_changes?since=0", "", true)
-	assert.Equal(t, docID, changesResults.Results[0].ID)
-
-	rt2collection, rt2ctx := rt2.GetSingleTestDatabaseCollection()
-	doc, err := rt2collection.GetDocument(rt2ctx, docID, db.DocUnmarshalAll)
-	assert.NoError(t, err)
-
-	rest.RequireDocVersionEqual(t, version, doc.ExtractDocVersion())
-}
-
 // TestActiveReplicatorPushBasicWithInsecureSkipVerify:
 //   - Starts 2 RestTesters, one active (with InsecureSkipVerify), and one passive
 //   - Creates a document on rt1 which can be pushed by the replicator to rt2.

rest/utilities_testing.go

@@ -2409,7 +2409,7 @@ func RequireDocRevTreeEqual(t *testing.T, expected, actual DocVersion) {
 
 // RequireDocVersionNotEqual calls t.Fail if two document versions are equal.
 func RequireDocVersionNotEqual(t *testing.T, expected, actual DocVersion) {
-	// CBG-4751: should be able to uncomment this lien once cv is included in write response
+	// CBG-4751: should be able to uncomment this line once cv is included in write response
 	//require.NotEqual(t, expected.CV.String(), actual.CV.String(), "Versions mismatch.  Expected: %v, Actual: %v", expected, actual)
 	require.NotEqual(t, expected.RevTreeID, actual.RevTreeID, "Versions mismatch.  Expected: %v, Actual: %v", expected.RevTreeID, actual.RevTreeID)
 }