(WiP) Global image sync

1 files changed, 22 insertions, 2 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
index 55fa02b2..8aafe862 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
@@ -891,15 +891,35 @@ public class DbImage {
 		}
 	}
 
+	public static List<ByteBuffer> getBlockHashes(String imageVersionId) throws SQLException {
+		try (MysqlConnection connection = Database.getConnection()) {
+			return getBlockHashes(connection, imageVersionId);
+		} catch (SQLException e) {
+			LOGGER.error("Query failed in DbImage.getBlockHashes()", e);
+			throw e;
+		}
+	}
+
 	private static List<ByteBuffer> getBlockHashes(MysqlConnection connection, String imageVersionId)
 			throws SQLException {
-		MysqlStatement stmt = connection.prepareStatement("SELECT blocksha1 FROM imageblock"
+		MysqlStatement stmt = connection.prepareStatement("SELECT startbyte, blocksha1 FROM imageblock"
 				+ " WHERE imageversionid = :imageversionid ORDER BY startbyte ASC");
 		stmt.setString("imageversionid", imageVersionId);
 		ResultSet rs = stmt.executeQuery();
 		List<ByteBuffer> list = new ArrayList<>();
+		long expectedOffset = 0;
 		while (rs.next()) {
-			list.add(ByteBuffer.wrap(rs.getBytes("blocksha1")));
+			long currentOffset = rs.getLong("startbyte");
+			if (currentOffset < expectedOffset)
+				continue;
+			while (currentOffset > expectedOffset) {
+				list.add(null);
+				expectedOffset += FileChunk.CHUNK_SIZE;
+			}
+			if (currentOffset == expectedOffset) {
+				list.add(ByteBuffer.wrap(rs.getBytes("blocksha1")));
+				expectedOffset += FileChunk.CHUNK_SIZE;
+			}
 		}
 		return list;
 	}