Skip to content

Commit f4bc0b6

Browse files
author
teo
committed
add mock metricsSystem before init sql session config
1 parent ba635d4 commit f4bc0b6

File tree

6 files changed

+23
-1
lines changed

6 files changed

+23
-1
lines changed

core/src/test/java/org/apache/gravitino/authorization/TestAccessControlManager.java

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
import org.apache.gravitino.meta.BaseMetalake;
7171
import org.apache.gravitino.meta.CatalogEntity;
7272
import org.apache.gravitino.meta.SchemaVersion;
73+
import org.apache.gravitino.metrics.MetricsSystem;
7374
import org.apache.gravitino.storage.RandomIdGenerator;
7475
import org.junit.jupiter.api.AfterAll;
7576
import org.junit.jupiter.api.Assertions;
@@ -131,6 +132,7 @@ public static void setUp() throws Exception {
131132
Mockito.doReturn(1000L).when(config).get(TREE_LOCK_MIN_NODE_IN_MEMORY);
132133
Mockito.doReturn(36000L).when(config).get(TREE_LOCK_CLEAN_INTERVAL);
133134
FieldUtils.writeField(GravitinoEnv.getInstance(), "lockManager", new LockManager(config), true);
135+
FieldUtils.writeField(GravitinoEnv.getInstance(), "metricsSystem", new MetricsSystem(), true);
134136

135137
entityStore = EntityStoreFactory.createEntityStore(config);
136138
entityStore.initialize(config);

core/src/test/java/org/apache/gravitino/authorization/TestOwnerManager.java

+2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import org.apache.gravitino.meta.GroupEntity;
6060
import org.apache.gravitino.meta.SchemaVersion;
6161
import org.apache.gravitino.meta.UserEntity;
62+
import org.apache.gravitino.metrics.MetricsSystem;
6263
import org.apache.gravitino.storage.IdGenerator;
6364
import org.apache.gravitino.storage.RandomIdGenerator;
6465
import org.junit.jupiter.api.AfterAll;
@@ -106,6 +107,7 @@ public static void setUp() throws IOException, IllegalAccessException {
106107

107108
FieldUtils.writeField(GravitinoEnv.getInstance(), "lockManager", new LockManager(config), true);
108109
FieldUtils.writeField(GravitinoEnv.getInstance(), "catalogManager", catalogManager, true);
110+
FieldUtils.writeField(GravitinoEnv.getInstance(), "metricsSystem", new MetricsSystem(), true);
109111

110112
entityStore = EntityStoreFactory.createEntityStore(config);
111113
entityStore.initialize(config);

core/src/test/java/org/apache/gravitino/storage/TestEntityStorage.java

+4
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import org.apache.gravitino.EntityAlreadyExistsException;
5858
import org.apache.gravitino.EntityStore;
5959
import org.apache.gravitino.EntityStoreFactory;
60+
import org.apache.gravitino.GravitinoEnv;
6061
import org.apache.gravitino.NameIdentifier;
6162
import org.apache.gravitino.Namespace;
6263
import org.apache.gravitino.authorization.AuthorizationUtils;
@@ -82,6 +83,7 @@
8283
import org.apache.gravitino.meta.TableEntity;
8384
import org.apache.gravitino.meta.TopicEntity;
8485
import org.apache.gravitino.meta.UserEntity;
86+
import org.apache.gravitino.metrics.MetricsSystem;
8587
import org.apache.gravitino.rel.types.Type;
8688
import org.apache.gravitino.rel.types.Types;
8789
import org.apache.gravitino.storage.relational.RelationalBackend;
@@ -149,6 +151,8 @@ private void init(String type, Config config) {
149151

150152
FieldUtils.writeStaticField(
151153
SQLExceptionConverterFactory.class, "converter", new H2ExceptionConverter(), true);
154+
FieldUtils.writeField(
155+
GravitinoEnv.getInstance(), "metricsSystem", new MetricsSystem(), true);
152156

153157
} else if (type.equalsIgnoreCase("mysql")) {
154158
String mysqlJdbcUrl = baseIT.startAndInitMySQLBackend();

core/src/test/java/org/apache/gravitino/storage/relational/TestJDBCBackend.java

+4
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,13 @@
5252
import java.util.Objects;
5353
import java.util.UUID;
5454
import org.apache.commons.io.IOUtils;
55+
import org.apache.commons.lang3.reflect.FieldUtils;
5556
import org.apache.gravitino.Catalog;
5657
import org.apache.gravitino.Config;
5758
import org.apache.gravitino.Configs;
5859
import org.apache.gravitino.Entity;
5960
import org.apache.gravitino.EntityAlreadyExistsException;
61+
import org.apache.gravitino.GravitinoEnv;
6062
import org.apache.gravitino.NameIdentifier;
6163
import org.apache.gravitino.Namespace;
6264
import org.apache.gravitino.authorization.AuthorizationUtils;
@@ -78,6 +80,7 @@
7880
import org.apache.gravitino.meta.TagEntity;
7981
import org.apache.gravitino.meta.TopicEntity;
8082
import org.apache.gravitino.meta.UserEntity;
83+
import org.apache.gravitino.metrics.MetricsSystem;
8184
import org.apache.gravitino.storage.RandomIdGenerator;
8285
import org.apache.gravitino.storage.relational.mapper.GroupMetaMapper;
8386
import org.apache.gravitino.storage.relational.mapper.UserMetaMapper;
@@ -127,6 +130,7 @@ public static void setup() {
127130

128131
try {
129132
backend = (RelationalBackend) Class.forName(className).getDeclaredConstructor().newInstance();
133+
FieldUtils.writeField(GravitinoEnv.getInstance(), "metricsSystem", new MetricsSystem(), true);
130134
backend.initialize(config);
131135
} catch (Exception e) {
132136
throw new RuntimeException(

core/src/test/java/org/apache/gravitino/storage/relational/session/TestSqlSession.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@
4040
import java.util.UUID;
4141
import org.apache.commons.dbcp2.BasicDataSource;
4242
import org.apache.commons.io.FileUtils;
43+
import org.apache.commons.lang3.reflect.FieldUtils;
4344
import org.apache.gravitino.Config;
45+
import org.apache.gravitino.GravitinoEnv;
46+
import org.apache.gravitino.metrics.MetricsSystem;
4447
import org.apache.ibatis.session.SqlSession;
4548
import org.junit.jupiter.api.AfterAll;
4649
import org.junit.jupiter.api.AfterEach;
@@ -76,7 +79,12 @@ public static void setUp() {
7679

7780
@BeforeEach
7881
public void init() {
79-
SqlSessionFactoryHelper.getInstance().init(config);
82+
try {
83+
FieldUtils.writeField(GravitinoEnv.getInstance(), "metricsSystem", new MetricsSystem(), true);
84+
SqlSessionFactoryHelper.getInstance().init(config);
85+
} catch (Exception e) {
86+
throw new RuntimeException("Failed to init sql session factory: ", e);
87+
}
8088
}
8189

8290
@AfterEach

core/src/test/java/org/apache/gravitino/tag/TestTagManager.java

+2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
import org.apache.gravitino.meta.SchemaVersion;
7474
import org.apache.gravitino.meta.TableEntity;
7575
import org.apache.gravitino.metalake.MetalakeDispatcher;
76+
import org.apache.gravitino.metrics.MetricsSystem;
7677
import org.apache.gravitino.rel.types.Types;
7778
import org.apache.gravitino.storage.IdGenerator;
7879
import org.apache.gravitino.storage.RandomIdGenerator;
@@ -134,6 +135,7 @@ public static void setUp() throws IOException, IllegalAccessException {
134135
Mockito.doReturn(1000L).when(config).get(TREE_LOCK_MIN_NODE_IN_MEMORY);
135136
Mockito.doReturn(36000L).when(config).get(TREE_LOCK_CLEAN_INTERVAL);
136137
FieldUtils.writeField(GravitinoEnv.getInstance(), "lockManager", new LockManager(config), true);
138+
FieldUtils.writeField(GravitinoEnv.getInstance(), "metricsSystem", new MetricsSystem(), true);
137139

138140
entityStore = EntityStoreFactory.createEntityStore(config);
139141
entityStore.initialize(config);

0 commit comments

Comments
 (0)