Merge pull request #1227 from tigrisdata/main

Beta release

Author: JigarJoshi

api/server/v1/tx.go

@@ -28,6 +28,7 @@ const (
 	ManagementMethodPrefix    = "/tigrisdata.management.v1.Management/"
 	ObservabilityMethodPrefix = "/tigrisdata.observability.v1.Observability/"
 	realtimeMethodPrefix      = "/tigrisdata.realtime.v1.Realtime/"
+	searchMethodPrefix        = "/tigrisdata.search.v1.Search/"
 
 	BeginTransactionMethodName    = apiMethodPrefix + "BeginTransaction"
 	CommitTransactionMethodName   = apiMethodPrefix + "CommitTransaction"
@@ -87,7 +88,8 @@ const (
 	ListUsersMethodName         = authMethodPrefix + "ListUsers"
 
 	// Billing.
-	ListInvoicesMethodName = billingMethodPrefix + "ListInvoices"
+	ListInvoicesMethodName    = billingMethodPrefix + "ListInvoices"
+	BillingGetUsageMethodName = billingMethodPrefix + "GetUsage"
 
 	// Cache.
 	CreateCacheMethodName = cacheMethodPrefix + "CreateCache"
@@ -124,6 +126,20 @@ const (
 	ReadMessagesMethodName      = realtimeMethodPrefix + "ReadMessages"
 	MessagesMethodName          = realtimeMethodPrefix + "Messages"
 	ListSubscriptionsMethodName = realtimeMethodPrefix + "ListSubscriptions"
+
+	// Search
+	CreateOrUpdateIndexMethodName = searchMethodPrefix + "CreateOrUpdateIndex"
+	GetIndexMethodName            = searchMethodPrefix + "GetIndex"
+	DeleteIndexMethodName         = searchMethodPrefix + "DeleteIndex"
+	ListIndexesMethodName         = searchMethodPrefix + "ListIndexes"
+	SearchGetMethodName           = searchMethodPrefix + "Get"
+	SearchCreateById              = searchMethodPrefix + "CreateById"
+	SearchCreate                  = searchMethodPrefix + "Create"
+	SearchCreateOrReplace         = searchMethodPrefix + "CreateOrReplace"
+	SearchUpdate                  = searchMethodPrefix + "Update"
+	SearchDelete                  = searchMethodPrefix + "Delete"
+	SearchDeleteByQuery           = searchMethodPrefix + "DeleteByQuery"
+	SearchSearch                  = searchMethodPrefix + "Search"
 )
 
 func IsTxSupported(ctx context.Context) bool {

query/filter/key_builder.go

@@ -15,6 +15,7 @@
 package filter
 
 import (
+	"fmt"
 	"sort"
 
 	"github.com/tigrisdata/tigris/errors"
@@ -24,6 +25,10 @@ import (
 	"github.com/tigrisdata/tigris/value"
 )
 
+var (
+	ErrKeysEmpty = fmt.Errorf("empty keys")
+)
+
 // KeyComposer needs to be implemented to have a custom Compose method with different constraints.
 type KeyComposer interface {
 	Compose(level []*Selector, indexedKeys []*schema.QueryableField, parent LogicalOP) ([]QueryPlan, error)
@@ -203,6 +208,10 @@ func (k *KeyBuilder) Build(filters []Filter, indexedKeys []*schema.QueryableFiel
 
 	// PrimaryKey is always a single plan with all the keys
 	if IndexTypePrimary(k.indexType) {
+		if len(allKeys) == 0 {
+			// this is to know in which case error is not triggered but keys are empty.
+			return nil, ErrKeysEmpty
+		}
 		combined := allKeys[0]
 		for _, plan := range allKeys[1:] {
 			combined.Keys = append(combined.Keys, plan.Keys...)

server/middleware/authz.go

@@ -74,6 +74,12 @@ var (
 
 		// realtime
 		api.ReadMessagesMethodName,
+
+		// search
+		api.GetIndexMethodName,
+		api.ListIndexesMethodName,
+		api.SearchGetMethodName,
+		api.SearchSearch,
 	)
 
 	// editor.
@@ -150,6 +156,19 @@ var (
 		api.ReadMessagesMethodName,
 		api.MessagesMethodName,
 		api.ListSubscriptionsMethodName,
+
+		// search
+		api.CreateOrUpdateIndexMethodName,
+		api.GetIndexMethodName,
+		api.DeleteIndexMethodName,
+		api.ListIndexesMethodName,
+		api.SearchGetMethodName,
+		api.SearchCreateById,
+		api.SearchCreate,
+		api.SearchCreateOrReplace,
+		api.SearchUpdate,
+		api.SearchDeleteByQuery,
+		api.SearchSearch,
 	)
 
 	ownerMethods = container.NewHashSet(
@@ -235,6 +254,19 @@ var (
 		api.ReadMessagesMethodName,
 		api.MessagesMethodName,
 		api.ListSubscriptionsMethodName,
+
+		// search
+		api.CreateOrUpdateIndexMethodName,
+		api.GetIndexMethodName,
+		api.DeleteIndexMethodName,
+		api.ListIndexesMethodName,
+		api.SearchGetMethodName,
+		api.SearchCreateById,
+		api.SearchCreate,
+		api.SearchCreateOrReplace,
+		api.SearchUpdate,
+		api.SearchDeleteByQuery,
+		api.SearchSearch,
 	)
 	clusterAdminMethods = container.NewHashSet(
 		// db
@@ -314,6 +346,19 @@ var (
 		api.ReadMessagesMethodName,
 		api.MessagesMethodName,
 		api.ListSubscriptionsMethodName,
+
+		// search
+		api.CreateOrUpdateIndexMethodName,
+		api.GetIndexMethodName,
+		api.DeleteIndexMethodName,
+		api.ListIndexesMethodName,
+		api.SearchGetMethodName,
+		api.SearchCreateById,
+		api.SearchCreate,
+		api.SearchCreateOrReplace,
+		api.SearchUpdate,
+		api.SearchDeleteByQuery,
+		api.SearchSearch,
 	)
 )
 

server/middleware/authz_test.go

@@ -103,6 +103,19 @@ func TestAuthzOwnerRole(t *testing.T) {
 	require.True(t, isAuthorizedOperation(api.MessagesMethodName, ownerRoleName))
 	require.True(t, isAuthorizedOperation(api.ListSubscriptionsMethodName, ownerRoleName))
 
+	// search
+	require.True(t, isAuthorizedOperation(api.CreateOrUpdateIndexMethodName, ownerRoleName))
+	require.True(t, isAuthorizedOperation(api.GetIndexMethodName, ownerRoleName))
+	require.True(t, isAuthorizedOperation(api.DeleteIndexMethodName, ownerRoleName))
+	require.True(t, isAuthorizedOperation(api.ListIndexesMethodName, ownerRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchGetMethodName, ownerRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchCreateById, ownerRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchCreate, ownerRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchCreateOrReplace, ownerRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchUpdate, ownerRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchDeleteByQuery, ownerRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchSearch, ownerRoleName))
+
 	// negative
 	require.False(t, isAuthorizedOperation(api.VerifyInvitationMethodName, ownerRoleName))
 	require.False(t, isAuthorizedOperation(api.CreateNamespaceMethodName, ownerRoleName))
@@ -184,6 +197,19 @@ func TestAuthzEditorRole(t *testing.T) {
 	require.True(t, isAuthorizedOperation(api.MessagesMethodName, editorRoleName))
 	require.True(t, isAuthorizedOperation(api.ListSubscriptionsMethodName, editorRoleName))
 
+	// search
+	require.True(t, isAuthorizedOperation(api.CreateOrUpdateIndexMethodName, editorRoleName))
+	require.True(t, isAuthorizedOperation(api.GetIndexMethodName, editorRoleName))
+	require.True(t, isAuthorizedOperation(api.DeleteIndexMethodName, editorRoleName))
+	require.True(t, isAuthorizedOperation(api.ListIndexesMethodName, editorRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchGetMethodName, editorRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchCreateById, editorRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchCreate, editorRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchCreateOrReplace, editorRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchUpdate, editorRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchDeleteByQuery, editorRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchSearch, editorRoleName))
+
 	// negative
 	require.False(t, isAuthorizedOperation(api.ListUsersMethodName, editorRoleName))
 	require.False(t, isAuthorizedOperation(api.VerifyInvitationMethodName, editorRoleName))
@@ -233,6 +259,12 @@ func TestAuthzReadOnlyRole(t *testing.T) {
 	// realtime
 	require.True(t, isAuthorizedOperation(api.ReadMessagesMethodName, readOnlyRoleName))
 
+	// search
+	require.True(t, isAuthorizedOperation(api.GetIndexMethodName, readOnlyRoleName))
+	require.True(t, isAuthorizedOperation(api.ListIndexesMethodName, readOnlyRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchGetMethodName, readOnlyRoleName))
+	require.True(t, isAuthorizedOperation(api.SearchSearch, readOnlyRoleName))
+
 	// negative
 	require.False(t, isAuthorizedOperation(api.BeginTransactionMethodName, readOnlyRoleName))
 	require.False(t, isAuthorizedOperation(api.CommitTransactionMethodName, readOnlyRoleName))
@@ -269,4 +301,13 @@ func TestAuthzReadOnlyRole(t *testing.T) {
 	require.False(t, isAuthorizedOperation(api.DeleteGlobalAppKeyMethodName, readOnlyRoleName))
 	require.False(t, isAuthorizedOperation(api.ListGlobalAppKeysMethodName, readOnlyRoleName))
 	require.False(t, isAuthorizedOperation(api.RotateGlobalAppKeySecretMethodName, readOnlyRoleName))
+
+	// search
+	require.False(t, isAuthorizedOperation(api.CreateOrUpdateIndexMethodName, readOnlyRoleName))
+	require.False(t, isAuthorizedOperation(api.DeleteIndexMethodName, readOnlyRoleName))
+	require.False(t, isAuthorizedOperation(api.SearchCreateById, readOnlyRoleName))
+	require.False(t, isAuthorizedOperation(api.SearchCreate, readOnlyRoleName))
+	require.False(t, isAuthorizedOperation(api.SearchCreateOrReplace, readOnlyRoleName))
+	require.False(t, isAuthorizedOperation(api.SearchUpdate, readOnlyRoleName))
+	require.False(t, isAuthorizedOperation(api.SearchDeleteByQuery, readOnlyRoleName))
 }

server/services/v1/billing/reporter.go

@@ -102,6 +102,10 @@ func (r *UsageReporter) pushUsage() error {
 
 	for namespaceId, stats := range chunk.Tenants {
 		nsMeta := r.nsMgr.GetNamespaceMetadata(r.ctx, namespaceId)
+		if nsMeta == nil {
+			log.Error().Str("ns", namespaceId).Msgf("namespace metadata cannot be nil")
+			continue
+		}
 		if success := r.setupBillingAccount(nsMeta); !success {
 			continue
 		}
@@ -129,7 +133,6 @@ func (r *UsageReporter) pushUsage() error {
 // returns true, if billing account already exists or new account was setup
 func (r *UsageReporter) setupBillingAccount(nsMeta *metadata.NamespaceMetadata) bool {
 	if nsMeta == nil {
-		log.Error().Msgf("namespace metadata cannot be nil")
 		return false
 	}
 

server/services/v1/database/base_runner.go

@@ -295,6 +295,11 @@ func (runner *BaseQueryRunner) getWriteIterator(ctx context.Context, tx transact
 			metrics.SetWriteType("non-pkey")
 			return iterator, nil
 		}
+	} else if err == filter.ErrKeysEmpty {
+		log.Err(err).
+			Str("collection", collection.Name).
+			Str("filter", string(reqFilter)).
+			Msg("not able to build keys")
 	}
 
 	pkIterator, err := reader.ScanTable(collection.EncodedName, false)

server/services/v1/database/query_runner.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 
 	jsoniter "github.com/json-iterator/go"
+	"github.com/rs/zerolog/log"
 	api "github.com/tigrisdata/tigris/api/server/v1"
 	"github.com/tigrisdata/tigris/errors"
 	"github.com/tigrisdata/tigris/internal"
@@ -601,7 +602,13 @@ func (runner *BaseQueryRunner) buildReaderOptions(req *api.ReadRequest, collecti
 	if options.plan, err = planner.GeneratePlan(sortPlan, from); err == nil {
 		// plan can be handled by database index
 		return options, nil
+	} else if err == filter.ErrKeysEmpty {
+		log.Err(err).
+			Str("collection", collection.Name).
+			Str("filter", string(req.Filter)).
+			Msg("not able to build keys")
 	}
+
 	if planner.IsPrefixQueryWithSuffixSort(sortPlan) {
 		// case when it is a prefix query with suffix sort
 		options.tablePlan, err = planner.GenerateTablePlan(sortPlan, from)