refactor: Rename 'Schema' to 'Collection' terminology (#4591)

## Relevant issue(s)
Resolves ##3994

## Description
- Rename `schema add` to `collection add`
- Rename Collection api
- Rename old schema terminology to collection

Author: shahzadlone

Makefile

@@ -123,9 +123,9 @@ start:
 client\:dump:
 	./build/defradb client dump
 
-.PHONY: client\:add-schema
-client\:add-schema:
-	./build/defradb client schema add -f examples/schema/bookauthpub.graphql
+.PHONY: client\:collection-add
+client\:collection-add:
+	./build/defradb client collection add -f examples/collection/bookauthpub.graphql
 
 .PHONY: deps\:lint-go
 deps\:lint-go:

README.md

@@ -28,7 +28,7 @@ Read the documentation on [docs.source.network](https://docs.source.network/).
    * [Start](#start)
    * [Configuration](#configuration)
    * [External port binding](#external-port-binding)
-   * [Add a schema type](#add-a-schema-type)
+   * [Add a collection](#add-a-collection)
    * [Add a document](#add-a-document)
    * [Query documents](#query-documents)
    * [Obtain document commits](#obtain-document-commits)
@@ -167,26 +167,26 @@ By default the HTTP API and P2P network will use localhost. If you want to expos
 defradb start --p2paddr /ip4/0.0.0.0/tcp/9171 --url 0.0.0.0:9181
 ```
 
-## Add a schema type
+## Add a collection
 
-Schemas are used to structure documents using a type system.
+Collections are used to structure documents using a type system.
 
-In the following examples, we'll be using a simple `User` schema type.
+In the following examples, we'll be using a simple `User` type.
 
 Add it to the database with the following command. By doing so, DefraDB generates the typed GraphQL endpoints for querying, mutation, and introspection.
 
 ```shell
-defradb client schema add '
+defradb client collection add '
   type User {
-    name: String 
-    age: Int 
-    verified: Boolean 
+    name: String
+    age: Int
+    verified: Boolean
     points: Float
   }
 '
 ```
 
-Find more examples of schema type definitions in the [examples/schema/](examples/schema/) folder.
+Find more examples of type definitions in the [examples/collection/](examples/collection/) folder.
 
 ## Add a document
 
@@ -216,7 +216,7 @@ Expected response:
 }
 ```
 
-`_docID` is the document's unique identifier determined by its schema and initial data.
+`_docID` is the document's unique identifier determined by its collection and initial data.
 
 ## Query documents
 
@@ -418,10 +418,10 @@ Start *nodeA*:
 defradb start
 ```
 
-In another terminal, add this example schema to it:
+In another terminal, add this example collection to it:
 
 ```shell
-defradb client schema add '
+defradb client collection add '
   type Article {
     content: String
     published: Boolean
@@ -437,10 +437,10 @@ defradb start --rootdir ~/.defradb-nodeB --url localhost:9182 --p2paddr /ip4/0.0
 
 Here we *do not* specify `--peers` as we will manually define a replicator after startup via the `rpc` client command.
 
-In another terminal, add the same schema to *nodeB*:
+In another terminal, add the same collection to *nodeB*:
 
 ```shell
-defradb client schema add --url localhost:9182 '
+defradb client collection add --url localhost:9182 '
   type Article {
     content: String
     published: Boolean

acp/README.md

@@ -103,10 +103,10 @@ All mandatory permissions are:
 - Specified in the `dpi.go` file within the variable `dpiRequiredPermissions`.
 
 ### DPI Resource Examples:
-- Check out tests here: [tests/integration/acp/schema/add_dpi](/tests/integration/acp/schema/add_dpi)
+- Check out tests here: [tests/integration/acp/dac/link_collection](/tests/integration/acp/dac/link_collection)
 - The tests linked are broken into `accept_*_test.go` and `reject_*_test.go` files.
-- Accepted tests document the valid DPIs (as the schema is accepted).
-- Rejected tests document invalid DPIs (as the schema is rejected).
+- Accepted tests document the valid DPIs (as the collection is accepted).
+- Rejected tests document invalid DPIs (as the collection is rejected).
 - There are also some Partially-DPI tests that are both accepted and rejected depending on the resource.
 
 ### Required Permission's Expression:
@@ -189,9 +189,9 @@ Result:
 }
 ```
 
-### Add schema, linking to a resource within the policy we added:
+### Add collection, linking to a resource within the policy we added:
 
-We have in `examples/schema/permissioned/users.graphql`:
+We have in `examples/collection/permissioned/users.graphql`:
 ```graphql
 type Users @policy(
     id: "50d354a91ab1b8fce8a0ae4693de7616fb1d82cfc540f25cfbe11eb0195a5765",
@@ -204,7 +204,7 @@ type Users @policy(
 
 CLI Command:
 ```sh
-defradb client schema add -f examples/schema/permissioned/users.graphql
+defradb client collection add -f examples/collection/permissioned/users.graphql
 ```
 
 Result:
@@ -492,9 +492,9 @@ Result:
 }
 ```
 
-Add schema, linking to the users resource and our policyID:
+Add collection, linking to the users resource and our policyID:
 ```sh
-defradb client schema add '
+defradb client collection add '
 type Users @policy(
     id: "ec11b7e29a4e195f95787e2ec9b65af134718d16a2c9cd655b5e04562d1cabf9",
     resource: "users"

cbindings/schema.go cbindings/add_collection.gocbindings/schema.go renamed to cbindings/add_collection.go

@@ -23,8 +23,8 @@ import (
 	iIdentity "github.com/sourcenetwork/defradb/internal/identity"
 )
 
-//export AddSchema
-func AddSchema(nodePtr C.uintptr_t, schema *C.char, identityPtr C.uintptr_t) C.Result {
+//export AddCollection
+func AddCollection(nodePtr C.uintptr_t, sdl *C.char, identityPtr C.uintptr_t) C.Result {
 	ctx := context.Background()
 
 	ctx, err := contextWithIdentity(ctx, identityPtr)
@@ -36,8 +36,8 @@ func AddSchema(nodePtr C.uintptr_t, schema *C.char, identityPtr C.uintptr_t) C.R
 	if err != nil {
 		return returnC(returnGoC(1, err.Error(), ""))
 	}
-	opt := options.WithIdentity(options.AddSchema(), iIdentity.FromContext(ctx))
-	collectionVersions, err := store.AddSchema(ctx, C.GoString(schema), opt)
+	opt := options.WithIdentity(options.AddCollection(), iIdentity.FromContext(ctx))
+	collectionVersions, err := store.AddCollection(ctx, C.GoString(sdl), opt)
 	if err != nil {
 		return returnC(returnGoC(1, err.Error(), ""))
 	}

cbindings/document.go

@@ -69,7 +69,7 @@ func Add(
 	}
 	ctx = encryption.SetContextConfigFromParams(ctx, isEncrypted != 0, encryptFields)
 
-	addOpt := options.WithIdentity(options.CollectionAdd(), acpIdentity.FromContext(ctx))
+	addOpt := options.WithIdentity(options.AddDocument(), acpIdentity.FromContext(ctx))
 
 	// Determine if JSON is array or object by looking for the first character being [
 	jsonString := strings.TrimSpace(C.GoString(json))
@@ -79,7 +79,7 @@ func Add(
 		if err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
-		err = col.AddMany(ctx, docs, addOpt)
+		err = col.AddManyDocuments(ctx, docs, addOpt)
 		if err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
@@ -89,7 +89,7 @@ func Add(
 		if err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
-		err = col.Add(ctx, doc, addOpt)
+		err = col.AddDocument(ctx, doc, addOpt)
 		if err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
@@ -135,7 +135,7 @@ func Delete(nodePtr C.uintptr_t,
 		if err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
-		_, err = col.Delete(ctx, ID, options.WithIdentity(options.CollectionDelete(), ident))
+		_, err = col.DeleteDocument(ctx, ID, options.WithIdentity(options.DeleteDocument(), ident))
 		if err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
@@ -145,8 +145,8 @@ func Delete(nodePtr C.uintptr_t,
 		if err := json.Unmarshal([]byte(filter), &filterValue); err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
-		deleteOpt := options.WithIdentity(options.CollectionDeleteWithFilter(), ident)
-		res, err := col.DeleteWithFilter(ctx, filterValue, deleteOpt)
+		deleteOpt := options.WithIdentity(options.DeleteDocumentsWithFilter(), ident)
+		res, err := col.DeleteDocumentsWithFilter(ctx, filterValue, deleteOpt)
 		if err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
@@ -194,8 +194,8 @@ func Get(nodePtr C.uintptr_t,
 	if err != nil {
 		return returnC(returnGoC(1, err.Error(), ""))
 	}
-	getOpt := options.WithIdentity(options.CollectionGet().SetShowDeleted(showDeleted != 0), acpIdentity.FromContext(ctx))
-	doc, err := col.Get(ctx, docID, getOpt)
+	getOpt := options.WithIdentity(options.GetDocument().SetShowDeleted(showDeleted != 0), acpIdentity.FromContext(ctx))
+	doc, err := col.GetDocument(ctx, docID, getOpt)
 	if err != nil {
 		return returnC(returnGoC(1, err.Error(), ""))
 	}
@@ -249,8 +249,8 @@ func Update(
 		if err := json.Unmarshal([]byte(filter), &filterValue); err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
-		res, err := col.UpdateWithFilter(ctx, filterValue, updater,
-			options.WithIdentity(options.CollectionUpdateWithFilter(), ident))
+		res, err := col.UpdateDocumentsWithFilter(ctx, filterValue, updater,
+			options.WithIdentity(options.UpdateDocumentsWithFilter(), ident))
 		if err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
@@ -266,15 +266,15 @@ func Update(
 		if err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
-		doc, err := col.Get(ctx, newDocID,
-			options.WithIdentity(options.CollectionGet().SetShowDeleted(true), ident))
+		doc, err := col.GetDocument(ctx, newDocID,
+			options.WithIdentity(options.GetDocument().SetShowDeleted(true), ident))
 		if err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
 		if err := doc.SetWithJSON(ctx, []byte(updater)); err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}
-		err = col.Update(ctx, doc, options.WithIdentity(options.CollectionUpdate(), ident))
+		err = col.UpdateDocument(ctx, doc, options.WithIdentity(options.UpdateDocument(), ident))
 		if err != nil {
 			return returnC(returnGoC(1, err.Error(), ""))
 		}

cbindings/wrapper.go

@@ -61,7 +61,7 @@ extern Result PollSubscription(char* id);
 extern Result CloseSubscription(char* id);
 extern Result ExecuteQuery(uintptr_t nodePtr, char* query, uintptr_t identity,
 char* operationName, char* variables);
-extern Result AddSchema(uintptr_t nodePtr, char* schema, uintptr_t identity);
+extern Result AddCollection(uintptr_t nodePtr, char* schema, uintptr_t identity);
 extern Result SetActiveCollection(uintptr_t nodePtr, CollectionOptions options, uintptr_t identityPtr);
 extern NewTxnResult TransactionCreate(uintptr_t nodePtr, int isConcurrent, int isReadOnly);
 extern Result VersionGet(int flagFull, int flagJSON);
@@ -424,18 +424,18 @@ func (w *CWrapper) BasicExport(
 	panic("not implemented")
 }
 
-func (w *CWrapper) AddSchema(
+func (w *CWrapper) AddCollection(
 	ctx context.Context,
-	schema string,
-	opts ...options.Enumerable[options.AddSchemaOptions],
+	sdl string,
+	opts ...options.Enumerable[options.AddCollectionOptions],
 ) ([]client.CollectionVersion, error) {
 	cIdentity := optionToUintptr(utils.NewOptions(opts...).GetIdentity())
 	defer C.IdentityFree(cIdentity)
-	cSchema := C.CString(schema)
-	defer C.free(unsafe.Pointer(cSchema))
+	cSDL := C.CString(sdl)
+	defer C.free(unsafe.Pointer(cSDL))
 
 	callHandle := getNodeOrTxnHandle(w.handle, ctx)
-	res := ConvertAndFreeCResult(C.AddSchema(callHandle, cSchema, cIdentity))
+	res := ConvertAndFreeCResult(C.AddCollection(callHandle, cSDL, cIdentity))
 
 	if res.Status != 0 {
 		return nil, errors.New(res.Error)