From de1120210ea84794d71a826a2e62b1031c5bae2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Wed, 25 Mar 2026 14:27:37 +0100 Subject: [PATCH 1/3] Commit batches when the limit is reached while iterating over children --- services/search/pkg/bleve/batch.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/services/search/pkg/bleve/batch.go b/services/search/pkg/bleve/batch.go index 78378430c6..60a3d0c867 100644 --- a/services/search/pkg/bleve/batch.go +++ b/services/search/pkg/bleve/batch.go @@ -71,6 +71,11 @@ func (b *Batch) Move(id, parentID, location string) error { if err := b.batch.Index(resource.ID, resource); err != nil { return err } + if b.batch.Size() >= b.size { + if err := b.Push(); err != nil { + return err + } + } } return nil @@ -88,6 +93,11 @@ func (b *Batch) Delete(id string) error { if err := b.batch.Index(resource.ID, resource); err != nil { return err } + if b.batch.Size() >= b.size { + if err := b.Push(); err != nil { + return err + } + } } return nil @@ -105,6 +115,11 @@ func (b *Batch) Restore(id string) error { if err := b.batch.Index(resource.ID, resource); err != nil { return err } + if b.batch.Size() >= b.size { + if err := b.Push(); err != nil { + return err + } + } } return nil @@ -142,6 +157,11 @@ func (b *Batch) Purge(id string, onlyDeleted bool) error { for _, resource := range affectResources { b.batch.Delete(resource.ID) + if b.batch.Size() >= b.size { + if err := b.Push(); err != nil { + return err + } + } } return nil From 228adbe17729b2d1bad9dee20bc09a15bc2488d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Wed, 25 Mar 2026 14:27:37 +0100 Subject: [PATCH 2/3] Reduce default batch size to prevent memory issues with large documents --- services/search/pkg/config/defaults/defaultconfig.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/search/pkg/config/defaults/defaultconfig.go b/services/search/pkg/config/defaults/defaultconfig.go index d55702f35c..d4c3994b55 100644 --- a/services/search/pkg/config/defaults/defaultconfig.go +++ b/services/search/pkg/config/defaults/defaultconfig.go @@ -64,7 +64,7 @@ func DefaultConfig() *config.Config { AckWait: 1 * time.Minute, }, ContentExtractionSizeLimit: 20 * 1024 * 1024, // Limit content extraction to <20MB files by default - BatchSize: 500, + BatchSize: 50, } } From 8f7ad7f32887da398b95b33c1a4ded5725900eb1 Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Thu, 26 Mar 2026 07:42:11 +0100 Subject: [PATCH 3/3] change php image --- .woodpecker.star | 4 ++-- composer.json | 4 ++-- vendor-bin/behat/composer.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.woodpecker.star b/.woodpecker.star index 2030aaa41c..02fbf1b404 100644 --- a/.woodpecker.star +++ b/.woodpecker.star @@ -20,7 +20,7 @@ OC_CI_CLAMAVD = "owncloudci/clamavd" OC_CI_DRONE_ANSIBLE = "owncloudci/drone-ansible:latest" OC_CI_GOLANG = "registry.heinlein.group/opencloud/golang-ci:1.25" OC_CI_NODEJS = "owncloudci/nodejs:%s" -OC_CI_PHP = "owncloudci/php:%s" +OC_CI_PHP = "quay.io/opencloudeu/php-alpine-ci:%s" OC_CI_WAIT_FOR = "owncloudci/wait-for:latest" OC_CS3_API_VALIDATOR = "opencloudeu/cs3api-validator:latest" OC_LITMUS = "owncloudci/litmus:latest" @@ -37,7 +37,7 @@ REDIS = "redis:6-alpine" READY_RELEASE_GO = "woodpeckerci/plugin-ready-release-go:latest" OPENLDAP = "bitnamilegacy/openldap:2.6" -DEFAULT_PHP_VERSION = "8.2" +DEFAULT_PHP_VERSION = "8.4" DEFAULT_NODEJS_VERSION = "20" CACHE_S3_SERVER = "https://s3.ci.opencloud.eu" diff --git a/composer.json b/composer.json index e3d10b4475..bde3424394 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { "name": "opencloud-eu/opencloud", - "config" : { + "config": { "platform": { - "php": "8.2" + "php": "8.4" }, "vendor-dir": "./vendor-php", "allow-plugins": { diff --git a/vendor-bin/behat/composer.json b/vendor-bin/behat/composer.json index 9df2b00452..9f8f6c12bf 100644 --- a/vendor-bin/behat/composer.json +++ b/vendor-bin/behat/composer.json @@ -1,7 +1,7 @@ { "config": { "platform": { - "php": "8.2" + "php": "8.4" }, "allow-plugins": { "composer/package-versions-deprecated": true @@ -20,7 +20,7 @@ "guzzlehttp/guzzle": "^7.7", "phpunit/phpunit": "^9.6", "laminas/laminas-ldap": "^2.15", - "ankitpokhrel/tus-php": "^2.3", + "ankitpokhrel/tus-php": "^2.4", "swaggest/json-schema": "^0.12.42", "splitbrain/php-archive": "^1.3" }