UNLOZE/projects-jenz
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

un-parallelising some functions, changing futures retriever, moving some thresholds and logic around

Browse Source
This commit is contained in:
jenzur
2020-03-07 18:40:59 +01:00
parent 6d4ab15107
commit ac56f386a3
9 changed files with 455 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ArtificialAutism/src/main/java/DataLayer/DBCPDataSource.java
+4 -3
View File
@@ -10,6 +10,7 @@ import java.sql.SQLException;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.dbcp2.BasicDataSource;
import DataLayer.settings;
/**
*
@@ -20,9 +21,9 @@ public class DBCPDataSource {
static {
try {
ds.setDriver(new com.mysql.cj.jdbc.Driver());
ds.setUrl("jdbc:mysql://163.172.84.14:3306/ArtificialAutism?useLegacyDatetimeCode=false&serverTimezone=UTC");
ds.setUsername("root");
ds.setPassword("FJEF23423u5r9BFhBFEBFIB234h29");
ds.setUrl(settings.url);
ds.setUsername(settings.username);
ds.setPassword(settings.password);
ds.setMaxTotal(-1);
ds.setMinIdle(5);
ds.setMaxIdle(-1);
ArtificialAutism/src/main/java/DataLayer/DBCPDataSourceHLstats.java
+4 -3
View File
@@ -10,6 +10,7 @@ import java.sql.SQLException;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.dbcp2.BasicDataSource;
import DataLayer.settings;
/**
*
@@ -21,9 +22,9 @@ public class DBCPDataSourceHLstats {
static {
try {
ds.setDriver(new com.mysql.cj.jdbc.Driver());
ds.setUrl("jdbc:mysql://151.80.230.149:3306/unloze_stats?useLegacyDatetimeCode=false&serverTimezone=UTC");
ds.setUsername("unloze_stats");
ds.setPassword("R8J8E9Fzmcc7ZfDAGAk7");
ds.setUrl(settings.hlURL);
ds.setUsername(settings.hlusername);
ds.setPassword(settings.hlpassword);
ds.setMaxTotal(-1);
ds.setMinIdle(5);
ds.setMaxIdle(-1);
ArtificialAutism/src/main/java/DataLayer/DataMapper.java
+4 -10
View File
@@ -34,8 +34,7 @@ public class DataMapper {
ResultSet l_rsSearch = null;
try {
l_cCon = DBCPDataSource.getConnection();
String l_sSQL = "CREATE TABLE IF NOT EXISTS `ArtificialAutism`.`Sentences` (`Strings` VARCHAR(256) NOT NULL, PRIMARY KEY (`Strings`))\n"
+ "ENGINE = InnoDB;";
String l_sSQL = "CREATE TABLE IF NOT EXISTS `ArtificialAutism`.`Sentences` (`Strings` text NOT NULL)";
l_pStatement = l_cCon.prepareStatement(l_sSQL);
l_pStatement.execute();
} catch (SQLException ex) {
@@ -53,9 +52,7 @@ public class DataMapper {
try {
l_cCon = DBCPDataSource.getConnection();
String l_sSQL = "SELECT * FROM `Sentences`";
l_pStatement = l_cCon.prepareStatement(l_sSQL, java.sql.ResultSet.TYPE_FORWARD_ONLY,
java.sql.ResultSet.CONCUR_READ_ONLY);
l_pStatement.setFetchSize(Integer.MIN_VALUE);
l_pStatement = l_cCon.prepareStatement(l_sSQL);
l_rsSearch = l_pStatement.executeQuery();
int ij = 0;
while (l_rsSearch.next()) {
@@ -77,9 +74,7 @@ public class DataMapper {
String l_sSQL = "INSERT IGNORE `Sentences` (`Strings`) VALUES (?)";
try {
l_cCon = DBCPDataSource.getConnection();
l_pStatement = l_cCon.prepareStatement(l_sSQL, java.sql.ResultSet.TYPE_FORWARD_ONLY,
java.sql.ResultSet.CONCUR_READ_ONLY);
l_pStatement.setFetchSize(Integer.MIN_VALUE);
l_pStatement = l_cCon.prepareStatement(l_sSQL);
for (String str1 : str.values()) {
//System.out.println("adding str1: " + str1 + "\n");
l_pStatement.setString(1, str1);
@@ -97,8 +92,7 @@ public class DataMapper {
ConcurrentMap<Integer, String> hlStatsMessages = new MapMaker().concurrencyLevel(2).makeMap();
try (Connection l_cCon = DBCPDataSourceHLstats.getConnection()) {
String l_sSQL = "SELECT message FROM `hlstats_Events_Chat`";
try (PreparedStatement l_pStatement = l_cCon.prepareStatement(l_sSQL, java.sql.ResultSet.TYPE_FORWARD_ONLY,
java.sql.ResultSet.CONCUR_READ_ONLY)) {
try (PreparedStatement l_pStatement = l_cCon.prepareStatement(l_sSQL)) {
try (ResultSet l_rsSearch = l_pStatement.executeQuery()) {
while (l_rsSearch.next()) {
hlStatsMessages.put(hlStatsMessages.size() + 1, l_rsSearch.getString(1));