Default Field CRDT Type to LWW_Register

Oddly, everywhere in our codebase apart from a single line in the P2P code hardcodes field CRDT Type to LWW_Register, even if FieldDescription.Typ is readily available.
sourcenetwork · Mar 27, 2023 · 687b0e8 · 687b0e8
1 parent 4d0f0e2
commit 687b0e8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 44 deletions.
diff --git a/db/collection.go b/db/collection.go
@@ -211,6 +211,12 @@ func (db *db) updateCollection(
 			field.ID = client.FieldID(i)
 			desc.Schema.Fields[i] = field
 		}
+
+		if field.Typ == client.NONE_CRDT {
+			// If no CRDT Type has been provided, default to LWW_REGISTER.
+			field.Typ = client.LWW_REGISTER
+			desc.Schema.Fields[i] = field
+		}
 	}
 
 	globalSchemaBuf, err := json.Marshal(desc.Schema)

diff --git a/tests/integration/net/state/simple/peer/with_create_add_field_test.go b/tests/integration/net/state/simple/peer/with_create_add_field_test.go
@@ -148,9 +148,6 @@ func TestP2PPeerCreateWithNewFieldSyncsDocsToNewerSchemaVersion(t *testing.T) {
 	testUtils.ExecuteTestCase(t, []string{"Users"}, test)
 }
 
-// Documentation test: This is undesirable behaviour and the test should be
-// updated once the behaviour has been fixed.
-// Issue: https://github.com/sourcenetwork/defradb/issues/1185
 func TestP2PPeerCreateWithNewFieldSyncsDocsToUpdatedSchemaVersion(t *testing.T) {
 	test := testUtils.TestCase{
 		Actions: []any{
@@ -188,7 +185,6 @@ func TestP2PPeerCreateWithNewFieldSyncsDocsToUpdatedSchemaVersion(t *testing.T)
 			},
 			testUtils.WaitForSync{},
 			testUtils.Request{
-				NodeID: immutable.Some(0),
 				Request: `query {
 					Users {
 						Name
@@ -202,23 +198,6 @@ func TestP2PPeerCreateWithNewFieldSyncsDocsToUpdatedSchemaVersion(t *testing.T)
 					},
 				},
 			},
-			testUtils.Request{
-				// Even though 'Email' exists on both nodes, the value of the field has not
-				// successfully been synced.
-				NodeID: immutable.Some(1),
-				Request: `query {
-					Users {
-						Name
-						Email
-					}
-				}`,
-				Results: []map[string]any{
-					{
-						"Name":  "John",
-						"Email": nil,
-					},
-				},
-			},
 		},
 	}
 

diff --git a/tests/integration/net/state/simple/replicator/with_create_add_field_test.go b/tests/integration/net/state/simple/replicator/with_create_add_field_test.go
@@ -121,9 +121,6 @@ func TestP2POneToOneReplicatorCreateWithNewFieldSyncsDocsToNewerSchemaVersion(t
 	testUtils.ExecuteTestCase(t, []string{"Users"}, test)
 }
 
-// Documentation test: This is undesirable behaviour and the test should be
-// updated once the behaviour has been fixed.
-// Issue: https://github.com/sourcenetwork/defradb/issues/1185
 func TestP2POneToOneReplicatorCreateWithNewFieldSyncsDocsToUpdatedSchemaVersion(t *testing.T) {
 	test := testUtils.TestCase{
 		Actions: []any{
@@ -158,7 +155,6 @@ func TestP2POneToOneReplicatorCreateWithNewFieldSyncsDocsToUpdatedSchemaVersion(
 			},
 			testUtils.WaitForSync{},
 			testUtils.Request{
-				NodeID: immutable.Some(0),
 				Request: `query {
 					Users {
 						Name
@@ -172,23 +168,6 @@ func TestP2POneToOneReplicatorCreateWithNewFieldSyncsDocsToUpdatedSchemaVersion(
 					},
 				},
 			},
-			testUtils.Request{
-				// Even though 'Email' exists on both nodes, the value of the field has not
-				// successfully been synced.
-				NodeID: immutable.Some(1),
-				Request: `query {
-					Users {
-						Name
-						Email
-					}
-				}`,
-				Results: []map[string]any{
-					{
-						"Name":  "John",
-						"Email": nil,
-					},
-				},
-			},
 		},
 	}
 

diff --git a/tests/integration/schema/updates/add/field/create_update_test.go b/tests/integration/schema/updates/add/field/create_update_test.go
@@ -18,7 +18,7 @@ import (
 
 func TestSchemaUpdatesAddFieldWithCreateWithUpdateAfterSchemaUpdateAndVersionJoin(t *testing.T) {
 	initialSchemaVersionId := "bafkreicg3xcpjlt3ecguykpcjrdx5ogi4n7cq2fultyr6vippqdxnrny3u"
-	updatedSchemaVersionId := "bafkreicnj2kiq6vqxozxnhrc4mlbkdp5rr44awaetn5x5hcdymk6lxrxdy"
+	updatedSchemaVersionId := "bafkreicquhkxvwfzmjnoptu4cf5ib4tameu6wmq5wzwg3ooc32zqbvtif4"
 
 	test := testUtils.TestCase{
 		Description: "Test schema update, add field with update after schema update, verison join",
@@ -106,7 +106,7 @@ func TestSchemaUpdatesAddFieldWithCreateWithUpdateAfterSchemaUpdateAndVersionJoi
 
 func TestSchemaUpdatesAddFieldWithCreateWithUpdateAfterSchemaUpdateAndCommitQuery(t *testing.T) {
 	initialSchemaVersionId := "bafkreicg3xcpjlt3ecguykpcjrdx5ogi4n7cq2fultyr6vippqdxnrny3u"
-	updatedSchemaVersionId := "bafkreicnj2kiq6vqxozxnhrc4mlbkdp5rr44awaetn5x5hcdymk6lxrxdy"
+	updatedSchemaVersionId := "bafkreicquhkxvwfzmjnoptu4cf5ib4tameu6wmq5wzwg3ooc32zqbvtif4"
 
 	test := testUtils.TestCase{
 		Description: "Test schema update, add field with update after schema update, commits query",