core/oc-lib
5
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

pointer of pointer is kicked out

Browse Source
This commit is contained in:
mr 2024-08-01 11:19:14 +02:00
parent b0f2cf46eb
commit dbbda34117
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dbs/mongo/mongo.go
View File

@ -260,7 +260,7 @@ func (m *MongoDB) LoadOne(id string, collection_name string) (*mongo.SingleResul
return res, 200, nil return res, 200, nil
} }
func (m *MongoDB) Search(filters dbs.Filters, collection_name string) (*mongo.Cursor, int, error) { func (m *MongoDB) Search(filters *dbs.Filters, collection_name string) (*mongo.Cursor, int, error) {
if err := m.createClient(mngoConfig.GetUrl()); err != nil { if err := m.createClient(mngoConfig.GetUrl()); err != nil {
return nil, 503, err return nil, 503, err
} }
@ -268,21 +268,21 @@ func (m *MongoDB) Search(filters dbs.Filters, collection_name string) (*mongo.Cu
opts.SetLimit(100) opts.SetLimit(100)
targetDBCollection := CollectionMap[collection_name] targetDBCollection := CollectionMap[collection_name]
orList := bson.A{} orList := bson.A{}
for k, filter := range filters.Or { f := bson.D{}
orList = append(orList, bson.M{ if filters != nil {
k: bson.M{dbs.StringToOperator(filter.Operator).ToMongoOperator(): dbs.ToValueOperator(dbs.StringToOperator(filter.Operator), filter.Value)}}) for k, filter := range filters.Or {
} orList = append(orList, bson.M{
f := bson.D{ k: bson.M{dbs.StringToOperator(filter.Operator).ToMongoOperator(): dbs.ToValueOperator(dbs.StringToOperator(filter.Operator), filter.Value)}})
{"$or", orList}, }
} if len(orList) > 0 {
if len(orList) == 0 { f = bson.D{{"$or", orList}}
f = bson.D{} }
} for k, filter := range filters.And {
for k, filter := range filters.And { f = append(f, bson.E{
f = append(f, bson.E{ k, bson.M{
k, bson.M{ dbs.StringToOperator(filter.Operator).ToMongoOperator(): dbs.ToValueOperator(dbs.StringToOperator(filter.Operator), filter.Value),
dbs.StringToOperator(filter.Operator).ToMongoOperator(): dbs.ToValueOperator(dbs.StringToOperator(filter.Operator), filter.Value), }})
}}) }
} }
MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second) MngoCtx, cancel = context.WithTimeout(context.Background(), 10*time.Second)

2
models/resource_model/resource_model_mongo_accessor.go
View File

@ -63,7 +63,7 @@ func (wfa *ResourceModelMongoAccessor) Search(filters *dbs.Filters, search strin
}, },
} }
} }
res_mongo, code, err := mongo.MONGOService.Search(*filters, wfa.GetType()) res_mongo, code, err := mongo.MONGOService.Search(filters, wfa.GetType())
if err != nil { if err != nil {
wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error()) wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error())
return nil, code, err return nil, code, err

2
models/resources/data/data_mongo_accessor.go
View File

@ -84,7 +84,7 @@ func (wfa *dataMongoAccessor) Search(filters *dbs.Filters, search string) ([]uti
}, },
} }
} }
res_mongo, code, err := mongo.MONGOService.Search(*filters, wfa.GetType()) res_mongo, code, err := mongo.MONGOService.Search(filters, wfa.GetType())
if err != nil { if err != nil {
wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error()) wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error())
return nil, code, err return nil, code, err

2
models/resources/datacenter/datacenter_mongo_accessor.go
View File

@ -86,7 +86,7 @@ func (wfa *datacenterMongoAccessor) Search(filters *dbs.Filters, search string)
}, },
} }
} }
res_mongo, code, err := mongo.MONGOService.Search(*filters, wfa.GetType()) res_mongo, code, err := mongo.MONGOService.Search(filters, wfa.GetType())
if err != nil { if err != nil {
wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error()) wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error())
return nil, code, err return nil, code, err

2
models/resources/processing/processing_mongo_accessor.go
View File

@ -87,7 +87,7 @@ func (wfa *processingMongoAccessor) Search(filters *dbs.Filters, search string)
}, },
} }
} }
res_mongo, code, err := mongo.MONGOService.Search(*filters, wfa.GetType()) res_mongo, code, err := mongo.MONGOService.Search(filters, wfa.GetType())
if err != nil { if err != nil {
wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error()) wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error())
return nil, code, err return nil, code, err

2
models/resources/storage/storage_mongo_accessor.go
View File

@ -87,7 +87,7 @@ func (wfa *storageMongoAccessor) Search(filters *dbs.Filters, search string) ([]
}, },
} }
} }
res_mongo, code, err := mongo.MONGOService.Search(*filters, wfa.GetType()) res_mongo, code, err := mongo.MONGOService.Search(filters, wfa.GetType())
if err != nil { if err != nil {
wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error()) wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error())
return nil, code, err return nil, code, err

2
models/resources/workflow/workflow_mongo_accessor.go
View File

@ -91,7 +91,7 @@ func (wfa *workflowResourceMongoAccessor) Search(filters *dbs.Filters, search st
}, },
} }
} }
res_mongo, code, err := mongo.MONGOService.Search(*filters, wfa.GetType()) res_mongo, code, err := mongo.MONGOService.Search(filters, wfa.GetType())
if err != nil { if err != nil {
wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error()) wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error())
return nil, code, err return nil, code, err

2
models/workflow/workflow_mongo_accessor.go
View File

@ -171,7 +171,7 @@ func (wfa *workflowMongoAccessor) Search(filters *dbs.Filters, search string) ([
}, },
} }
} }
res_mongo, code, err := mongo.MONGOService.Search(*filters, wfa.GetType()) res_mongo, code, err := mongo.MONGOService.Search(filters, wfa.GetType())
if err != nil { if err != nil {
wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error()) wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error())
return nil, code, err return nil, code, err

2
models/workflow_execution/workflow_execution_mongo_accessor.go
View File

@ -60,7 +60,7 @@ func (wfa workflowExecutionMongoAccessor) LoadAll() ([]utils.ShallowDBObject, in
func (wfa *workflowExecutionMongoAccessor) Search(filters *dbs.Filters, search string) ([]utils.ShallowDBObject, int, error) { func (wfa *workflowExecutionMongoAccessor) Search(filters *dbs.Filters, search string) ([]utils.ShallowDBObject, int, error) {
objs := []utils.ShallowDBObject{} objs := []utils.ShallowDBObject{}
res_mongo, code, err := mongo.MONGOService.Search(dbs.Filters{}, wfa.GetType()) res_mongo, code, err := mongo.MONGOService.Search(nil, wfa.GetType())
if err != nil { if err != nil {
wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error()) wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error())
return nil, code, err return nil, code, err

2
models/workspace/workspace_mongo_accessor.go
View File

@ -145,7 +145,7 @@ func (wfa *workspaceMongoAccessor) Search(filters *dbs.Filters, search string) (
}, },
} }
} }
res_mongo, code, err := mongo.MONGOService.Search(*filters, wfa.GetType()) res_mongo, code, err := mongo.MONGOService.Search(filters, wfa.GetType())
if err != nil { if err != nil {
wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error()) wfa.Logger.Error().Msg("Could not store to db. Error: " + err.Error())
return nil, code, err return nil, code, err