Skip to content

Commit

Permalink
remove AsyncDbStatement
Browse files Browse the repository at this point in the history
  • Loading branch information
@aikar
aikar committed Mar 10, 2018
1 parent 1ded675 commit d94b0a5
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 179 deletions.
92 changes: 0 additions & 92 deletions core/src/main/java/co/aikar/db/AsyncDbStatement.java
View file

This file was deleted.

119 changes: 32 additions & 87 deletions core/src/main/java/co/aikar/db/DB.java
View file
Expand Up @@ -145,15 +145,7 @@ public static DbStatement query(@Language("MySQL") String query) throws SQLExcep
* YOU MUST MANUALLY CLOSE THIS STATEMENT IN A finally {} BLOCK!
*/
public static CompletableFuture<DbStatement> queryAsync(@Language("MySQL") String query) {
CompletableFuture<DbStatement> future = new CompletableFuture<>();
threadPool.submit(() -> {
try {
future.complete(new DbStatement().query(query));
} catch (SQLException e) {
future.completeExceptionally(e);
}
});
return future;
return DB.dispatchAsync(() -> new DbStatement().query(query));
}

/**
Expand All @@ -165,7 +157,8 @@ public static CompletableFuture<DbStatement> queryAsync(@Language("MySQL") Strin
* @return DbRow of your results (HashMap with template return type)
*/
public static DbRow getFirstRow(@Language("MySQL") String query, Object... params) throws SQLException {
try (DbStatement statement = DB.query(query).execute(params)) {
try (DbStatement statement = DB.query(query)) {
statement.execute(params);
return statement.getNextRow();
}
}
Expand All @@ -178,19 +171,7 @@ public static DbRow getFirstRow(@Language("MySQL") String query, Object... param
* @return DbRow of your results (HashMap with template return type)
*/
public static CompletableFuture<DbRow> getFirstRowAsync(@Language("MySQL") String query, Object... params) {
CompletableFuture<DbRow> future = new CompletableFuture<>();
new AsyncDbStatement(query) {
@Override
protected void run(DbStatement statement) throws SQLException {
try {
future.complete(statement.getNextRow());
} catch (Exception e) {
future.completeExceptionally(e);
}
}
};

return future;
return DB.dispatchAsync(() -> getFirstRow(query, params));
}

/**
Expand All @@ -200,10 +181,10 @@ protected void run(DbStatement statement) throws SQLException {
* @param query The query to run
* @param params The parameters to execute the statement with
* @return DbRow of your results (HashMap with template return type)
* @throws SQLException
*/
public static <T> T getFirstColumn(@Language("MySQL") String query, Object... params) throws SQLException {
try (DbStatement statement = DB.query(query).execute(params)) {
try (DbStatement statement = DB.query(query)) {
statement.execute(params);
return statement.getFirstColumn();
}
}
Expand All @@ -216,19 +197,7 @@ public static <T> T getFirstColumn(@Language("MySQL") String query, Object... pa
* @return DbRow of your results (HashMap with template return type)
*/
public static <T> CompletableFuture<T> getFirstColumnAsync(@Language("MySQL") String query, Object... params) {
CompletableFuture<T> future = new CompletableFuture<>();
new AsyncDbStatement(query) {
@Override
protected void run(DbStatement statement) throws SQLException {
try {
future.complete(statement.getFirstColumn());
} catch (Exception e) {
future.completeExceptionally(e);
}
}
};

return future;
return DB.dispatchAsync(() -> getFirstColumn(query, params));
}

/**
Expand All @@ -239,7 +208,8 @@ protected void run(DbStatement statement) throws SQLException {
public static <T> List<T> getFirstColumnResults(@Language("MySQL") String query, Object... params) throws SQLException {
List<T> dbRows = new ArrayList<>();
T result;
try (DbStatement statement = DB.query(query).execute(params)) {
try (DbStatement statement = DB.query(query)) {
statement.execute(params);
while ((result = statement.getFirstColumn()) != null) {
dbRows.add(result);
}
Expand All @@ -252,24 +222,7 @@ public static <T> List<T> getFirstColumnResults(@Language("MySQL") String query,
* Meant for single queries that will not use the statement multiple times.
*/
public static <T> CompletableFuture<List<T>> getFirstColumnResultsAsync(@Language("MySQL") String query, Object... params) {
CompletableFuture<List<T>> future = new CompletableFuture<>();
new AsyncDbStatement(query) {
@Override
protected void run(DbStatement statement) throws SQLException {
try {
List<T> dbRows = new ArrayList<>();
T result;
while ((result = statement.getFirstColumn()) != null) {
dbRows.add(result);
}
future.complete(dbRows);
} catch (Exception e) {
future.completeExceptionally(e);
}
}
};

return future;
return DB.dispatchAsync(() -> getFirstColumnResults(query, params));
}

/**
Expand All @@ -282,7 +235,8 @@ protected void run(DbStatement statement) throws SQLException {
* @return List of DbRow of your results (HashMap with template return type)
*/
public static List<DbRow> getResults(@Language("MySQL") String query, Object... params) throws SQLException {
try (DbStatement statement = DB.query(query).execute(params)) {
try (DbStatement statement = DB.query(query)) {
statement.execute(params);
return statement.getResults();
}
}
Expand All @@ -297,19 +251,7 @@ public static List<DbRow> getResults(@Language("MySQL") String query, Object...
* @return List of DbRow of your results (HashMap with template return type)
*/
public static CompletableFuture<List<DbRow>> getResultsAsync(@Language("MySQL") String query, Object... params) {
CompletableFuture<List<DbRow>> future = new CompletableFuture<>();
new AsyncDbStatement(query) {
@Override
protected void run(DbStatement statement) throws SQLException {
try {
future.complete(statement.getResults());
} catch (Exception e) {
future.completeExceptionally(e);
}
}
};

return future;
return DB.dispatchAsync(() -> getResults(query, params));
}

/**
Expand Down Expand Up @@ -348,13 +290,25 @@ public static int executeUpdate(@Language("MySQL") String query, Object... param
* @param query Query to run
* @param params Params to execute the update with
*/
public static void executeUpdateAsync(@Language("MySQL") String query, final Object... params) {
new AsyncDbStatement(query) {
@Override
public void run(DbStatement statement) throws SQLException {
statement.executeUpdate(params);
public static CompletableFuture<Integer> executeUpdateAsync(@Language("MySQL") String query, final Object... params) {
return dispatchAsync(() -> executeUpdate(query, params));
}

private synchronized static <T> CompletableFuture<T> dispatchAsync(Callable<T> task) {
CompletableFuture<T> future = new CompletableFuture<>();
Runnable run = () -> {
try {
future.complete(task.call());
} catch (Exception e) {
future.completeExceptionally(e);
}
};
if (threadPool == null) {
run.run();
} else {
threadPool.submit(run);
}
return future;
}

static Connection getConnection() throws SQLException {
Expand All @@ -366,14 +320,15 @@ public static void createTransactionAsync(TransactionCallback run) {
}

public static void createTransactionAsync(TransactionCallback run, Runnable onSuccess, Runnable onFail) {
threadPool.submit(() -> {
dispatchAsync(() -> {
if (!createTransaction(run)) {
if (onFail != null) {
onFail.run();
}
} else if (onSuccess != null) {
onSuccess.run();
}
return null;
});
}

Expand Down Expand Up @@ -420,14 +375,4 @@ public static void fatal(SQLException e) {
options.onFatalError.accept(e);
}

public static void executeAsync(AsyncDbStatement asyncStm) {
threadPool.submit(() -> {
try (DbStatement stm = new DbStatement()) {
asyncStm.run(stm);
} catch (SQLException e) {
DB.logException(e);
}
});
}

}

0 comments on commit d94b0a5

Please sign in to comment.