AU: Don't send no-op operations in the delta payload.
This reduces the payload a bit and also speeds up updates on the client by
reducing the I/O.
This CL also removes a somewhat broken check for written blocks. It seems that
the intent of the check was to make sure each block is updated with some data
but since some file data blocks may be used as scratch the check is somewhat
meaningless. The CL removes the check because some blocks may never be written
if they were a part of a no-op operation.
BUG=7543
TEST=unit tests, generated a no-op delta an installed on the device
Change-Id: I31f388651a45d10dd931389a6c80ac18cb10f466
Review URL: http://codereview.chromium.org/3785008
diff --git a/delta_diff_generator_unittest.cc b/delta_diff_generator_unittest.cc
index d897a0a..ef4190f 100644
--- a/delta_diff_generator_unittest.cc
+++ b/delta_diff_generator_unittest.cc
@@ -588,4 +588,29 @@
}
}
+TEST_F(DeltaDiffGeneratorTest, IsNoopOperationTest) {
+ DeltaArchiveManifest_InstallOperation op;
+ op.set_type(DeltaArchiveManifest_InstallOperation_Type_REPLACE_BZ);
+ EXPECT_FALSE(DeltaDiffGenerator::IsNoopOperation(op));
+ op.set_type(DeltaArchiveManifest_InstallOperation_Type_MOVE);
+ EXPECT_TRUE(DeltaDiffGenerator::IsNoopOperation(op));
+ *(op.add_src_extents()) = ExtentForRange(3, 2);
+ *(op.add_dst_extents()) = ExtentForRange(3, 2);
+ EXPECT_TRUE(DeltaDiffGenerator::IsNoopOperation(op));
+ *(op.add_src_extents()) = ExtentForRange(7, 5);
+ *(op.add_dst_extents()) = ExtentForRange(7, 5);
+ EXPECT_TRUE(DeltaDiffGenerator::IsNoopOperation(op));
+ *(op.add_src_extents()) = ExtentForRange(20, 2);
+ *(op.add_dst_extents()) = ExtentForRange(20, 1);
+ *(op.add_dst_extents()) = ExtentForRange(21, 1);
+ EXPECT_TRUE(DeltaDiffGenerator::IsNoopOperation(op));
+ *(op.add_src_extents()) = ExtentForRange(kSparseHole, 2);
+ *(op.add_src_extents()) = ExtentForRange(kSparseHole, 1);
+ *(op.add_dst_extents()) = ExtentForRange(kSparseHole, 3);
+ EXPECT_TRUE(DeltaDiffGenerator::IsNoopOperation(op));
+ *(op.add_src_extents()) = ExtentForRange(24, 1);
+ *(op.add_dst_extents()) = ExtentForRange(25, 1);
+ EXPECT_FALSE(DeltaDiffGenerator::IsNoopOperation(op));
+}
+
} // namespace chromeos_update_engine