You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/10/08 13:26:21 UTC
[1/2] cayenne git commit: Fix concurrentPkGeneratorIT derby
Repository: cayenne
Updated Branches:
refs/heads/master 33cfd6ccc -> 20b166a26
Fix concurrentPkGeneratorIT derby
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2cc63171
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2cc63171
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2cc63171
Branch: refs/heads/master
Commit: 2cc6317118f43ba4ea201586e1c70947a3f92e45
Parents: 7d9d2c0
Author: Arseni Bulatski <an...@gmail.com>
Authored: Fri Oct 5 11:32:16 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Mon Oct 8 10:39:12 2018 +0300
----------------------------------------------------------------------
.../cayenne/dba/ConcurrentPkGeneratorIT.java | 25 ++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2cc63171/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java b/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
index 3510455..fd0c0c0 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/dba/ConcurrentPkGeneratorIT.java
@@ -26,12 +26,17 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.testdo.qualified.Qualified1;
+import org.apache.cayenne.unit.DerbyUnitDbAdapter;
import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.CayenneProjects;
import org.apache.cayenne.unit.di.server.ServerCase;
import org.apache.cayenne.unit.di.server.UseServerRuntime;
+import org.junit.Before;
import org.junit.Test;
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.SQLException;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -48,13 +53,29 @@ public class ConcurrentPkGeneratorIT extends ServerCase {
@Inject
private UnitDbAdapter unitDbAdapter;
-
+
+ @Before
+ public void prepareDerbyDb() {
+ //use to fix random test failures on derby db
+ if(unitDbAdapter instanceof DerbyUnitDbAdapter) {
+ try(Connection connection = runtime.getDataDomain().getDataNode("qualified").getDataSource().getConnection()){
+ CallableStatement cs =
+ connection.prepareCall("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(?, ?)");
+ cs.setString(1, "derby.language.sequence.preallocator");
+ cs.setString(2, "200");
+ cs.execute();
+ cs.close();
+ } catch (SQLException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ }
+
/*
* Attempts to discover any problems regarding thread locking in the PkGenerator
*/
@Test
public void testConcurrentInserts() {
-
if(!unitDbAdapter.supportsPKGeneratorConcurrency()) {
return;
}
[2/2] cayenne git commit: Merge PR #330
Posted by nt...@apache.org.
Merge PR #330
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/20b166a2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/20b166a2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/20b166a2
Branch: refs/heads/master
Commit: 20b166a260797a527afb6b637bde98cb590f9faa
Parents: 33cfd6c 2cc6317
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Oct 8 15:58:27 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Oct 8 15:58:27 2018 +0300
----------------------------------------------------------------------
.../cayenne/dba/ConcurrentPkGeneratorIT.java | 24 +++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------