fix xa test and add some prometheus exporter

MyCATApache · Feb 15, 2022 · 6995421 · 6995421
1 parent ed31db0
commit 6995421
Show file tree

Hide file tree

Showing 9 changed files with 416 additions and 164 deletions.
diff --git a/example/src/test/java/io/mycat/xa/BaseSavepointSuite.java b/example/src/test/java/io/mycat/xa/BaseSavepointSuite.java
@@ -28,7 +28,7 @@ public void baseSavepointCommit(VertxTestContext testContext) {
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {
@@ -55,7 +55,7 @@ public void baseSavepointSavepointCommit(VertxTestContext testContext) {
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {
@@ -99,7 +99,7 @@ public void baseSavepointRollback(VertxTestContext testContext) {
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {
@@ -120,7 +120,7 @@ public void baseSavepointRelease(VertxTestContext testContext) {
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {
@@ -142,7 +142,7 @@ public void baseSavepointRollbackSavepoint(VertxTestContext testContext) {
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {
@@ -168,7 +168,7 @@ public void baseSavepointCommitInSingleConnection(VertxTestContext testContext)
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {
@@ -215,7 +215,7 @@ public void baseSavepointRollbackInSingleConnection(VertxTestContext testContext
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {
@@ -262,7 +262,7 @@ public void baseSavepointRollbackSavepointInSingleConnection(VertxTestContext te
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {
@@ -320,7 +320,7 @@ public void baseSavepointReleaseSavepointInSingleConnection(VertxTestContext tes
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {
@@ -385,7 +385,7 @@ public void baseSavepointReleaseSavepointInTwoConnection(VertxTestContext testCo
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {
@@ -479,7 +479,7 @@ public void baseSavepointRollbackSavepointInTwoConnection(VertxTestContext testC
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {
@@ -570,7 +570,7 @@ public void baseSavepointCommitSavepointInTwoConnection(VertxTestContext testCon
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {
@@ -645,7 +645,7 @@ public void baseSavepointRollbackInTwoConnection(VertxTestContext testContext) {
 
         SavepointSqlConnection savepointSqlConnection = (SavepointSqlConnection) baseXaSqlConnection;
 
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             @SneakyThrows
             public void handle(AsyncResult<Void> event) {

diff --git a/example/src/test/java/io/mycat/xa/XaTestSuite.java b/example/src/test/java/io/mycat/xa/XaTestSuite.java
@@ -91,7 +91,7 @@ private void extracteInitSql(Connection mySQLConnection) throws SQLException {
     @Test
     public void begin(VertxTestContext testContext) {
         XaSqlConnection baseXaSqlConnection = factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             public void handle(AsyncResult<Void> event) {
                 Assertions.assertEquals(baseXaSqlConnection.isInTransaction(), true);
@@ -104,7 +104,7 @@ public void handle(AsyncResult<Void> event) {
     @Test
     public void beginCommit(VertxTestContext testContext) {
         XaSqlConnection baseXaSqlConnection = factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.begin(event -> baseXaSqlConnection.commit(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(event -> baseXaSqlConnection.commit().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             public void handle(AsyncResult<Void> event) {
                 Assertions.assertEquals(baseXaSqlConnection.isInTransaction(), false);
@@ -117,7 +117,7 @@ public void handle(AsyncResult<Void> event) {
     @Test
     public void beginRollback(VertxTestContext testContext) {
         XaSqlConnection baseXaSqlConnection = factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.begin(event -> baseXaSqlConnection.rollback(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(event -> baseXaSqlConnection.rollback().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             public void handle(AsyncResult<Void> event) {
                 Assertions.assertEquals(baseXaSqlConnection.isInTransaction(), false);
@@ -131,10 +131,10 @@ public void handle(AsyncResult<Void> event) {
     @Disabled
     public void beginBegin(VertxTestContext testContext) {
         XaSqlConnection baseXaSqlConnection = factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             public void handle(AsyncResult<Void> event) {
-                baseXaSqlConnection.begin(event1 -> {
+                baseXaSqlConnection.begin().onComplete(event1 -> {
                     Assertions.assertTrue(event1.failed());
                     testContext.completeNow();
                 });
@@ -146,7 +146,7 @@ public void handle(AsyncResult<Void> event) {
     @Test
     public void rollback(VertxTestContext testContext) {
         XaSqlConnection baseXaSqlConnection = factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.rollback(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.rollback().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             public void handle(AsyncResult<Void> event) {
                 Assertions.assertTrue(event.succeeded());
@@ -159,7 +159,7 @@ public void handle(AsyncResult<Void> event) {
     @Test
     public void commit(VertxTestContext testContext) {
         XaSqlConnection baseXaSqlConnection = factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.commit(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.commit().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             public void handle(AsyncResult<Void> event) {
                 Assertions.assertTrue(event.succeeded());
@@ -172,7 +172,7 @@ public void handle(AsyncResult<Void> event) {
     @Test
     public void close(VertxTestContext testContext) {
         XaSqlConnection baseXaSqlConnection = factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.close(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.close().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             public void handle(AsyncResult<Void> event) {
                 Assertions.assertTrue(event.succeeded());
@@ -185,10 +185,10 @@ public void handle(AsyncResult<Void> event) {
     @Test
     public void closeInTranscation(VertxTestContext testContext) {
         XaSqlConnection baseXaSqlConnection = factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.begin(new Handler<AsyncResult<Void>>() {
+        baseXaSqlConnection.begin().onComplete(new Handler<AsyncResult<Void>>() {
             @Override
             public void handle(AsyncResult<Void> event) {
-                baseXaSqlConnection.close(new Handler<AsyncResult<Void>>() {
+                baseXaSqlConnection.close().onComplete(new Handler<AsyncResult<Void>>() {
                     @Override
                     public void handle(AsyncResult<Void> event) {
                         Assertions.assertTrue(event.succeeded());
@@ -204,7 +204,7 @@ public void handle(AsyncResult<Void> event) {
     public void beginSingleTargetInsertCommit(VertxTestContext testContext) throws Exception {
         clearData();
         XaSqlConnection baseXaSqlConnection =  factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.begin(event -> {
+        baseXaSqlConnection.begin().onComplete(event -> {
             Assertions.assertTrue(event.succeeded());
             Future<NewMycatConnection> ds1 = baseXaSqlConnection.getConnection("ds1");
             ds1.compose(connection -> {
@@ -224,7 +224,7 @@ public void beginSingleTargetInsertCommit(VertxTestContext testContext) throws E
                         });
             }).onComplete(event13 -> {
                 Assertions.assertTrue(event13.succeeded());
-                baseXaSqlConnection.commit(event12 -> {
+                baseXaSqlConnection.commit().onComplete(event12 -> {
                     Assertions.assertTrue(event12.succeeded());
                     Assertions.assertFalse(baseXaSqlConnection.isInTransaction());
                     Future<NewMycatConnection> connectionFuture =
@@ -247,7 +247,7 @@ public void beginSingleTargetInsertCommit(VertxTestContext testContext) throws E
     public void beginDoubleTargetInsertCommit(VertxTestContext testContext) throws Exception {
         clearData();
         XaSqlConnection baseXaSqlConnection =  factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.begin(event -> {
+        baseXaSqlConnection.begin().onComplete(event -> {
             Assertions.assertTrue(event.succeeded());
             Future<NewMycatConnection> ds1 = baseXaSqlConnection.getConnection("ds1");
             Future<NewMycatConnection> ds2 = baseXaSqlConnection.getConnection("ds2");
@@ -273,7 +273,7 @@ public void beginDoubleTargetInsertCommit(VertxTestContext testContext) throws E
             }));
             all.onComplete(event13 -> {
                 Assertions.assertTrue(event13.succeeded());
-                baseXaSqlConnection.commit(event12 -> {
+                baseXaSqlConnection.commit().onComplete(event12 -> {
                     Assertions.assertTrue(event12.succeeded());
                     Assertions.assertFalse(baseXaSqlConnection.isInTransaction());
                     Future<NewMycatConnection> connectionFuture =
@@ -295,7 +295,7 @@ public void beginDoubleTargetInsertCommit(VertxTestContext testContext) throws E
     public void beginDoubleTargetInsertButStatementFail(VertxTestContext testContext) throws Exception {
         clearData();
         XaSqlConnection baseXaSqlConnection =  factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.begin(event -> {
+        baseXaSqlConnection.begin().onComplete(event -> {
             Assertions.assertTrue(event.succeeded());
             Future<NewMycatConnection> ds1 = baseXaSqlConnection.getConnection("ds1");
             Future<NewMycatConnection> ds2 = baseXaSqlConnection.getConnection("ds2");
@@ -321,7 +321,7 @@ public void beginDoubleTargetInsertButStatementFail(VertxTestContext testContext
             }));
             all.onComplete(event13 -> {
                 Assertions.assertTrue(event13.failed());
-                baseXaSqlConnection.rollback(new Handler<AsyncResult<Void>>() {
+                baseXaSqlConnection.rollback().onComplete(new Handler<AsyncResult<Void>>() {
                     @Override
                     public void handle(AsyncResult<Void> event) {
                         Assertions.assertTrue(event.succeeded());
@@ -346,7 +346,7 @@ public void handle(AsyncResult<Void> event) {
     public void beginDoubleTargetInsertButPrepareFail(VertxTestContext testContext) throws Exception {
         clearData();
         XaSqlConnection baseXaSqlConnection =  factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.begin(event -> {
+        baseXaSqlConnection.begin().onComplete(event -> {
             Assertions.assertTrue(event.succeeded());
             Future<NewMycatConnection> ds1 = baseXaSqlConnection.getConnection("ds1");
             Future<NewMycatConnection> ds2 = baseXaSqlConnection.getConnection("ds2");
@@ -377,7 +377,7 @@ public void beginDoubleTargetInsertButPrepareFail(VertxTestContext testContext)
                     @Override
                     public void handle(AsyncResult<Void> event) {
                         Assertions.assertTrue(event.failed());
-                        baseXaSqlConnection.rollback(new Handler<AsyncResult<Void>>() {
+                        baseXaSqlConnection.rollback().onComplete(new Handler<AsyncResult<Void>>() {
                             @Override
                             public void handle(AsyncResult<Void> event) {
                                 Assertions.assertTrue(event.succeeded());
@@ -405,7 +405,7 @@ public void handle(AsyncResult<Void> event) {
     public void beginDoubleTargetInsertButCommitFail(VertxTestContext testContext) throws Exception {
         clearData();
         XaSqlConnection baseXaSqlConnection =  factory.apply(mySQLManager,xaLog);
-        baseXaSqlConnection.begin(event -> {
+        baseXaSqlConnection.begin().onComplete(event -> {
             Assertions.assertTrue(event.succeeded());
             Future<NewMycatConnection> ds1 = baseXaSqlConnection.getConnection("ds1");
             Future<NewMycatConnection> ds2 = baseXaSqlConnection.getConnection("ds2");
@@ -436,7 +436,7 @@ public void beginDoubleTargetInsertButCommitFail(VertxTestContext testContext) t
                             @Override
                             public void handle(AsyncResult<Void> event) {
                                 Assertions.assertTrue(event.failed());
-                                baseXaSqlConnection.commit(new Handler<AsyncResult<Void>>() {
+                                baseXaSqlConnection.commit().onComplete(new Handler<AsyncResult<Void>>() {
                                     @Override
                                     public void handle(AsyncResult<Void> event) {
                                         Assertions.assertTrue(event.succeeded());

diff --git a/mycat2/src/main/java/io/mycat/commands/MycatMySQLManagerImpl.java b/mycat2/src/main/java/io/mycat/commands/MycatMySQLManagerImpl.java
@@ -151,7 +151,7 @@ public Future<Map<String, Integer>> computeConnectionUsageSnapshot() {
         HashMap<String, Integer> resMap = new HashMap<>();
         for (Map.Entry<String, MycatDatasourcePool> entry : map.entrySet()) {
             MycatDatasourcePool pool = entry.getValue();
-            Integer n = pool.getAvailableNumber();
+            Integer n = pool.getUsedNumber();
             resMap.put(entry.getKey(), n);
         }
         return Future.succeededFuture(resMap);