Skip to content

fix: use mailbox_group instead of static "100" as mailbox group #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
frisonisland wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

fix: use mailbox_group instead of static "100" as mailbox group #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e90b2a1
test: do not create 100 database on hsqldb startup
frisonisland Jul 21, 2026
c363040
test: create db groups based on local settings
frisonisland Jul 21, 2026
0cc8d42
fix: use mailbox_groups
frisonisland Jul 21, 2026
e926c75
ci: deploy snapshot temporarily
frisonisland Jul 21, 2026
363613f
ci: use ci fix branch
frisonisland Jul 21, 2026
6f0e7d0
ci: -SNAPSHOT changelist
frisonisland Jul 21, 2026
769e56f
ci: revert library usage
frisonisland Jul 21, 2026
4afcb52
ci: use new maven stage
frisonisland Jul 21, 2026
af71a1c
Merge branch 'devel' into perf/hsqldb-single-group-init
frisonisland Jul 22, 2026
f3e2fa1
ci: set version based on env + maven profiles
frisonisland Jul 22, 2026
101d18c
Merge remote-tracking branch 'origin/perf/hsqldb-single-group-init' i…
frisonisland Jul 22, 2026
bd0049b
ci: set version based on env + maven profiles - pt.2
frisonisland Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
library(
identifier: 'jenkins-lib-common@v2.8.8',
identifier: 'jenkins-lib-common@breaking-change/maven-stage',
retriever: modernSCM([
$class: 'GitSCMSource',
credentialsId: 'jenkins-integration-with-github-account',
Expand Down Expand Up @@ -41,11 +41,7 @@ pipeline {
stage('Maven') {
steps {
script {
mavenStage(
profile: '',
deployArtifacts: env.TAG_NAME ? true : false,
extraDeployArgs: '-Dchangelist='
)
mavenStage()
}
}
}
Expand Down
28 changes: 27 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@

<groupId>org.openzal</groupId>
<artifactId>zal</artifactId>
<version>${revision}${changelist}</version>
<version>${revision}${sha1}${changelist}</version>
<packaging>jar</packaging>

<properties>
<revision>4.33.0</revision>
<sha1></sha1>
<changelist>-SNAPSHOT</changelist>
<carbonio.version>4.29.0</carbonio.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -777,4 +778,29 @@
</plugins>
</build>

<profiles>
<profile>
<id>release</id>
<activation>
<property>
<name>env.TAG_NAME</name>
</property>
</activation>
<properties>
<changelist></changelist>
</properties>
</profile>
<profile>
<id>snapshot</id>
<activation>
<property>
<name>!env.TAG_NAME</name>
</property>
</activation>
<properties>
<sha1>.${env.GIT_COMMIT}</sha1>
</properties>
</profile>
</profiles>

</project>
3 changes: 2 additions & 1 deletion src/main/java/org/openzal/zal/MailboxManagerImp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
package org.openzal.zal;


import com.zimbra.common.localconfig.LC;
import com.zimbra.common.service.ServiceException;
import com.zimbra.cs.db.DbMailbox;
import com.zimbra.cs.db.DbPool;
Expand Down Expand Up @@ -119,7 +120,7 @@ public Set<Integer> getMailboxGroupSet()

for( int n=0; n < ids.length; ++n )
{
set.add( (ids[n]-1) % 100 + 1 );
set.add( (ids[n]-1) % LC.zimbra_mailbox_groups.intValue() + 1 );
}

return set;
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/org/openzal/zal/db/HSQLZimbraDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* Zimbra Collaboration Suite Server
*/

import com.zimbra.common.localconfig.LC;
import com.zimbra.common.service.ServiceException;
import com.zimbra.cs.db.DbMailbox;
import com.zimbra.cs.db.DbPool;
Expand Down Expand Up @@ -90,7 +91,7 @@ private static void clearDatabase(String clearSqlScript) throws Exception

private static void executeForAllGroups(com.zimbra.cs.db.DbPool.DbConnection conn, String classpathFile) throws Exception
{
for( int i=1; i <= 100; ++i ) executeFromClasspath(conn, classpathFile, i);
for( int i=1; i <= LC.zimbra_mailbox_groups.intValue(); ++i ) executeFromClasspath(conn, classpathFile, i);
}

interface TempFileRunner {
Expand Down