Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Using non-blocking optimization to compile function. #34179

Closed
wants to merge 14 commits into from
Closed

Using non-blocking optimization to compile function. #34179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4435275
Merge branch '6.1.x'
sbrannen Nov 8, 2024
b60cc54
Update tests for 6.2
sbrannen Nov 8, 2024
fb2afa6
Revise Javadoc for PropertyAccessor & IndexAccessor regarding ordering
sbrannen Nov 8, 2024
ae62e33
Polish SpEL internals
sbrannen Nov 8, 2024
80b7215
Merge branch '6.1.x'
snicoll Nov 10, 2024
8987ed1
Merge branch 'spring-projects:main' into main
lucky8987 Nov 22, 2024
0bf4234
Merge branch 'spring-projects:main' into main
lucky8987 Nov 25, 2024
aa94593
Merge branch 'spring-projects:main' into main
lucky8987 Dec 5, 2024
33a9295
Merge branch 'spring-projects:main' into main
lucky8987 Dec 16, 2024
cd76835
Merge branch 'spring-projects:main' into main
lucky8987 Dec 30, 2024
3b75ffa
Using non-blocking optimization to compile function.
lucky8987 Dec 30, 2024
822c7d4
Merge branch 'spring-projects:main' into main
lucky8987 Dec 31, 2024
f43420d
Merge branch 'spring-projects:main' into main
lucky8987 Dec 31, 2024
983f19d
Merge remote-tracking branch 'origin/main' into fix#34133
lucky8987 Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;

import javax.sql.DataSource;

Expand Down Expand Up @@ -70,7 +71,7 @@ public abstract class AbstractJdbcCall {
* Has this operation been compiled? Compilation means at least checking
* that a DataSource or JdbcTemplate has been provided.
*/
private volatile boolean compiled;
private final AtomicBoolean compiled = new AtomicBoolean(false);

/** The generated string used for call statement. */
private @Nullable String callString;
Expand Down Expand Up @@ -278,19 +279,18 @@ public void addDeclaredRowMapper(String parameterName, RowMapper<?> rowMapper) {
* @throws org.springframework.dao.InvalidDataAccessApiUsageException if the object hasn't
* been correctly initialized, for example if no DataSource has been provided
*/
public final synchronized void compile() throws InvalidDataAccessApiUsageException {
if (!isCompiled()) {
if (getProcedureName() == null) {
throw new InvalidDataAccessApiUsageException("Procedure or Function name is required");
}
public final void compile() throws InvalidDataAccessApiUsageException {
if (getProcedureName() == null) {
throw new InvalidDataAccessApiUsageException("Procedure or Function name is required");
}
if (this.compiled.compareAndSet(false, true)) {
try {
this.jdbcTemplate.afterPropertiesSet();
}
catch (IllegalArgumentException ex) {
throw new InvalidDataAccessApiUsageException(ex.getMessage());
}
compileInternal();
this.compiled = true;
if (logger.isDebugEnabled()) {
logger.debug("SqlCall for " + (isFunction() ? "function" : "procedure") +
" [" + getProcedureName() + "] compiled");
Expand Down Expand Up @@ -335,7 +335,7 @@ protected void onCompileInternal() {
* @return whether this operation is compiled and ready to use
*/
public boolean isCompiled() {
return this.compiled;
return this.compiled.get();
}

/**
Expand Down
24 changes: 12 additions & 12 deletions spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;

import javax.sql.DataSource;

Expand Down Expand Up @@ -82,7 +83,7 @@ public abstract class AbstractJdbcInsert {
* Has this operation been compiled? Compilation means at least checking
* that a DataSource or JdbcTemplate has been provided.
*/
private volatile boolean compiled;
private final AtomicBoolean compiled = new AtomicBoolean(false);

/** The generated string used for insert statement. */
private String insertString = "";
Expand Down Expand Up @@ -268,23 +269,22 @@ public boolean isQuoteIdentifiers() {
* @throws InvalidDataAccessApiUsageException if the object hasn't been correctly initialized,
* for example if no DataSource has been provided
*/
public final synchronized void compile() throws InvalidDataAccessApiUsageException {
if (!isCompiled()) {
if (getTableName() == null) {
throw new InvalidDataAccessApiUsageException("Table name is required");
}
if (isQuoteIdentifiers() && this.declaredColumns.isEmpty()) {
throw new InvalidDataAccessApiUsageException(
"Explicit column names must be provided when using quoted identifiers");
}
public final void compile() throws InvalidDataAccessApiUsageException {
if (getTableName() == null) {
throw new InvalidDataAccessApiUsageException("Table name is required");
}
if (isQuoteIdentifiers() && this.declaredColumns.isEmpty()) {
throw new InvalidDataAccessApiUsageException(
"Explicit column names must be provided when using quoted identifiers");
}
if (this.compiled.compareAndSet(false, true)) {
try {
this.jdbcTemplate.afterPropertiesSet();
}
catch (IllegalArgumentException ex) {
throw new InvalidDataAccessApiUsageException(ex.getMessage());
}
compileInternal();
this.compiled = true;
if (logger.isDebugEnabled()) {
logger.debug("JdbcInsert for table [" + getTableName() + "] compiled");
}
Expand Down Expand Up @@ -320,7 +320,7 @@ protected void onCompileInternal() {
* @return whether this operation is compiled and ready to use
*/
public boolean isCompiled() {
return this.compiled;
return this.compiled.get();
}

/**
Expand Down
Loading