Skip to content

ARTEMIS-1653 Allow database tables to be created externally #1986

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

Closed
franz1981 wants to merge 1 commit into from
Closed

ARTEMIS-1653 Allow database tables to be created externally #1986

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion ...tore/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,18 @@ private void createTableIfNotExists(String tableName, String... sqls) throws SQL
} else {
try (Statement statement = connection.createStatement();
ResultSet cntRs = statement.executeQuery(sqlProvider.getCountJournalRecordsSQL())) {
if (rs.next() && rs.getInt(1) > 0) {
int rows;
if (cntRs.next() && (rows = cntRs.getInt(1)) > 0) {
logger.tracef("Table %s did exist but is not empty. Skipping initialization.", tableName);
if (logger.isDebugEnabled()) {
final long expectedRows = Stream.of(sqls).map(String::toUpperCase).filter(sql -> sql.contains("INSERT INTO")).count();
Copy link
Copy Markdown
Contributor

@clebertsuconic clebertsuconic Apr 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure you meant this INSERT to only happen if debug?

Copy link
Copy Markdown
Contributor Author

@franz1981 franz1981 Apr 4, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, I meant that the check should be performed only with debug log level to help spotting weird behaviours.
It is not the most robust check ever, but it is pretty helpfull for HA (for example).

Copy link
Copy Markdown
Contributor Author

@franz1981 franz1981 Apr 5, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@clebertsuconic Please do not merge it yet...because on DB2 it is creating some problems.
I will close it to avoid being merged accidentally 👍

if (rows < expectedRows) {
logger.debug("Table " + tableName + " was expected to contain " + expectedRows + " rows while it has " + rows + " rows.");
}
}
return;
} else {
assert sqls[0].toUpperCase().contains("CREATE TABLE") : "The first SQL statement must be a CREATE TABLE";
sqls = Arrays.copyOfRange(sqls, 1, sqls.length);
}
}
Expand Down