Changeset 7478

Timestamp:

Apr 16, 2018, 9:03:52 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

Merge patch release 3.12.2 to the trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/core/net/sf/basedb/core/hibernate/NativeQueryWrapper.java (modified) (2 diffs)
• src/plugins/core/net/sf/basedb/plugins/AnnotationFlatFileImporter.java (modified) (4 diffs)

trunk/src/core/net/sf/basedb/core/hibernate/NativeQueryWrapper.java

@@ -522 +522 @@
     with a shorter list, Hibernate will try to set the non-existing parameters
     which causes an exception. See http://base.thep.lu.se/ticket/2110
+    UPDATE: We also need to check for copied parameter (name) in case the list 
+    contained only a single element. See http://base.thep.lu.se/ticket/2113
   */
   @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -540 +542 @@
       {
         String name = i.next().getName();
-        if (name.startsWith(prefixOfParametersToRemove)) 
+        if (name.startsWith(prefixOfParametersToRemove) || name.equals(parameterName)) 
         {
           i.remove();

trunk/src/plugins/core/net/sf/basedb/plugins/AnnotationFlatFileImporter.java

@@ -643 +643 @@
   private int numRemoved;
   private ProgressReporter progress;
+  // Percentages will be adjusted based on number of annotations
+  private int progressParser = 50; // Progress percentage for file-parsing
+  private int progressDatabase = 48; // Progress percentage for database update
   
   @Override
@@ -761 +764 @@
       ++i;
     }
+    
+    // Recalculate progress parts so that the file parsing is between 10-50% depedning on number of annotations
+    int dbPart = (1 + mappers.size() % 20);
+    progressParser = Math.max(100 / (1+dbPart), 10);
+    progressDatabase = 98 - progressParser;
+    
     batcher = new AnnotationBatcher(dc, itemType);
     batcher.addAnnotationTypes(mappers.values());
@@ -948 +957 @@
         for (Set<NewAnnotations> n : itemCache.values())
         {
-          if (progress != null && current % 100 == 0) 
-          {
-            progress.display(50 + (48 * current) / total, "Saving to database (" + current + " of  " + total + " items done)...");
+          // progressParser should be between 10-50 and is a good interval for progress reporting
+          if (progress != null && current % progressParser == 0) 
+          {
+            progress.display(progressParser + (progressDatabase * current) / total, "Saving to database (" + current + " of  " + total + " items done)...");
           }
           current++;
@@ -996 +1006 @@
   /**
     Overriding default implementation since we want file parsing to 
-    only use 50% and the remaining 50% for storing to the database.
+    only use 'progressParser'% and the remaining 'progressDatabase'% 
+    for storing to the database.
    */
   @Override
   protected int getProgress(FlatFileParser ffp)
   {
-    return super.getProgress(ffp) * 50 / 100;
+    if (ffp.getParsedDataLines() == 0) return 0;
+    return super.getProgress(ffp) * progressParser / 100;
   }
   // -------------------------------------------