Skip to content

Commit f531e20

Browse files
committed
Add transaction name to count util
1 parent 8061f5a commit f531e20

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

src/main/java/org/spin/service/grpc/util/db/CountUtil.java

+26-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* @author Edwin Betancourt, [email protected], https://github.com/EdwinBetanc0urt
2929
*/
3030
public class CountUtil {
31-
31+
3232
/**
3333
* Count records
3434
* @param sql
@@ -37,9 +37,20 @@ public class CountUtil {
3737
* @return
3838
*/
3939
public static int countRecords(String sql, String tableName, List<Object> parameters) {
40-
return countRecords(sql, tableName, null, parameters);
40+
return countRecords(sql, tableName, parameters, null);
4141
}
4242

43+
/**
44+
* Count records using transaction name
45+
* @param sql
46+
* @param tableName
47+
* @param parameters
48+
* @return
49+
*/
50+
public static int countRecords(String sql, String tableName, List<Object> parameters, String transactionName) {
51+
return countRecords(sql, tableName, null, parameters, transactionName);
52+
}
53+
4354
/**
4455
* Count records
4556
* @param sql
@@ -49,6 +60,18 @@ public static int countRecords(String sql, String tableName, List<Object> parame
4960
* @return
5061
*/
5162
public static int countRecords(String sql, String tableName, String tableNameAlias, List<Object> parameters) {
63+
return countRecords(sql, tableName, null, parameters, null);
64+
}
65+
66+
/**
67+
* Count records using transaction name
68+
* @param sql
69+
* @param tableName
70+
* @param tableNameAlias
71+
* @param parameters
72+
* @return
73+
*/
74+
public static int countRecords(String sql, String tableName, String tableNameAlias, List<Object> parameters, String transactionName) {
5275
// tableName tableName, tableName AS tableName
5376
String tableWithAliases = FromUtil.getPatternTableName(tableName, tableNameAlias);
5477

@@ -106,7 +129,7 @@ public static int countRecords(String sql, String tableName, String tableNameAli
106129
parameters = new ArrayList<Object>();
107130
}
108131

109-
return DB.getSQLValueEx(null, queryCount, parameters);
132+
return DB.getSQLValueEx(transactionName, queryCount, parameters);
110133
}
111134

112135
}

src/main/java/org/spin/service/grpc/util/value/ValueManager.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*************************************************************************************/
1616
package org.spin.service.grpc.util.value;
1717

18-
import java.io.IOException;
1918
import java.math.BigDecimal;
2019
import java.net.URLDecoder;
2120
import java.nio.charset.Charset;
@@ -660,7 +659,7 @@ public static Map<String, Object> convertJsonStringToMap(String jsonValues) {
660659
e.printStackTrace();
661660
} catch (JsonProcessingException e) {
662661
e.printStackTrace();
663-
} catch (IOException e) {
662+
} catch (Exception e) {
664663
e.printStackTrace();
665664
}
666665
return fillValues;

0 commit comments

Comments
 (0)