Changeset 5740

Timestamp:

2010-09-10 15:03:46 (3 years ago)

Author:

karel

Message:

Added a way to reinitialise the repository_revisions table via JMX

(Note that, under normal conditions, this should not be needed)

fixes #797

Location:

trunk/daisy

Files:

• repository/server/src/main/java/org/outerj/daisy/repository/serverimpl/LocalRepositoryManager.java (modified) (1 diff)
• repository/server/src/main/java/org/outerj/daisy/repository/serverimpl/RepositoryMaintainerImpl.java (modified) (7 diffs)
• repository/server/src/main/java/org/outerj/daisy/repository/serverimpl/RepositoryMaintainerImplMBean.java (modified) (1 diff)
• services/revision-manager/server-impl/src/main/java/org/outerj/daisy/repository/revisions/CommonRevisionManager.java (modified) (2 diffs)

trunk/daisy/repository/server/src/main/java/org/outerj/daisy/repository/serverimpl/LocalRepositoryManager.java

@@ -194 +194 @@
         assureNamespacesRegistered();
         
-        this.repositoryMaintainer = new RepositoryMaintainerImpl(documentStrategy, systemUser, context, mbeanServer);
+        this.repositoryMaintainer = new RepositoryMaintainerImpl(documentStrategy, systemUser, context, dataSource, jdbcHelper, mbeanServer);
 
         pluginRegistry.setPluginUser(PreSaveHook.class, preSaveHookPluginUser);

trunk/daisy/repository/server/src/main/java/org/outerj/daisy/repository/serverimpl/RepositoryMaintainerImpl.java

@@ -16 +16 @@
 package org.outerj.daisy.repository.serverimpl;
 
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.Date;
 import java.util.Locale;
@@ -23 +26 @@
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
+import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
@@ -28 +32 @@
 import org.joda.time.format.DateTimeFormatter;
 import org.joda.time.format.ISODateTimeFormat;
+import org.outerj.daisy.jdbcutil.JdbcHelper;
 import org.outerj.daisy.repository.Document;
 import org.outerj.daisy.repository.VariantKey;
@@ -42 +47 @@
     private CommonRepository commonRepository;
     private AuthenticatedUser systemUser;
-    private ObjectName mbeanName = new ObjectName("Daisy:name=RepositoryMaintainerImpl");
+    private DataSource dataSource;
+    private JdbcHelper jdbcHelper;
+    private ObjectName mbeanName = new ObjectName("Daisy:name=RepositoryMaintainer");
     private MBeanServer mbeanServer;
     
@@ -49 +56 @@
     public RepositoryMaintainerImpl() throws Exception {};
     
-    public RepositoryMaintainerImpl(LocalDocumentStrategy documentStrategy, AuthenticatedUser systemUser, Context context, MBeanServer mbeanServer) throws Exception {
+    public RepositoryMaintainerImpl(LocalDocumentStrategy documentStrategy, AuthenticatedUser systemUser, Context context, DataSource dataSource, JdbcHelper jdbcHelper, MBeanServer mbeanServer) throws Exception {
         this.documentStrategy = documentStrategy;
         this.commonRepository = context.getCommonRepository();
@@ -55 +62 @@
 
         this.executor = Executors.newSingleThreadExecutor();
+        this.dataSource = dataSource;
+        this.jdbcHelper = JdbcHelper.getInstance(dataSource, log);
         this.mbeanServer = mbeanServer;
         mbeanServer.registerMBean(this, mbeanName);
@@ -119 +128 @@
     }
 
+    public void rebuildRevisionTable() {
+        Connection conn = null;
+        PreparedStatement stmt = null;
+        try {
+            conn = dataSource.getConnection();
+            jdbcHelper.startTransaction(conn);
+            
+            stmt = conn.prepareStatement("delete from repository_revisions");
+            stmt.executeUpdate();
+            
+            stmt = conn.prepareStatement("insert into repository_revisions(ns_id, doc_id, revision_date) select ns_id, doc_id, begin_date from live_history");
+            stmt.executeUpdate();
+            
+            stmt = conn.prepareStatement("insert into repository_revisions(ns_id, doc_id, revision_date) select ns_id, doc_id, end_date from live_history where end_date is not null");
+            stmt.executeUpdate();
+            
+            conn.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed to rebuild revision table", e);
+        } finally {
+            jdbcHelper.closeStatement(stmt);
+            jdbcHelper.rollback(conn);
+            jdbcHelper.closeConnection(conn);
+        }
+    }
+
 }

trunk/daisy/repository/server/src/main/java/org/outerj/daisy/repository/serverimpl/RepositoryMaintainerImplMBean.java

@@ -24 +24 @@
     public void reExtractLinks(String query, String beginDate, String endDate);
     
+    public void rebuildRevisionTable();
 }

trunk/daisy/services/revision-manager/server-impl/src/main/java/org/outerj/daisy/repository/revisions/CommonRevisionManager.java

@@ -168 +168 @@
             }
             
+            // take a lock on the document to make sure the copied data are consistent
+            stmt = conn.prepareStatement("select ns_id, doc_id from documents where ns_id = ? and doc_id = ?" + jdbcHelper.getSharedLockClause());
+            
             stmt = conn.prepareStatement("delete from repository_revisions where ns_id = ? and doc_id = ?");
             stmt.setLong(1, docId.getNamespaceId());
@@ -178 +181 @@
             stmt.executeUpdate();
 
-            stmt = conn.prepareStatement("insert into repository_revisions(ns_id, doc_id, revision_date) select ns_id, doc_id, end_date from live_history where ns_id = ? and doc_id = ?");
+            stmt = conn.prepareStatement("insert into repository_revisions(ns_id, doc_id, revision_date) select ns_id, doc_id, end_date from live_history where end_date is not null and ns_id = ? and doc_id = ?");
             stmt.setLong(1, docId.getNamespaceId());
             stmt.setLong(2, docId.getSeqId());