Skip to content

Commit

Permalink
merge: #1078
Browse files Browse the repository at this point in the history
1078: Release 8.4.2 r=github-actions[bot] a=camundait

Merge the release branch with stable. This pull request was created by Zeebe 🚀.

Co-authored-by: Nicolas Pepin-Perreault <nicolas.pepin-perreault@camunda.com>
  • Loading branch information
zeebe-bors-camunda[bot] and npepinpe authored Feb 7, 2024
2 parents 83b25d4 + 7330556 commit aebe0c1
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import io.camunda.zeebe.db.*;
import io.camunda.zeebe.db.impl.DbNil;
import io.camunda.zeebe.protocol.EnumValue;
import java.io.File;
import java.util.Optional;
import java.util.TreeMap;
Expand All @@ -28,7 +29,7 @@
*
* @param <ColumnFamilyType>
*/
final class InMemoryDb<ColumnFamilyType extends Enum<ColumnFamilyType>>
final class InMemoryDb<ColumnFamilyType extends Enum<ColumnFamilyType> & EnumValue>
implements ZeebeDb<ColumnFamilyType> {

private final TreeMap<Bytes, Bytes> database = new TreeMap<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@

import io.camunda.zeebe.db.ZeebeDb;
import io.camunda.zeebe.db.ZeebeDbFactory;
import io.camunda.zeebe.protocol.EnumValue;
import java.io.File;

public class InMemoryDbFactory<ColumnFamilyTpe extends Enum<ColumnFamilyTpe>>
public class InMemoryDbFactory<ColumnFamilyTpe extends Enum<ColumnFamilyTpe> & EnumValue>
implements ZeebeDbFactory<ColumnFamilyTpe> {

public ZeebeDb<ColumnFamilyTpe> createDb() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import io.camunda.zeebe.db.ZeebeDb;
import io.camunda.zeebe.db.ZeebeDbTransaction;
import io.camunda.zeebe.db.impl.DbLong;
import io.camunda.zeebe.protocol.EnumValue;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
Expand Down Expand Up @@ -512,10 +513,21 @@ void shouldNotIterateOverDeletionsInTransaction() throws Exception {
});
}

private enum ColumnFamilies {
DEFAULT, // rocksDB needs a default column family
ONE,
TWO,
THREE
private enum ColumnFamilies implements EnumValue {
DEFAULT(0), // rocksDB needs a default column family
ONE(1),
TWO(2),
THREE(3);

private final int value;

ColumnFamilies(final int value) {
this.value = value;
}

@Override
public int getValue() {
return value;
}
}
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<dependency.snakeyaml.version>2.2</dependency.snakeyaml.version>
<dependency.spring.version>6.1.1</dependency.spring.version>
<dependency.testcontainers.version>1.19.3</dependency.testcontainers.version>
<dependency.zeebe.version>8.4.1</dependency.zeebe.version>
<dependency.zeebe.version>8.4.2</dependency.zeebe.version>

<license.header>com/mycila/maven/plugin/license/templates/APACHE-2.txt</license.header>

Expand Down

0 comments on commit aebe0c1

Please sign in to comment.