Merge pull request #2527 from aduffeck/backport-bleve-batch-fix

Backport bleve batch fix

.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"

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": {

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

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,
 	}
 }
 

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"
   }