Merge pull request #1278 from tigrisdata/main

Author: adilansari

Makefile

@@ -67,6 +67,9 @@ local_rt_run: server
 	fdbcli -C ./test/config/fdb.cluster --exec "configure new single memory" || true
 	TIGRIS_SERVER_SERVER_TYPE=realtime ./server/service -c config/server.dev.yaml
 
+local_debug:
+	$(DOCKER_COMPOSE) up --no-build --detach tigris_search tigris_db2
+
 # Runs tigris server and foundationdb, plus additional tools for it like:
 # - prometheus and grafana for monitoring
 run_full: coverdir

api/proto

@@ -1370,6 +1370,21 @@ func (x *ChargeTier) MarshalJSON() ([]byte, error) {
 	return jsoniter.Marshal(resp)
 }
 
+func (x *ProjectInfo) MarshalJSON() ([]byte, error) {
+	resp := struct {
+		Project string         `json:"project"`
+		Limits  *ProjectLimits `json:"limits"`
+	}{
+		Project: x.GetProject(),
+		Limits:  x.GetLimits(),
+	}
+	if resp.Limits == nil {
+		resp.Limits = &ProjectLimits{}
+	}
+
+	return jsoniter.Marshal(resp)
+}
+
 func unmarshalAdditionalFunction(data []byte) (*AdditionalFunction, error) {
 	var mp map[string]jsoniter.RawMessage
 

api/server/v1/marshaler.go

@@ -166,6 +166,10 @@ func (x *CreateProjectRequest) Validate() error {
 	return isValidDatabase(x.Project)
 }
 
+func (x *UpdateProjectRequest) Validate() error {
+	return isValidDatabase(x.Project)
+}
+
 func (x *DeleteProjectRequest) Validate() error {
 	return isValidDatabase(x.Project)
 }

api/server/v1/validator.go

@@ -107,7 +107,7 @@ type AuthConfig struct {
 }
 
 type Invitation struct {
-	Enabled        bool  `json:"enabled" mapstructure:"enabled" yaml:"enabled"`
+	Enabled        bool  `json:"enabled"          mapstructure:"enabled"          yaml:"enabled"`
 	ExpireAfterSec int64 `json:"expire_after_sec" mapstructure:"expire_after_sec" yaml:"expire_after_sec"`
 }
 
@@ -388,6 +388,7 @@ var DefaultConfig = Config{
 		Compression:       false,
 		IgnoreExtraFields: false,
 		LogFilter:         false,
+		AuthKey:           "ts_test_key",
 	},
 	KV: KVConfig{
 		Chunking:             false,

server/config/options.go

@@ -60,6 +60,12 @@ type ProjectMetadata struct {
 	CreatedAt      int64
 	CachesMetadata []CacheMetadata
 	SearchMetadata []SearchMetadata
+	Limits         *ProjectLimits
+}
+
+type ProjectLimits struct {
+	MaxCollections   *int32
+	MaxSearchIndexes *int32
 }
 
 type CacheMetadata struct {

server/metadata/namespace.go

@@ -1222,6 +1222,29 @@ func (tenant *Tenant) ListProjects(_ context.Context) []string {
 	return projects
 }
 
+// GetProjectMetadata retrieves the metadata associated with the project.
+func (tenant *Tenant) GetProjectMetadata(ctx context.Context, tx transaction.Tx, projName string) (*ProjectMetadata, error) {
+	tenant.RLock()
+	defer tenant.RUnlock()
+
+	_, ok := tenant.projects[projName]
+	if !ok {
+		return nil, NewProjectNotFoundErr(projName)
+	}
+	return tenant.namespaceStore.GetProjectMetadata(ctx, tx, tenant.namespace.Id(), projName)
+}
+
+func (tenant *Tenant) UpdateProjectMetadata(ctx context.Context, tx transaction.Tx, projName string, update *ProjectMetadata) error {
+	tenant.Lock()
+	defer tenant.Unlock()
+
+	_, ok := tenant.projects[projName]
+	if !ok {
+		return NewProjectNotFoundErr(projName)
+	}
+	return tenant.namespaceStore.UpdateProjectMetadata(ctx, tx, tenant.namespace.Id(), projName, update)
+}
+
 // DeleteTenant is used to delete tenant and all the content within it.
 // This needs to be followed up with a "restart" of server to clear memory state.
 // Be careful calling this.

server/metadata/tenant.go

@@ -126,7 +126,7 @@ func (s *apiService) RegisterHTTP(router chi.Router, inproc *inprocgrpc.Channel)
 	router.HandleFunc(apiPathPrefix+projectsPath, func(w http.ResponseWriter, r *http.Request) {
 		mux.ServeHTTP(w, r)
 	})
-	for _, projectPath := range []string{"/create", "/delete"} {
+	for _, projectPath := range []string{"/create", "/delete", "/update"} {
 		// explicit add project related path
 		router.HandleFunc(apiPathPrefix+fullProjectPath+projectPath, func(w http.ResponseWriter, r *http.Request) {
 			mux.ServeHTTP(w, r)
@@ -522,6 +522,22 @@ func (s *apiService) CreateProject(ctx context.Context, r *api.CreateProjectRequ
 	}, nil
 }
 
+func (s *apiService) UpdateProject(ctx context.Context, r *api.UpdateProjectRequest) (*api.UpdateProjectResponse, error) {
+	accessToken, _ := request.GetAccessToken(ctx)
+	runner := s.runnerFactory.GetProjectQueryRunner(accessToken)
+	runner.SetUpdateProjectReq(r)
+
+	resp, err := s.sessions.Execute(ctx, runner, database.ReqOptions{
+		MetadataChange:     true,
+		InstantVerTracking: true,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return resp.Response.(*api.UpdateProjectResponse), nil
+}
+
 func (s *apiService) DeleteProject(ctx context.Context, r *api.DeleteProjectRequest) (*api.DeleteProjectResponse, error) {
 	accessToken, _ := request.GetAccessToken(ctx)
 	runner := s.runnerFactory.GetProjectQueryRunner(accessToken)

server/services/v1/api.go

@@ -115,6 +115,20 @@ func (runner *CollectionQueryRunner) createOrUpdate(ctx context.Context, tx tran
 		return Response{}, ctx, errors.AlreadyExists("collection already exist")
 	}
 
+	// collectionExists == true && check project limits
+	if collectionExists {
+		projMeta, err := tenant.GetProjectMetadata(ctx, tx, req.GetProject())
+		if err != nil {
+			return Response{}, ctx, err
+		}
+		if projMeta != nil && projMeta.Limits != nil && projMeta.Limits.MaxCollections != nil {
+			maxCollections := int(*(projMeta.Limits.MaxCollections))
+			if len(db.ListCollection()) >= maxCollections {
+				return Response{}, ctx, errors.InvalidArgument("collections limit reached for project: %d", maxCollections)
+			}
+		}
+	}
+
 	schFactory, err := schema.NewFactoryBuilder(true).Build(req.GetCollection(), req.GetSchema())
 	if err != nil {
 		return Response{}, ctx, err

server/services/v1/database/collection_runner.go

@@ -37,6 +37,7 @@ type ProjectQueryRunner struct {
 	createReq   *api.CreateProjectRequest
 	listReq     *api.ListProjectsRequest
 	describeReq *api.DescribeDatabaseRequest
+	updateReq   *api.UpdateProjectRequest
 }
 
 func (runner *ProjectQueryRunner) SetCreateProjectReq(create *api.CreateProjectRequest) {
@@ -55,8 +56,12 @@ func (runner *ProjectQueryRunner) SetDescribeDatabaseReq(describe *api.DescribeD
 	runner.describeReq = describe
 }
 
+func (runner *ProjectQueryRunner) SetUpdateProjectReq(update *api.UpdateProjectRequest) {
+	runner.updateReq = update
+}
+
 func (runner *ProjectQueryRunner) create(ctx context.Context, tx transaction.Tx, tenant *metadata.Tenant) (Response, context.Context, error) {
-	projMetadata, err := createProjectMetadata(ctx)
+	projMetadata, err := createProjectMetadata(ctx, runner.createReq.Options)
 	if err != nil {
 		return Response{}, ctx, err
 	}
@@ -86,7 +91,7 @@ func (runner *ProjectQueryRunner) delete(ctx context.Context, tx transaction.Tx,
 	return Response{Status: DroppedStatus}, ctx, nil
 }
 
-func (*ProjectQueryRunner) list(ctx context.Context, _ transaction.Tx, tenant *metadata.Tenant) (Response, context.Context, error) {
+func (*ProjectQueryRunner) list(ctx context.Context, tx transaction.Tx, tenant *metadata.Tenant) (Response, context.Context, error) {
 	// listReq projects need not include any branches
 
 	projectList := tenant.ListProjects(ctx)
@@ -95,6 +100,17 @@ func (*ProjectQueryRunner) list(ctx context.Context, _ transaction.Tx, tenant *m
 		projects[i] = &api.ProjectInfo{
 			Project: l,
 		}
+
+		meta, err := tenant.GetProjectMetadata(ctx, tx, l)
+		if err != nil {
+			return Response{}, ctx, err
+		}
+		if meta != nil && meta.Limits != nil {
+			projects[i].Limits = &api.ProjectLimits{
+				MaxCollections:   meta.Limits.MaxCollections,
+				MaxSearchIndexes: meta.Limits.MaxSearchIndexes,
+			}
+		}
 	}
 
 	return Response{
@@ -104,6 +120,40 @@ func (*ProjectQueryRunner) list(ctx context.Context, _ transaction.Tx, tenant *m
 	}, ctx, nil
 }
 
+func (runner *ProjectQueryRunner) update(ctx context.Context, tx transaction.Tx, tenant *metadata.Tenant) (Response, context.Context, error) {
+	meta, err := tenant.GetProjectMetadata(ctx, tx, runner.updateReq.GetProject())
+	if err != nil {
+		return Response{}, ctx, err
+	}
+
+	if meta == nil {
+		meta, err = createProjectMetadata(ctx, runner.updateReq.GetOptions())
+		if err != nil {
+			return Response{}, ctx, err
+		}
+	} else if runner.updateReq.GetOptions() != nil {
+		limits := runner.updateReq.GetOptions().GetLimits()
+		if limits == nil {
+			meta.Limits = nil
+		} else {
+			meta.Limits = &metadata.ProjectLimits{
+				MaxCollections:   limits.MaxCollections,
+				MaxSearchIndexes: limits.MaxSearchIndexes,
+			}
+		}
+	}
+	err = tenant.UpdateProjectMetadata(ctx, tx, runner.updateReq.GetProject(), meta)
+	if err != nil {
+		return Response{}, ctx, err
+	}
+
+	return Response{
+		Response: &api.UpdateProjectResponse{
+			Status: UpdatedStatus,
+		},
+	}, ctx, nil
+}
+
 func (runner *ProjectQueryRunner) describe(ctx context.Context, tx transaction.Tx, tenant *metadata.Tenant) (Response, context.Context, error) {
 	db, err := runner.getDatabase(ctx, tx, tenant, runner.describeReq.GetProject(), runner.describeReq.GetBranch())
 	if err != nil {
@@ -171,6 +221,8 @@ func (runner *ProjectQueryRunner) Run(ctx context.Context, tx transaction.Tx, te
 		return runner.list(ctx, tx, tenant)
 	case runner.describeReq != nil:
 		return runner.describe(ctx, tx, tenant)
+	case runner.updateReq != nil:
+		return runner.update(ctx, tx, tenant)
 	}
 
 	return Response{}, ctx, errors.Unknown("unknown request path")
@@ -244,14 +296,23 @@ func (runner *BranchQueryRunner) Run(ctx context.Context, tx transaction.Tx, ten
 	return Response{}, ctx, errors.Unknown("unknown request path")
 }
 
-func createProjectMetadata(ctx context.Context) (*metadata.ProjectMetadata, error) {
+func createProjectMetadata(ctx context.Context, r *api.ProjectOptions) (*metadata.ProjectMetadata, error) {
 	currentSub, err := auth.GetCurrentSub(ctx)
 	if err != nil && config.DefaultConfig.Auth.Enabled {
 		return nil, errors.Internal("Failed to createReq database metadata")
 	}
+	var limits *metadata.ProjectLimits
+	if r != nil && r.Limits != nil {
+		limits = &metadata.ProjectLimits{
+			MaxCollections:   r.Limits.MaxCollections,
+			MaxSearchIndexes: r.Limits.MaxSearchIndexes,
+		}
+	}
+
 	return &metadata.ProjectMetadata{
 		ID:        0, // it will be set to right value later on
 		Creator:   currentSub,
 		CreatedAt: time.Now().Unix(),
+		Limits:    limits,
 	}, nil
 }

server/services/v1/database/database_runner.go

@@ -950,6 +950,18 @@ func (runner *IndexRunner) Run(ctx context.Context, tx transaction.Tx, tenant *m
 		if err != nil {
 			return Response{}, createApiError(err)
 		}
+		projMeta, err := tenant.GetProjectMetadata(ctx, tx, runner.create.GetProject())
+		if err != nil {
+			return Response{}, createApiError(err)
+		}
+		if projMeta != nil && projMeta.Limits != nil && projMeta.Limits.MaxSearchIndexes != nil {
+			maxIndexes := int(*projMeta.Limits.MaxSearchIndexes)
+			indexes := project.GetSearch().GetIndexes()
+			if len(indexes) >= maxIndexes {
+				return Response{}, errors.InvalidArgument("search indexes limit reached for project: %d", maxIndexes)
+			}
+		}
+
 		factory.Sub = currentSub
 		if err = tenant.CreateSearchIndex(ctx, tx, project, factory); err != nil {
 			return Response{}, createApiError(err)