[cleanup] Binary files do not have pages

Author: adamretter

src/org/exist/dom/persistent/BinaryDocument.java

@@ -40,8 +40,6 @@
  * @author wolf
  */
 public class BinaryDocument extends DocumentImpl {
-
-    private long pageNr = Page.NO_PAGE;
     private long realSize = 0L;
 
     public BinaryDocument(final BrokerPool pool) {
@@ -84,14 +82,6 @@ public byte getResourceType() {
         return BINARY_FILE;
     }
 
-    public void setPage(final long page) {
-        this.pageNr = page;
-    }
-
-    public long getPage() {
-        return pageNr;
-    }
-
     @Override
     public long getContentLength() {
         return realSize;
@@ -105,7 +95,6 @@ public void setContentLength(final long length) {
     public void write(final VariableByteOutputStream ostream) throws IOException {
         ostream.writeInt(getDocId());
         ostream.writeUTF(getFileURI().toString());
-        ostream.writeLong(pageNr);
 
         getPermissions().write(ostream);
 
@@ -117,7 +106,6 @@ public void write(final VariableByteOutputStream ostream) throws IOException {
     public void read(final VariableByteInput istream) throws IOException {
         setDocId(istream.readInt());
         setFileURI(XmldbURI.create(istream.readUTF()));
-        this.pageNr = istream.readLong();
 
         getPermissions().read(istream);
 

src/org/exist/storage/NativeBroker.java

@@ -1882,12 +1882,7 @@ public Object start() {
             new DOMTransaction(this, domDb, () -> lockManager.acquireBtreeWriteLock(domDb.getLockName())) {
                 @Override
                 public Object start() {
-                    if (doc.getResourceType() == DocumentImpl.BINARY_FILE) {
-                        final long page = ((BinaryDocument) doc).getPage();
-                        if (page > Page.NO_PAGE) {
-                            domDb.removeOverflowValue(transaction, page);
-                        }
-                    } else {
+                    if (doc.getResourceType() == DocumentImpl.XML_FILE) {
                         final NodeHandle node = (NodeHandle) doc.getFirstChild();
                         domDb.removeAll(transaction, node.getInternalAddress());
                     }
@@ -2385,7 +2380,6 @@ public void storeBinaryResource(final Txn transaction, final BinaryDocument blob
     private void storeBinaryResource(final Txn transaction,
             @EnsureLocked(mode=LockMode.WRITE_LOCK) final BinaryDocument blob,
             final ConsumerE<Path, IOException> fWriteData) throws IOException {
-        blob.setPage(Page.NO_PAGE);
         final Path binFile = getCollectionFile(getFsDir(), blob.getURI(), true);
         final boolean exists = Files.exists(binFile);
 

src/org/exist/storage/index/CollectionStore.java

@@ -27,7 +27,7 @@
  */
 public class CollectionStore extends BFile {
 
-    public static final short FILE_FORMAT_VERSION_ID = 13;
+    public static final short FILE_FORMAT_VERSION_ID = 14;
 
     public static final String FILE_NAME = "collections.dbx";
     public static final String  FILE_KEY_IN_CONFIG = "db-connection.collections";