June 2011 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r4558 - jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-06-22 02:21:00 -0400 (Wed, 22 Jun 2011) New Revision: 4558 Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java Log: EXOJCR-852: temporary exlude tests - testAutoStopRepositoryBackupIncrRepetion - testAutoStopBackupIncr Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java 2011-06-22 06:09:49 UTC (rev 4557) +++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java 2011-06-22 06:21:00 UTC (rev 4558) @@ -221,7 +221,7 @@ } } - public void testAutoStopBackupIncrRepetion() throws Exception + public void _testAutoStopBackupIncrRepetion() throws Exception { // prepare ManageableRepository repository = helper.createRepository(container, true, null); @@ -499,7 +499,7 @@ checkConent(repositoryService.getRepository(newRE.getName()), newRE.getSystemWorkspaceName()); } - public void testAutoStopRepositoryBackupIncrRepetion() throws Exception + public void _testAutoStopRepositoryBackupIncrRepetion() throws Exception { // prepare ManageableRepository repository = helper.createRepository(container, true, null); @@ -538,7 +538,7 @@ backup.restore(bchLog, newRE, workspaceMapping, true); waitEndOfRestore(newRE.getName()); - Thread.sleep(30000); + Thread.sleep(60000); assertEquals(backup.getCurrentRepositoryBackups().size(), 0); }

12 years, 10 months

1
0
0 / 0

exo-jcr SVN: r4557 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-06-22 02:09:49 -0400 (Wed, 22 Jun 2011) New Revision: 4557 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java Log: EXOJCR-1057: check is node locking first to avoid putting into the cache null item Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java 2011-06-21 13:51:52 UTC (rev 4556) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java 2011-06-22 06:09:49 UTC (rev 4557) @@ -427,7 +427,18 @@ boolean multiValue, int expectedType) throws ValueFormatException, VersionException, LockException, ConstraintViolationException, RepositoryException { + // Check if checked-in (versionable) + if (!parentNode.checkedOut()) + { + throw new VersionException("Node " + parentNode.getPath() + " or its nearest ancestor is checked-in"); + } + // Check is locked + if (!parentNode.checkLocking()) + { + throw new LockException("Node " + parentNode.getPath() + " is locked "); + } + QPath qpath = QPath.makeChildPath(parentNode.getInternalPath(), propertyName); int state; @@ -508,18 +519,6 @@ + locationFactory.createJCRPath(qpath).getAsString(false)); } - // Check if checked-in (versionable) - if (!parentNode.checkedOut()) - { - throw new VersionException("Node " + parentNode.getPath() + " or its nearest ancestor is checked-in"); - } - - // Check is locked - if (!parentNode.checkLocking()) - { - throw new LockException("Node " + parentNode.getPath() + " is locked "); - } - List<ValueData> valueDataList = new ArrayList<ValueData>(); // cast to required type if neccessary

12 years, 10 months

1
0
0 / 0

exo-jcr SVN: r4556 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2011-06-21 09:51:52 -0400 (Tue, 21 Jun 2011) New Revision: 4556 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCUtils.java Log: EXOJCR-1374: giving a name for savePoint. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCUtils.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCUtils.java 2011-06-21 13:38:19 UTC (rev 4555) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCUtils.java 2011-06-21 13:51:52 UTC (rev 4556) @@ -61,7 +61,7 @@ // set autoCommit to true con.setAutoCommit(false); // make a savepoint (snapshot) - savePoint = con.setSavepoint(""); + savePoint = con.setSavepoint(Thread.currentThread().getName()+System.currentTimeMillis()); stmt = con.createStatement(); trs = stmt.executeQuery("SELECT count(*) FROM " + tableName); return trs.next();

12 years, 10 months

1
0
0 / 0

exo-jcr SVN: r4555 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core.

by do-not-reply＠jboss.org

Author: dkuleshov Date: 2011-06-21 09:38:19 -0400 (Tue, 21 Jun 2011) New Revision: 4555 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java Log: EXOJCR-1382: some performance tweak Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-06-21 11:30:34 UTC (rev 4554) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2011-06-21 13:38:19 UTC (rev 4555) @@ -435,7 +435,7 @@ ItemImpl item = null; try { - return item = readItem(getItemData(parent, name, skipCheckInPersistence, itemType), pool); + return item = readItem(getItemData(parent, name, skipCheckInPersistence, itemType), parent, pool, true); } finally {

12 years, 10 months

1
0
0 / 0

exo-jcr SVN: r4554 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-06-21 07:30:34 -0400 (Tue, 21 Jun 2011) New Revision: 4554 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java Log: EXOJCR-1392 Delay in replication of Nodes data in JBoss EPP Cluster. Revert changes about setReadOnly() Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2011-06-21 11:28:42 UTC (rev 4553) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2011-06-21 11:30:34 UTC (rev 4554) @@ -383,6 +383,12 @@ { closeStatements(); + // If READ-ONLY status back it to READ-WRITE (we assume it was original state) + if (readOnly) + { + dbConnection.setReadOnly(true); + } + if (dbConnection.getTransactionIsolation() > Connection.TRANSACTION_READ_COMMITTED) { dbConnection.rollback();

12 years, 10 months

1
0
0 / 0

exo-jcr SVN: r4553 - jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1639.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-06-21 07:28:42 -0400 (Tue, 21 Jun 2011) New Revision: 4553 Modified: jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1639/JCR-1639.patch Log: JCR-1639: patch updated Modified: jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1639/JCR-1639.patch =================================================================== --- jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1639/JCR-1639.patch 2011-06-21 11:19:18 UTC (rev 4552) +++ jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1639/JCR-1639.patch 2011-06-21 11:28:42 UTC (rev 4553) @@ -2,16 +2,22 @@ =================================================================== --- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java (revision 4550) +++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java (working copy) -@@ -373,10 +373,9 @@ +@@ -373,12 +373,17 @@ { closeStatements(); - // If READ-ONLY status back it to READ-WRITE (we assume it was original state) -- if (readOnly) -+ if (dbConnection.getTransactionIsolation() > Connection.TRANSACTION_READ_COMMITTED) ++ // If READ-ONLY status back it to READ-WRITE (we assume it was original state) + if (readOnly) { -- dbConnection.setReadOnly(true); -+ dbConnection.rollback(); + dbConnection.setReadOnly(true); } ++ if (dbConnection.getTransactionIsolation() > Connection.TRANSACTION_READ_COMMITTED) ++ { ++ dbConnection.rollback(); ++ } ++ dbConnection.close(); + } + catch (SQLException e)

12 years, 10 months

1
0
0 / 0

exo-jcr SVN: r4552 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-06-21 07:19:18 -0400 (Tue, 21 Jun 2011) New Revision: 4552 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java Log: EXOJCR-1392 Delay in replication of Nodes data in JBoss EPP Cluster. Do rollback on connection close() in case when IL > READ_COMMITTED Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2011-06-21 11:09:27 UTC (rev 4551) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2011-06-21 11:19:18 UTC (rev 4552) @@ -383,10 +383,9 @@ { closeStatements(); - // If READ-ONLY status back it to READ-WRITE (we assume it was original state) - if (readOnly) + if (dbConnection.getTransactionIsolation() > Connection.TRANSACTION_READ_COMMITTED) { - dbConnection.setReadOnly(true); + dbConnection.rollback(); } dbConnection.close();

12 years, 10 months

1
0
0 / 0

exo-jcr SVN: r4551 - in jcr/branches/1.12.x/patch/1.12.10-GA: JCR-1639 and 1 other directory.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-06-21 07:09:27 -0400 (Tue, 21 Jun 2011) New Revision: 4551 Added: jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1639/ jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1639/JCR-1639.patch Log: JCR-1639: patch proposed Added: jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1639/JCR-1639.patch =================================================================== --- jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1639/JCR-1639.patch (rev 0) +++ jcr/branches/1.12.x/patch/1.12.10-GA/JCR-1639/JCR-1639.patch 2011-06-21 11:09:27 UTC (rev 4551) @@ -0,0 +1,17 @@ +Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java +=================================================================== +--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java (revision 4550) ++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java (working copy) +@@ -373,10 +373,9 @@ + { + closeStatements(); + +- // If READ-ONLY status back it to READ-WRITE (we assume it was original state) +- if (readOnly) ++ if (dbConnection.getTransactionIsolation() > Connection.TRANSACTION_READ_COMMITTED) + { +- dbConnection.setReadOnly(true); ++ dbConnection.rollback(); + } + + dbConnection.close();

12 years, 10 months

1
0
0 / 0

exo-jcr SVN: r4550 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2011-06-20 11:01:13 -0400 (Mon, 20 Jun 2011) New Revision: 4550 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCUtils.java Log: EXOJCR-1374: giving a name for savePoint. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCUtils.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCUtils.java 2011-06-20 14:52:16 UTC (rev 4549) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCUtils.java 2011-06-20 15:01:13 UTC (rev 4550) @@ -61,7 +61,7 @@ // set autoCommit to true con.setAutoCommit(false); // make a savepoint (snapshot) - savePoint = con.setSavepoint(); + savePoint = con.setSavepoint(""); stmt = con.createStatement(); trs = stmt.executeQuery("SELECT count(*) FROM " + tableName); return trs.next();

12 years, 10 months

1
0
0 / 0

exo-jcr SVN: r4549 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2011-06-20 10:52:16 -0400 (Mon, 20 Jun 2011) New Revision: 4549 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCUtils.java Log: EXOJCR-1374: rolling back to stored savePoint in case of failed query, for transaction to operate in a normal way, like no fails existed. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCUtils.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCUtils.java 2011-06-17 13:27:57 UTC (rev 4548) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCUtils.java 2011-06-20 14:52:16 UTC (rev 4549) @@ -24,6 +24,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Savepoint; import java.sql.Statement; /** @@ -51,14 +52,36 @@ { Statement stmt = null; ResultSet trs = null; + Savepoint savePoint = null; + Boolean autoCommit = null; try { + // safe get autoCommit value + autoCommit = con.getAutoCommit(); + // set autoCommit to true + con.setAutoCommit(false); + // make a savepoint (snapshot) + savePoint = con.setSavepoint(); stmt = con.createStatement(); trs = stmt.executeQuery("SELECT count(*) FROM " + tableName); return trs.next(); } catch (SQLException e) { + if (savePoint != null) + { + try + { + // revert state to savePoint after failed query in transaction. This will allow following queries to + // be executed in an ordinary way, like no failed query existed. + // Obligatory operation for PostgreSQL. + con.rollback(savePoint); + } + catch (SQLException e1) + { + LOG.error("Can't rollback to savePoint", e1); + } + } if (LOG.isDebugEnabled()) { LOG.debug("SQLException occurs while checking the table " + tableName, e); @@ -67,6 +90,17 @@ } finally { + if (autoCommit != null) + { + try + { + con.setAutoCommit(autoCommit); + } + catch (SQLException e) + { + LOG.error("Can't set autoCommit value back", e); + } + } if (trs != null) { try

12 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits June 2011