DANS Optimizations of UpdateDatasetVersionCommand

doc/release-notes/10814-Differencing improvement.md

@@ -0,0 +1,3 @@
+### More Scalable Dataset Version Differencing
+
+Differencing between dataset versions, which is done during dataset edit operations and to populate the dataset page versions table has been made signficantly more scalable.

src/main/java/edu/harvard/iq/dataverse/Dataset.java

@@ -353,6 +353,8 @@ public void setVersions(List<DatasetVersion> versions) {
     private DatasetVersion createNewDatasetVersion(Template template, FileMetadata fmVarMet) {
 
         DatasetVersion dsv = new DatasetVersion();
+        DatasetVersionModifiedDate date = new DatasetVersionModifiedDate();
+        dsv.setModifiedDate(date);
         dsv.setVersionState(DatasetVersion.VersionState.DRAFT);
         dsv.setFileMetadatas(new ArrayList<>());
         DatasetVersion latestVersion;

src/main/java/edu/harvard/iq/dataverse/DatasetPage.java

@@ -101,6 +101,7 @@
 import jakarta.faces.view.ViewScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
+import jakarta.persistence.OptimisticLockException;
 
 import org.apache.commons.lang3.StringUtils;
 import org.primefaces.event.FileUploadEvent;
@@ -2888,6 +2889,9 @@ private String releaseDataset(boolean minor) {
                     // the lock info system.
                     JsfHelper.addErrorMessage(ex.getLocalizedMessage());
                 }
+                if(ex.getCause()!=null && ex.getCause() instanceof OptimisticLockException) {
+                    JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.parallelPublishError"));
+                }
                 logger.severe(ex.getMessage());
             }
 
@@ -4002,6 +4006,10 @@ public String save() {
             Throwable cause = ex;
             while (cause.getCause()!= null) {
                 cause = cause.getCause();
+                if (cause != null && cause instanceof OptimisticLockException) {
+                    JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.parallelUpdateError"));
+                    return null;
+                }
                 error.append(cause).append(" ");
                 error.append(cause.getMessage()).append(" ");
             }
@@ -4011,6 +4019,15 @@ public String save() {
         } catch (CommandException ex) {
             //FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Dataset Save Failed", " - " + ex.toString()));
             logger.log(Level.SEVERE, "CommandException, when attempting to update the dataset: " + ex.getMessage(), ex);
+            Throwable cause = ex;
+            while (cause.getCause()!= null) {
+                cause = cause.getCause();
+                logger.info("Cause is: " + cause.getClass().getName() + ", Message: " + cause.getMessage());
+                if (cause != null && cause instanceof OptimisticLockException) {
+                    JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.parallelUpdateError"));
+                    return null;
+                }
+            }
             populateDatasetUpdateFailureMessage();
             return returnToDraftVersion();
         }

src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java

@@ -83,6 +83,12 @@
 @ValidateVersionNote(versionNote = "versionNote", versionState = "versionState")
 public class DatasetVersion implements Serializable {
 
+    public DatasetVersion() {
+        super();
+        this.modifiedDate = new DatasetVersionModifiedDate();
+
+    }
+
     private static final Logger logger = Logger.getLogger(DatasetVersion.class.getCanonicalName());
     private static final Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
 
@@ -127,8 +133,17 @@ public enum VersionState {
 
     private String UNF;
 
-    @Version
-    private Long version;
+
+    @OneToOne(cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
+    private DatasetVersionModifiedDate modifiedDate;
+
+    public void setModifiedDate(DatasetVersionModifiedDate modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
+
+    public DatasetVersionModifiedDate getModifiedDate() {
+        return modifiedDate;
+    }
 
     private Long versionNumber;
     private Long minorVersionNumber;
@@ -163,10 +178,6 @@ public enum VersionState {
     @Column( nullable=false )
     private Date createTime;
 
-    @Temporal(value = TemporalType.TIMESTAMP)
-    @Column( nullable=false )
-    private Date lastUpdateTime;
-
     @Temporal(value = TemporalType.TIMESTAMP)
     private Date releaseTime;
 
@@ -231,17 +242,6 @@ public void setUNF(String UNF) {
         this.UNF = UNF;
     }
 
-    /**
-     * This is JPA's optimistic locking mechanism, and has no semantic meaning in the DV object model.
-     * @return the object db version
-     */
-    public Long getVersion() {
-        return this.version;
-    }
-
-    public void setVersion(Long version) {
-    }
-
     public String getDataverseSiteUrl() {
         return dataverseSiteUrl;
     }
@@ -429,25 +429,25 @@ public void setCreateTime(Date createTime) {
     }
 
     public Date getLastUpdateTime() {
-        return lastUpdateTime;
+        return modifiedDate.getLastUpdateTime();
     }
 
     public void setLastUpdateTime(Date lastUpdateTime) {
         if (createTime == null) {
             createTime = lastUpdateTime;
         }
-        this.lastUpdateTime = lastUpdateTime;
+        modifiedDate.setLastUpdateTime(lastUpdateTime);
     }
 
     public String getVersionDate() {
-        if (this.lastUpdateTime == null){
+        if (modifiedDate.getLastUpdateTime() == null){
             return null; 
         }
-        return DateUtil.formatDate(lastUpdateTime);
+        return DateUtil.formatDate(modifiedDate.getLastUpdateTime());
     }
 
     public String getVersionYear() {
-        return new SimpleDateFormat("yyyy").format(lastUpdateTime);
+        return new SimpleDateFormat("yyyy").format(modifiedDate.getLastUpdateTime());
     }
 
     public Date getReleaseTime() {
@@ -2122,7 +2122,7 @@ public String getJsonLd() {
     }
 
     public String getLocaleLastUpdateTime() {
-        return DateUtil.formatDate(new Timestamp(lastUpdateTime.getTime()));
+        return DateUtil.formatDate(new Timestamp(modifiedDate.getLastUpdateTime().getTime()));
     }
 
     public String getExternalStatusLabel() {