rhbz980658 add contentLocation to HRawDocument in preparation for con…

…tent migration
zanata · Jul 23, 2013 · 076b807 · 076b807
1 parent f3c20c9
commit 076b807
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/zanata-model/src/main/java/org/zanata/model/HRawDocument.java b/zanata-model/src/main/java/org/zanata/model/HRawDocument.java
@@ -52,6 +52,7 @@ public class HRawDocument extends ModelEntityBase implements Serializable
 
    // TODO none of these should allow null
    private String contentHash;
+   private String contentLocation;
    private Blob content;
    private DocumentType type;
    private String uploadedBy;
@@ -105,6 +106,9 @@ public String toString()
             + ",contentHash=" + contentHash + "]";
    }
 
-   // TODO override equals to use contentHash
+   // TODON'T: override equals to use contentHash would be logically flawed
+   //          same document with different parameters leads to different text flows
+   //          different types could theoretically share the same hash, but would be parsed
+   //          completely differently.
 
 }
diff --git a/zanata-war/src/main/java/org/zanata/file/BlobPersistService.java b/zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
@@ -82,6 +82,11 @@ public void persistRawDocumentContentFromFile(HRawDocument rawDocument, File raw
       LobHelper lobHelper = documentDAO.getLobHelper();
       Blob fileContents = lobHelper.createBlob(tempFileStream, (int) rawFile.length());
       rawDocument.setContent(fileContents);
+
+      // FIXME temporary id assignment during blob migration - needs to be unique but only while
+      //       migration is in progress.
+      String temporaryLocation = "document:" + rawDocument.getDocument().getId().toString();
+      rawDocument.setContentLocation(temporaryLocation);
    }
 
    @Override

diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
@@ -67,6 +67,20 @@
         </sql>
     </changeSet>
 
+    <changeSet author="damason@redhat.com" id="1">
+        <comment>Add contentLocation to HRawDocument</comment>
+        <addColumn tableName="HRawDocument">
+            <column name="contentLocation" type="longtext" />
+        </addColumn>
+    </changeSet>
+
+    <changeSet author="damason@redhat.com" id="2">
+        <comment>Initialise contentLocation with id, can guarantee uniqueness during migration</comment>
+        <sql>
+            update HRawDocument set contentLocation = id
+        </sql>
+        <addNotNullConstraint tableName="HRawDocument" columnName="contentLocation" columnDataType="longtext" />
+    </changeSet>
 
 
 </databaseChangeLog>