Skip to content

Commit 908a05a

Browse files
committed
fix: Fixed MB to bytes conversion
1 parent 4c5759d commit 908a05a

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

core/redis-enterprise-admin/src/main/java/com/redis/enterprise/Database.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ public class Database {
1818

1919
public static final String DEFAULT_NAME = "redis-enterprise-admin-db";
2020

21-
public static final long MB_TO_BYTES = 1024 ^ 2;
21+
public static final long KILO = 1024;
22+
public static final long MEGA = KILO * KILO;
23+
public static final long GIGA = MEGA * KILO;
2224
public static final long DEFAULT_MEMORY_MB = 100;
23-
public static final long DEFAULT_MEMORY = DEFAULT_MEMORY_MB * MB_TO_BYTES;
25+
public static final long DEFAULT_MEMORY = DEFAULT_MEMORY_MB * MEGA;
2426
public static final int DEFAULT_CLUSTER_SHARD_COUNT = 3;
2527

2628
public static List<String> defaultShardKeyRegexes() {
@@ -348,8 +350,16 @@ public Builder memory(long memory) {
348350
return this;
349351
}
350352

353+
public Builder memoryKB(long memory) {
354+
return memory(memory * KILO);
355+
}
356+
351357
public Builder memoryMB(long memory) {
352-
return memory(memory * MB_TO_BYTES);
358+
return memory(memory * MEGA);
359+
}
360+
361+
public Builder memoryGB(long memory) {
362+
return memory(memory * GIGA);
353363
}
354364

355365
public Builder port(Integer port) {

core/redis-enterprise-admin/src/test/java/com/redis/enterprise/AbstractAdminTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ void deleteDatabase() throws ParseException, GeneralSecurityException, IOExcepti
8989

9090
@Test
9191
void createDatabaseException() throws ParseException, IOException {
92-
Assertions.assertThrows(HttpResponseException.class, () -> admin.createDatabase(Database.builder()
93-
.name("DatabaseCreateExceptionTestDB").memory(999000 * Database.MB_TO_BYTES).build()));
92+
long memory = 999 * Database.GIGA;
93+
Assertions.assertThrows(HttpResponseException.class, () -> admin
94+
.createDatabase(Database.builder().name("DatabaseCreateExceptionTestDB").memory(memory).build()));
9495
}
9596

9697
}

core/redis-enterprise-admin/src/test/java/com/redis/enterprise/ServerAdminTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.redis.enterprise;
22

3-
import org.junit.jupiter.api.Disabled;
3+
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
44

5-
@Disabled // @EnabledIfEnvironmentVariable(named = RedisEnterpriseServer.ENV_HOST, matches
6-
// = ".*")
5+
import com.redis.testcontainers.RedisEnterpriseServer;
6+
7+
@EnabledIfEnvironmentVariable(named = RedisEnterpriseServer.ENV_HOST, matches = ".*")
78
class ServerAdminTests extends AbstractAdminTests {
89

910
@Override
1011
protected Admin admin() {
1112
Admin admin = new Admin();
12-
// TODO admin.withHost(System.getenv(RedisEnterpriseServer.ENV_HOST));
13+
admin.withHost(System.getenv(RedisEnterpriseServer.ENV_HOST));
1314
return admin;
1415
}
1516

0 commit comments

Comments
 (0)