Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-27 21:29:47 +01:00
Code Issues Projects Releases Wiki Activity

Convert bulkupdate & search functionality to use PreparedStatements (#972)

Browse Source
This commit is contained in:
Luck 2018-05-05 18:17:48 +01:00
parent c4c98aaabf
commit 7ee9b93365
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
11 changed files with 118 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
common/src/main/java/me/lucko/luckperms/common/bulkupdate/BulkUpdate.java
View File

@ -87,56 +87,35 @@ public final class BulkUpdate {
*
* @return this query in SQL form
*/
public String buildAsSql() {
public PreparedStatementBuilder buildAsSql() {
// DELETE FROM {table} WHERE ...
// UPDATE {table} SET ... WHERE ...
StringBuilder sb = new StringBuilder();
PreparedStatementBuilder builder = new PreparedStatementBuilder();
// add the action
// (DELETE FROM or UPDATE)
sb.append(this.action.getAsSql());
this.action.appendSql(builder);
// if there are no constraints, just return without a WHERE clause
if (this.queries.isEmpty()) {
return sb.append(";").toString();
return builder;
}
// append constraints
sb.append(" WHERE");
builder.append(" WHERE");
for (int i = 0; i < this.queries.size(); i++) {
Query query = this.queries.get(i);
sb.append(" ");
builder.append(" ");
if (i != 0) {
sb.append("AND ");
builder.append("AND ");
}
sb.append(query.getAsSql());
query.appendSql(builder);
}
return sb.append(";").toString();
}
/**
* Utility to appropriately escape a string for use in a query.
*
* @param s the string to escape
* @return an escaped string
*/
public static String escapeStringForSql(String s) {
if (s.equalsIgnoreCase("true") || s.equalsIgnoreCase("false")) {
return s.toLowerCase();
}
try {
Integer.parseInt(s);
return s;
} catch (NumberFormatException e) {
// ignored
}
return "'" + s + "'";
return builder;
}
public DataType getDataType() {

69
common/src/main/java/me/lucko/luckperms/common/bulkupdate/PreparedStatementBuilder.java Normal file
View File

@ -0,0 +1,69 @@
/*
* This file is part of LuckPerms, licensed under the MIT License.
*
* Copyright (c) lucko (Luck) <luck@lucko.me>
* Copyright (c) contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package me.lucko.luckperms.common.bulkupdate;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
public class PreparedStatementBuilder {
private final StringBuilder sb = new StringBuilder();
private final List<String> variables = new ArrayList<>();
public PreparedStatementBuilder() {
}
public PreparedStatementBuilder append(String s) {
this.sb.append(s);
return this;
}
public PreparedStatementBuilder variable(String variable) {
this.variables.add(variable);
return this;
}
public PreparedStatement build(Connection connection, Function<String, String> mapping) throws SQLException {
PreparedStatement statement = connection.prepareStatement(mapping.apply(this.sb.toString()));
for (int i = 0; i < this.variables.size(); i++) {
String var = this.variables.get(i);
statement.setString(i + 1, var);
}
return statement;
}
public String toReadableString() {
String s = this.sb.toString();
for (String var : this.variables) {
s = s.replaceFirst("\\?", var);
}
return s;
}
}

3
common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/Action.java
View File

@ -25,6 +25,7 @@
package me.lucko.luckperms.common.bulkupdate.action;
import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder;
import me.lucko.luckperms.common.node.model.NodeDataContainer;
/**
@ -54,6 +55,6 @@ public interface Action {
*
* @return the action in sql form
*/
String getAsSql();
void appendSql(PreparedStatementBuilder builder);
}

5
common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/DeleteAction.java
View File

@ -25,6 +25,7 @@
package me.lucko.luckperms.common.bulkupdate.action;
import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder;
import me.lucko.luckperms.common.node.model.NodeDataContainer;
public class DeleteAction implements Action {
@ -47,7 +48,7 @@ public class DeleteAction implements Action {
}
@Override
public String getAsSql() {
return "DELETE FROM {table}";
public void appendSql(PreparedStatementBuilder builder) {
builder.append("DELETE FROM {table}");
}
}

7
common/src/main/java/me/lucko/luckperms/common/bulkupdate/action/UpdateAction.java
View File

@ -25,7 +25,7 @@
package me.lucko.luckperms.common.bulkupdate.action;
import me.lucko.luckperms.common.bulkupdate.BulkUpdate;
import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder;
import me.lucko.luckperms.common.bulkupdate.query.QueryField;
import me.lucko.luckperms.common.node.model.NodeDataContainer;
@ -66,7 +66,8 @@ public class UpdateAction implements Action {
}
@Override
public String getAsSql() {
return "UPDATE {table} SET " + this.field.getSqlName() + "=" + BulkUpdate.escapeStringForSql(this.value);
public void appendSql(PreparedStatementBuilder builder) {
builder.append("UPDATE {table} SET " + this.field.getSqlName() + "=?");
builder.variable(this.value);
}
}

6
common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/Comparison.java
View File

@ -25,6 +25,8 @@
package me.lucko.luckperms.common.bulkupdate.comparisons;
import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder;
/**
* A method of comparing two strings
*/
@ -49,9 +51,7 @@ public interface Comparison {
/**
* Returns the comparison operator in SQL form
*
* @return a sql form of this comparison
*/
String getAsSql();
void appendSql(PreparedStatementBuilder builder);
}

10
common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/Constraint.java
View File

@ -25,7 +25,7 @@
package me.lucko.luckperms.common.bulkupdate.comparisons;
import me.lucko.luckperms.common.bulkupdate.BulkUpdate;
import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder;
public class Constraint {
@ -54,8 +54,12 @@ public class Constraint {
return this.comparison.matches(value, this.expression);
}
public String getAsSql(String field) {
return field + " " + this.comparison.getAsSql() + " " + BulkUpdate.escapeStringForSql(this.expression);
public void appendSql(PreparedStatementBuilder builder, String field) {
// e.g. field LIKE ?
builder.append(field + " ");
this.comparison.appendSql(builder);
builder.append(" ?");
builder.variable(this.expression);
}
public Comparison getComparison() {

6
common/src/main/java/me/lucko/luckperms/common/bulkupdate/comparisons/StandardComparison.java
View File

@ -25,6 +25,8 @@
package me.lucko.luckperms.common.bulkupdate.comparisons;
import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder;
/**
* An enumeration of standard {@link Comparison}s.
*/
@ -88,8 +90,8 @@ public enum StandardComparison implements Comparison {
}
@Override
public String getAsSql() {
return this.asSql;
public void appendSql(PreparedStatementBuilder builder) {
builder.append(this.asSql);
}
public static StandardComparison parseComparison(String s) {

5
common/src/main/java/me/lucko/luckperms/common/bulkupdate/query/Query.java
View File

@ -25,6 +25,7 @@
package me.lucko.luckperms.common.bulkupdate.query;
import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder;
import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint;
import me.lucko.luckperms.common.node.model.NodeDataContainer;
@ -67,8 +68,8 @@ public class Query {
}
}
public String getAsSql() {
return this.constraint.getAsSql(this.field.getSqlName());
public void appendSql(PreparedStatementBuilder builder) {
this.constraint.appendSql(builder, this.field.getSqlName());
}
public QueryField getField() {

2
common/src/main/java/me/lucko/luckperms/common/commands/misc/BulkUpdateCommand.java
View File

@ -151,7 +151,7 @@ public class BulkUpdateCommand extends SingleCommand {
this.pendingOperations.put(id, bulkUpdate);
Message.BULK_UPDATE_QUEUED.send(sender, bulkUpdate.buildAsSql().replace("{table}", bulkUpdate.getDataType().getName()));
Message.BULK_UPDATE_QUEUED.send(sender, bulkUpdate.buildAsSql().toReadableString().replace("{table}", bulkUpdate.getDataType().getName()));
Message.BULK_UPDATE_CONFIRM.send(sender, label, id);
return CommandResult.SUCCESS;

21
common/src/main/java/me/lucko/luckperms/common/storage/dao/sql/SqlDao.java
View File

@ -35,6 +35,7 @@ import me.lucko.luckperms.api.Node;
import me.lucko.luckperms.common.actionlog.ExtendedLogEntry;
import me.lucko.luckperms.common.actionlog.Log;
import me.lucko.luckperms.common.bulkupdate.BulkUpdate;
import me.lucko.luckperms.common.bulkupdate.PreparedStatementBuilder;
import me.lucko.luckperms.common.bulkupdate.comparisons.Constraint;
import me.lucko.luckperms.common.contexts.ContextSetJsonSerializer;
import me.lucko.luckperms.common.managers.group.GroupManager;
@ -265,20 +266,18 @@ public class SqlDao extends AbstractDao {
@Override
public void applyBulkUpdate(BulkUpdate bulkUpdate) throws SQLException {
String queryString = bulkUpdate.buildAsSql();
try (Connection c = this.provider.getConnection()) {
if (bulkUpdate.getDataType().isIncludingUsers()) {
String table = this.prefix.apply("{prefix}user_permissions");
try (Statement s = c.createStatement()) {
s.execute(queryString.replace("{table}", table));
try (PreparedStatement ps = bulkUpdate.buildAsSql().build(c, q -> q.replace("{table}", table))) {
ps.execute();
}
}
if (bulkUpdate.getDataType().isIncludingGroups()) {
String table = this.prefix.apply("{prefix}group_permissions");
try (Statement s = c.createStatement()) {
s.execute(queryString.replace("{table}", table));
try (PreparedStatement ps = bulkUpdate.buildAsSql().build(c, q -> q.replace("{table}", table))) {
ps.execute();
}
}
}
@ -494,9 +493,12 @@ public class SqlDao extends AbstractDao {
@Override
public List<HeldPermission<UUID>> getUsersWithPermission(Constraint constraint) throws SQLException {
PreparedStatementBuilder builder = new PreparedStatementBuilder().append(USER_PERMISSIONS_SELECT_PERMISSION);
constraint.appendSql(builder, "permission");
List<HeldPermission<UUID>> held = new ArrayList<>();
try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(USER_PERMISSIONS_SELECT_PERMISSION + constraint.getAsSql("permission")))) {
try (PreparedStatement ps = builder.build(c, this.prefix)) {
try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) {
UUID holder = UUID.fromString(rs.getString("uuid"));
@ -737,9 +739,12 @@ public class SqlDao extends AbstractDao {
@Override
public List<HeldPermission<String>> getGroupsWithPermission(Constraint constraint) throws SQLException {
PreparedStatementBuilder builder = new PreparedStatementBuilder().append(GROUP_PERMISSIONS_SELECT_PERMISSION);
constraint.appendSql(builder, "permission");
List<HeldPermission<String>> held = new ArrayList<>();
try (Connection c = this.provider.getConnection()) {
try (PreparedStatement ps = c.prepareStatement(this.prefix.apply(GROUP_PERMISSIONS_SELECT_PERMISSION + constraint.getAsSql("permission")))) {
try (PreparedStatement ps = builder.build(c, this.prefix)) {
try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) {
String holder = rs.getString("name");