Skip to content

Commit

Permalink
Merge pull request #3951 from katzyn/sequence_crash
Browse files Browse the repository at this point in the history 
Fix Column.updateSequenceIfRequired()
  • Loading branch information
@katzyn
katzyn committed Dec 22, 2023
2 parents 5b62710 + f892858 commit 97fd15c
Show file tree
Hide file tree
Showing 3 changed files with 169 additions and 114 deletions.
4 changes: 4 additions & 0 deletions h2/src/docsrc/html/changelog.html
View file
Expand Up @@ -21,6 +21,10 @@ <h1>Change Log</h1>

<h2>Next Version (unreleased)</h2>
<ul>
<li>Issue #3950: JdbcSQLIntegrityConstraintViolationException: Unique index or primary key violation
</li>
<li>PR #3947: Compound index search fix
</li>
<li>Issue #3940: Wrong estimation of a query execution cost with spatial index
</li>
<li>Issue #3931: MVStoreTool -dump throws a NullPointerException or returns binary data
Expand Down
36 changes: 21 additions & 15 deletions h2/src/main/org/h2/table/Column.java
View file
Expand Up @@ -447,25 +447,31 @@ private DbException getDataConversionError(Value value, DbException cause) {
}

private void updateSequenceIfRequired(SessionLocal session, long value) {
if (sequence.getCycle() == Sequence.Cycle.EXHAUSTED) {
return;
}
long current = sequence.getCurrentValue();
long inc = sequence.getIncrement();
if (inc > 0) {
if (value < current) {
/*
* Synchronization is necessary due to possible race with concurrent
* sessions
*/
synchronized (sequence) {
if (sequence.getCycle() == Sequence.Cycle.EXHAUSTED) {
return;
}
} else if (value > current) {
return;
}
try {
sequence.modify(value + inc, null, null, null, null, null, null);
} catch (DbException ex) {
if (ex.getErrorCode() == ErrorCode.SEQUENCE_ATTRIBUTES_INVALID_7) {
long current = sequence.getCurrentValue();
long inc = sequence.getIncrement();
if (inc > 0) {
if (value <= current) {
return;
}
} else if (value >= current) {
return;
}
throw ex;
try {
sequence.modify(value + inc, null, null, null, null, null, null);
} catch (DbException ex) {
if (ex.getErrorCode() == ErrorCode.SEQUENCE_ATTRIBUTES_INVALID_7) {
return;
}
throw ex;
}
}
sequence.flush(session);
}
Expand Down
243 changes: 144 additions & 99 deletions h2/src/test/org/h2/test/db/TestCompatibility.java
View file
Expand Up @@ -15,6 +15,8 @@
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Locale;
import java.util.concurrent.atomic.AtomicReference;

import org.h2.api.ErrorCode;
import org.h2.test.TestBase;
import org.h2.test.TestDb;
Expand Down Expand Up @@ -49,6 +51,7 @@ public void test() throws SQLException {
testPostgreSQL();
testHsqlDb();
testMySQL();
testConcurrentAutoIncrement();
testDB2();
testDerby();
testSybaseAndMSSQLServer();
Expand Down Expand Up @@ -361,106 +364,105 @@ private void testMySQL() throws SQLException {
testMySQLBytesCheck(prep.executeQuery(), string, bytes);
stat.execute("DROP TABLE TEST2");

if (config.memory) {
return;
if (!config.memory) {
// need to reconnect, because meta data tables may be initialized
conn.close();
conn = getConnection("compatibility;MODE=MYSQL;DATABASE_TO_LOWER=TRUE");
stat = conn.createStatement();
testLog(Math.log(10), stat);

DatabaseMetaData meta = conn.getMetaData();
assertTrue(meta.storesLowerCaseIdentifiers());
assertFalse(meta.storesLowerCaseQuotedIdentifiers());
assertFalse(meta.storesMixedCaseIdentifiers());
assertFalse(meta.storesMixedCaseQuotedIdentifiers());
assertFalse(meta.storesUpperCaseIdentifiers());
assertFalse(meta.storesUpperCaseQuotedIdentifiers());

stat = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_UPDATABLE);
assertResult("test", stat, "SHOW TABLES");
rs = stat.executeQuery("SELECT * FROM TEST");
rs.next();
rs.updateString(2, "Hallo");
rs.updateRow();

// we used to have an NullPointerException in the MetaTable.checkIndex()
// method
rs = stat.executeQuery("SELECT * FROM " +
"INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME > 'aaaa'");
rs = stat.executeQuery("SELECT * FROM " +
"INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME < 'aaaa'");

stat.execute("CREATE TABLE TEST_1" +
"(ID INT PRIMARY KEY) ENGINE=InnoDb");
stat.execute("CREATE TABLE TEST_2" +
"(ID INT PRIMARY KEY) ENGINE=MyISAM");
stat.execute("CREATE TABLE TEST_3" +
"(ID INT PRIMARY KEY) ENGINE=InnoDb charset=UTF8");
stat.execute("CREATE TABLE TEST_4" +
"(ID INT PRIMARY KEY) charset=UTF8");
stat.execute("CREATE TABLE TEST_5" +
"(ID INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDb auto_increment=3 default charset=UTF8");
stat.execute("CREATE TABLE TEST_6" +
"(ID INT AUTO_INCREMENT PRIMARY KEY) ENGINE=MyISAM default character set UTF8MB4, auto_increment 3");
stat.execute("CREATE TABLE TEST_7" +
"(ID INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDb auto_increment=3 charset=UTF8 comment 'text'");
stat.execute("CREATE TABLE TEST_8" +
"(ID INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDb auto_increment=3 character set=UTF8");
stat.execute("CREATE TABLE TEST_9" +
"(ID INT, KEY TEST_7_IDX(ID) USING BTREE)");
stat.execute("CREATE TABLE TEST_10" +
"(ID INT, UNIQUE KEY TEST_10_IDX(ID) USING BTREE)");
stat.execute("CREATE TABLE TEST_11(ID INT) COLLATE UTF8");
stat.execute("CREATE TABLE TEST_12(ID INT) DEFAULT COLLATE UTF8");
stat.execute("CREATE TABLE TEST_13(a VARCHAR(10) COLLATE UTF8MB4)");
stat.execute("CREATE TABLE TEST_14(a VARCHAR(10) NULL CHARACTER SET UTF8MB4 COLLATE UTF8MB4_BIN)");
stat.execute("ALTER TABLE TEST_14 CONVERT TO CHARACTER SET UTF8MB4 COLLATE UTF8MB4_UNICODE_CI");
stat.execute("ALTER TABLE TEST_14 MODIFY a VARCHAR(10) NOT NULL CHARACTER SET UTF8MB4 COLLATE UTF8");
assertThrows(ErrorCode.SYNTAX_ERROR_1, stat).execute("CREATE TABLE TEST_99" +
"(ID INT PRIMARY KEY) CHARSET UTF8,");
assertThrows(ErrorCode.COLUMN_NOT_FOUND_1, stat).execute("CREATE TABLE TEST_99" +
"(ID INT PRIMARY KEY) AUTO_INCREMENT 100");
assertThrows(ErrorCode.COLUMN_NOT_FOUND_1, stat).execute("CREATE TABLE TEST_99" +
"(ID INT) AUTO_INCREMENT 100");

// this maps to SET REFERENTIAL_INTEGRITY TRUE/FALSE
stat.execute("SET foreign_key_checks = 0");
stat.execute("SET foreign_key_checks = 1");

// Check if mysql comments are supported, ensure clean connection
conn.close();
conn = getConnection("compatibility;MODE=MYSQL;DATABASE_TO_LOWER=TRUE");
stat = conn.createStatement();
stat.execute("DROP TABLE IF EXISTS TEST_NO_COMMENT");
stat.execute("CREATE table TEST_NO_COMMENT " +
"(ID bigint not null auto_increment, " +
"SOME_STR varchar(255), primary key (ID))");
// now test creating a table with a comment
stat.execute("DROP TABLE IF EXISTS TEST_COMMENT");
stat.execute("create table TEST_COMMENT (ID bigint not null auto_increment, " +
"SOME_STR varchar(255), primary key (ID)) comment='Some comment.'");
// now test creating a table with a comment and engine
// and other typical mysql stuff as generated by hibernate
stat.execute("DROP TABLE IF EXISTS TEST_COMMENT_ENGINE");
stat.execute("create table TEST_COMMENT_ENGINE " +
"(ID bigint not null auto_increment, " +
"ATTACHMENT_ID varchar(255), " +
"SOME_ITEM_ID bigint not null, primary key (ID), " +
"unique (ATTACHMENT_ID, SOME_ITEM_ID)) " +
"comment='Comment Again' ENGINE=InnoDB");

stat.execute("CREATE TABLE TEST2(ID INT) ROW_FORMAT=DYNAMIC");

// check the MySQL index dropping syntax
stat.execute("ALTER TABLE TEST_COMMENT_ENGINE ADD CONSTRAINT CommentUnique UNIQUE (SOME_ITEM_ID)");
stat.execute("ALTER TABLE TEST_COMMENT_ENGINE DROP INDEX CommentUnique");
stat.execute("CREATE INDEX IDX_ATTACHMENT_ID ON TEST_COMMENT_ENGINE (ATTACHMENT_ID)");
stat.execute("DROP INDEX IDX_ATTACHMENT_ID ON TEST_COMMENT_ENGINE");

stat.execute("DROP ALL OBJECTS");
}
// need to reconnect, because meta data tables may be initialized
conn.close();
conn = getConnection("compatibility;MODE=MYSQL;DATABASE_TO_LOWER=TRUE");
stat = conn.createStatement();
testLog(Math.log(10), stat);

DatabaseMetaData meta = conn.getMetaData();
assertTrue(meta.storesLowerCaseIdentifiers());
assertFalse(meta.storesLowerCaseQuotedIdentifiers());
assertFalse(meta.storesMixedCaseIdentifiers());
assertFalse(meta.storesMixedCaseQuotedIdentifiers());
assertFalse(meta.storesUpperCaseIdentifiers());
assertFalse(meta.storesUpperCaseQuotedIdentifiers());

stat = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_UPDATABLE);
assertResult("test", stat, "SHOW TABLES");
rs = stat.executeQuery("SELECT * FROM TEST");
rs.next();
rs.updateString(2, "Hallo");
rs.updateRow();

// we used to have an NullPointerException in the MetaTable.checkIndex()
// method
rs = stat.executeQuery("SELECT * FROM " +
"INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME > 'aaaa'");
rs = stat.executeQuery("SELECT * FROM " +
"INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME < 'aaaa'");

stat.execute("CREATE TABLE TEST_1" +
"(ID INT PRIMARY KEY) ENGINE=InnoDb");
stat.execute("CREATE TABLE TEST_2" +
"(ID INT PRIMARY KEY) ENGINE=MyISAM");
stat.execute("CREATE TABLE TEST_3" +
"(ID INT PRIMARY KEY) ENGINE=InnoDb charset=UTF8");
stat.execute("CREATE TABLE TEST_4" +
"(ID INT PRIMARY KEY) charset=UTF8");
stat.execute("CREATE TABLE TEST_5" +
"(ID INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDb auto_increment=3 default charset=UTF8");
stat.execute("CREATE TABLE TEST_6" +
"(ID INT AUTO_INCREMENT PRIMARY KEY) ENGINE=MyISAM default character set UTF8MB4, auto_increment 3");
stat.execute("CREATE TABLE TEST_7" +
"(ID INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDb auto_increment=3 charset=UTF8 comment 'text'");
stat.execute("CREATE TABLE TEST_8" +
"(ID INT AUTO_INCREMENT PRIMARY KEY) ENGINE=InnoDb auto_increment=3 character set=UTF8");
stat.execute("CREATE TABLE TEST_9" +
"(ID INT, KEY TEST_7_IDX(ID) USING BTREE)");
stat.execute("CREATE TABLE TEST_10" +
"(ID INT, UNIQUE KEY TEST_10_IDX(ID) USING BTREE)");
stat.execute("CREATE TABLE TEST_11(ID INT) COLLATE UTF8");
stat.execute("CREATE TABLE TEST_12(ID INT) DEFAULT COLLATE UTF8");
stat.execute("CREATE TABLE TEST_13(a VARCHAR(10) COLLATE UTF8MB4)");
stat.execute("CREATE TABLE TEST_14(a VARCHAR(10) NULL CHARACTER SET UTF8MB4 COLLATE UTF8MB4_BIN)");
stat.execute("ALTER TABLE TEST_14 CONVERT TO CHARACTER SET UTF8MB4 COLLATE UTF8MB4_UNICODE_CI");
stat.execute("ALTER TABLE TEST_14 MODIFY a VARCHAR(10) NOT NULL CHARACTER SET UTF8MB4 COLLATE UTF8");
assertThrows(ErrorCode.SYNTAX_ERROR_1, stat).execute("CREATE TABLE TEST_99" +
"(ID INT PRIMARY KEY) CHARSET UTF8,");
assertThrows(ErrorCode.COLUMN_NOT_FOUND_1, stat).execute("CREATE TABLE TEST_99" +
"(ID INT PRIMARY KEY) AUTO_INCREMENT 100");
assertThrows(ErrorCode.COLUMN_NOT_FOUND_1, stat).execute("CREATE TABLE TEST_99" +
"(ID INT) AUTO_INCREMENT 100");

// this maps to SET REFERENTIAL_INTEGRITY TRUE/FALSE
stat.execute("SET foreign_key_checks = 0");
stat.execute("SET foreign_key_checks = 1");

// Check if mysql comments are supported, ensure clean connection
conn.close();
conn = getConnection("compatibility;MODE=MYSQL;DATABASE_TO_LOWER=TRUE");
stat = conn.createStatement();
stat.execute("DROP TABLE IF EXISTS TEST_NO_COMMENT");
stat.execute("CREATE table TEST_NO_COMMENT " +
"(ID bigint not null auto_increment, " +
"SOME_STR varchar(255), primary key (ID))");
// now test creating a table with a comment
stat.execute("DROP TABLE IF EXISTS TEST_COMMENT");
stat.execute("create table TEST_COMMENT (ID bigint not null auto_increment, " +
"SOME_STR varchar(255), primary key (ID)) comment='Some comment.'");
// now test creating a table with a comment and engine
// and other typical mysql stuff as generated by hibernate
stat.execute("DROP TABLE IF EXISTS TEST_COMMENT_ENGINE");
stat.execute("create table TEST_COMMENT_ENGINE " +
"(ID bigint not null auto_increment, " +
"ATTACHMENT_ID varchar(255), " +
"SOME_ITEM_ID bigint not null, primary key (ID), " +
"unique (ATTACHMENT_ID, SOME_ITEM_ID)) " +
"comment='Comment Again' ENGINE=InnoDB");

stat.execute("CREATE TABLE TEST2(ID INT) ROW_FORMAT=DYNAMIC");

// check the MySQL index dropping syntax
stat.execute("ALTER TABLE TEST_COMMENT_ENGINE ADD CONSTRAINT CommentUnique UNIQUE (SOME_ITEM_ID)");
stat.execute("ALTER TABLE TEST_COMMENT_ENGINE DROP INDEX CommentUnique");
stat.execute("CREATE INDEX IDX_ATTACHMENT_ID ON TEST_COMMENT_ENGINE (ATTACHMENT_ID)");
stat.execute("DROP INDEX IDX_ATTACHMENT_ID ON TEST_COMMENT_ENGINE");

stat.execute("DROP ALL OBJECTS");

conn.close();
deleteDb("compatibility");
Expand All @@ -478,6 +480,49 @@ private void testMySQLBytesCheck(ResultSet rs, String string, byte[] bytes) thro
assertEquals(bytes, rs.getBytes("C"));
}

private void testConcurrentAutoIncrement() throws SQLException {
int nThreads = 50;
Thread[] threads = new Thread[nThreads];
AtomicReference<SQLException> ref = new AtomicReference<>();
Statement stat = conn.createStatement();
stat.execute("SET MODE MySQL;");
stat.execute("CREATE TABLE TEST(ID INT AUTO_INCREMENT PRIMARY KEY, V INT)");
try {
for (int i = 0; i < nThreads; i++) {
threads[i] = new Thread(() -> {
try (Connection c = getConnection("compatibility;MODE=MYSQL")) {
PreparedStatement ps = c.prepareStatement("INSERT INTO TEST(V) VALUES (?)");
for (int j = 0; j < 1000 && ref.get() == null; j++) {
ps.setInt(1, j);
ps.executeUpdate();
}
} catch (SQLException e) {
ref.compareAndSet(null, e);
}
});
}
for (int i = 0; i < nThreads; i++) {
threads[i].start();
}
} finally {
for (int i = 0; i < nThreads; i++) {
Thread t = threads[i];
if (t != null) {
try {
t.join();
} catch (Exception ignore) {
//
}
}
}
stat.execute("DROP TABLE TEST");
SQLException e = ref.get();
if (e != null) {
throw e;
}
}
}

private void testSybaseAndMSSQLServer() throws SQLException {
Statement stat = conn.createStatement();
stat.execute("SET MODE MSSQLServer");
Expand Down

0 comments on commit 97fd15c

Please sign in to comment.