diff --git a/swh/provenance/graph.py b/swh/provenance/graph.py --- a/swh/provenance/graph.py +++ b/swh/provenance/graph.py @@ -122,10 +122,6 @@ # maxdate is set by the maxdate computation algorithm self.maxdate: Optional[datetime] = None - # known is True if this node is already known in the db; either because - # the current directory actually exists in the database, or because all - # the content of the current directory is known (subdirectories and files) - self.known = self.dbdate is not None self.invalid = False self.path = os.path.join(prefix, self.entry.name) if prefix else self.entry.name self.children: Set[IsochroneNode] = set() @@ -141,7 +137,6 @@ ) self._dbdate = None self.maxdate = None - self.known = False self.invalid = True def add_directory( @@ -156,9 +151,8 @@ def __str__(self) -> str: return ( - f"<{self.entry}: depth={self.depth}, " - f"dbdate={self.dbdate}, maxdate={self.maxdate}, " - f"known={self.known}, invalid={self.invalid}, path={self.path!r}, " + f"<{self.entry}: depth={self.depth}, dbdate={self.dbdate}, " + f"maxdate={self.maxdate}, invalid={self.invalid}, path={self.path!r}, " f"children=[{', '.join(str(child) for child in self.children)}]>" ) @@ -228,7 +222,7 @@ current = stack.pop() # Current directory node is known if it already has an assigned date (ie. it was # already seen as an isochrone frontier). - if current.known: + if current.dbdate is not None: assert current.maxdate is None current.maxdate = current.dbdate else: @@ -257,19 +251,4 @@ for file in current.entry.files ] ) - if current.maxdate <= revision.date: - current.known = ( - # true if all subdirectories are known - all(child.known for child in current.children) - # true if all files are in fdates, i.e. if all files were known - # *before building this isochrone graph node* - # Note: the 'all()' is lazy: will stop iterating as soon as - # possible - and all((file.id in fdates) for file in current.entry.files) - ) - else: - # at least one content is being processed out-of-order, then current - # node should be treated as unknown - current.maxdate = revision.date - current.known = False return root diff --git a/swh/provenance/revision.py b/swh/provenance/revision.py --- a/swh/provenance/revision.py +++ b/swh/provenance/revision.py @@ -110,7 +110,7 @@ while stack: current = stack.pop() if current.dbdate is not None: - assert current.dbdate <= revision.date + assert current.dbdate < revision.date if trackall: # Current directory is an outer isochrone frontier for a previously # processed revision. It should be reused as is. @@ -146,7 +146,7 @@ # revisions to get the proper value. if current.invalid: provenance.directory_set_date_in_isochrone_frontier( - current.entry, current.maxdate + current.entry, revision.date ) # No point moving the frontier here. Either there are no files or they # are being seen for the first time here. Add all blobs to current diff --git a/swh/provenance/tests/data/graphs_cmdbts2_lower_1.yaml b/swh/provenance/tests/data/graphs_cmdbts2_lower_1.yaml --- a/swh/provenance/tests/data/graphs_cmdbts2_lower_1.yaml +++ b/swh/provenance/tests/data/graphs_cmdbts2_lower_1.yaml @@ -75,7 +75,6 @@ id: "c9cabe7f49012e3fdef6ac6b929efb5654f583cf" name: "C" maxdate: 1000000010.0 - known: True path: "A/B/C" # Isochrone graph for R03 - rev: "540bd6155a3c50cc47b2e6f43aeaace67a696d1d" @@ -84,14 +83,12 @@ id: "cea28838ec1fb757e44b724fe1365d64c6a94e24" name: "" maxdate: 1000000010.0 - known: True path: "" children: - entry: id: "48007c961cc734d1f63886d0413a6dc605e3e2ea" name: "A" maxdate: 1000000010.0 - known: True path: "A" children: - entry: @@ -99,7 +96,6 @@ name: "C" dbdate: 1000000010.0 maxdate: 1000000010.0 - known: True path: "A/C" # Isochrone graph for R04 - rev: "17ed10db0612c9b46ba340943cb6b48b25431419" @@ -108,21 +104,18 @@ id: "195601c98c28f04e0d19c218434738006990db72" name: "" maxdate: 1000000020.0 - known: True path: "" children: - entry: id: "d591b308488541aabffd854eae85a9bf83a9d9f5" name: "A" maxdate: 1000000020.0 - known: True path: "A" children: - entry: id: "0e540a8ebea2f5de3e62b92e2139902cf6f46e92" name: "B" maxdate: 1000000020.0 - known: True path: "A/B" children: - entry: @@ -130,7 +123,6 @@ name: "C" dbdate: 1000000010.0 maxdate: 1000000010.0 - known: True path: "A/B/C" # Isochrone graph for R05 - rev: "c8bef45193355db33d64f375b4a4e4f23ac2a4f6" @@ -153,28 +145,24 @@ id: "c86d2f588234098642ef6f33ca662a6a9de865bc" name: "" maxdate: 1000000050.0 - known: True path: "" children: - entry: id: "8a3993f4efa9385ce993775cab5ec4dc2c78d7f6" name: "D" maxdate: 1000000050.0 - known: True path: "D" children: - entry: id: "fa63f03d67d1a15563afe9f8ba97832dfb20f42a" name: "E" maxdate: 1000000050.0 - known: True path: "D/E" children: - entry: id: "12f1bc8ca9678ecc055bc65efd7fb4dd1f13457e" name: "D" maxdate: 1000000050.0 - known: True path: "D/E/D" # Isochrone graph for R07 - rev: "91ed6a03c80b61e0d63d328f7a4325230e7a0237" @@ -183,21 +171,18 @@ id: "641baf6738fa5ebb3c5eb39af45f62ff52f8cc62" name: "" maxdate: 1000000050.0 - known: True path: "" children: - entry: id: "b0ae56ed5ca7daa34fd7a91a28db443ab3c389a0" name: "F" maxdate: 1000000050.0 - known: True path: "F" children: - entry: id: "fa63f03d67d1a15563afe9f8ba97832dfb20f42a" name: "E" maxdate: 1000000050.0 - known: True path: "F/E" children: - entry: @@ -205,7 +190,6 @@ name: "D" dbdate: 1000000050.0 maxdate: 1000000050.0 - known: True path: "F/E/D" # Isochrone graph for R08 - rev: "a97e5c8a626510eefaa637091924cf800b1e8b06" @@ -214,28 +198,24 @@ id: "79e219827e12f40e7146cc6834ee04b617a8073a" name: "" maxdate: 1000000050.0 - known: True path: "" children: - entry: id: "9a7b5762e20b11735b93a635cda451c75bd31270" name: "F" maxdate: 1000000050.0 - known: True path: "F" children: - entry: id: "81b84d8fd8ceebd47f51896d19ce1aa286629225" name: "E" maxdate: 1000000050.0 - known: True path: "F/E" children: - entry: id: "cb211f2d9dfee6c3968837a07960afd6ab09506c" name: "D" maxdate: 1000000050.0 - known: True path: "F/E/D" # Isochrone graph for R09 - rev: "3c5ad6be812b182ee2a01e84884b8ab7d384a4a0" @@ -282,14 +262,12 @@ id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "E" maxdate: 1000000090.0 - known: True path: "F/E" children: - entry: id: "2cb3ae467165716d1d0e7fa85190d753c3b76d78" name: "D" maxdate: 1000000090.0 - known: True path: "F/E/D" # Isochrone graph for R11 - rev: "f4b2d6d273a6f0d9f2b1299c668b7b7ea095a6a2" @@ -310,7 +288,6 @@ id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "E" maxdate: 1000000090.0 - known: True path: "G/E" children: - entry: @@ -318,7 +295,6 @@ name: "D" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/E/D" # Isochrone graph for R12 - rev: "99bd98e1803343ecfabe4b05d0218475c2b1bf74" @@ -339,7 +315,6 @@ id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "H" maxdate: 1000000090.0 - known: True path: "G/H" children: - entry: @@ -347,7 +322,6 @@ name: "D" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/H/D" # Isochrone graph for R13 - rev: "10287882c7ed1b7c96f43da269e6a868b98291ff" @@ -369,13 +343,11 @@ name: "D" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/D" - entry: id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "I" maxdate: 1000000090.0 - known: True path: "G/I" children: - entry: @@ -383,13 +355,11 @@ name: "D" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/I/D" - entry: id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "H" maxdate: 1000000090.0 - known: True path: "G/H" children: - entry: @@ -397,5 +367,4 @@ name: "D" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/H/D" diff --git a/swh/provenance/tests/data/graphs_cmdbts2_lower_2.yaml b/swh/provenance/tests/data/graphs_cmdbts2_lower_2.yaml --- a/swh/provenance/tests/data/graphs_cmdbts2_lower_2.yaml +++ b/swh/provenance/tests/data/graphs_cmdbts2_lower_2.yaml @@ -75,7 +75,6 @@ id: "c9cabe7f49012e3fdef6ac6b929efb5654f583cf" name: "C" maxdate: 1000000010.0 - known: True path: "A/B/C" # Isochrone graph for R03 - rev: "540bd6155a3c50cc47b2e6f43aeaace67a696d1d" @@ -84,14 +83,12 @@ id: "cea28838ec1fb757e44b724fe1365d64c6a94e24" name: "" maxdate: 1000000010.0 - known: True path: "" children: - entry: id: "48007c961cc734d1f63886d0413a6dc605e3e2ea" name: "A" maxdate: 1000000010.0 - known: True path: "A" children: - entry: @@ -99,7 +96,6 @@ name: "C" dbdate: 1000000010.0 maxdate: 1000000010.0 - known: True path: "A/C" # Isochrone graph for R04 - rev: "17ed10db0612c9b46ba340943cb6b48b25431419" @@ -108,21 +104,18 @@ id: "195601c98c28f04e0d19c218434738006990db72" name: "" maxdate: 1000000020.0 - known: True path: "" children: - entry: id: "d591b308488541aabffd854eae85a9bf83a9d9f5" name: "A" maxdate: 1000000020.0 - known: True path: "A" children: - entry: id: "0e540a8ebea2f5de3e62b92e2139902cf6f46e92" name: "B" maxdate: 1000000020.0 - known: True path: "A/B" children: - entry: @@ -130,7 +123,6 @@ name: "C" dbdate: 1000000010.0 maxdate: 1000000010.0 - known: True path: "A/B/C" # Isochrone graph for R05 - rev: "c8bef45193355db33d64f375b4a4e4f23ac2a4f6" @@ -153,28 +145,24 @@ id: "c86d2f588234098642ef6f33ca662a6a9de865bc" name: "" maxdate: 1000000050.0 - known: True path: "" children: - entry: id: "8a3993f4efa9385ce993775cab5ec4dc2c78d7f6" name: "D" maxdate: 1000000050.0 - known: True path: "D" children: - entry: id: "fa63f03d67d1a15563afe9f8ba97832dfb20f42a" name: "E" maxdate: 1000000050.0 - known: True path: "D/E" children: - entry: id: "12f1bc8ca9678ecc055bc65efd7fb4dd1f13457e" name: "D" maxdate: 1000000050.0 - known: True path: "D/E/D" # Isochrone graph for R07 - rev: "91ed6a03c80b61e0d63d328f7a4325230e7a0237" @@ -183,21 +171,18 @@ id: "641baf6738fa5ebb3c5eb39af45f62ff52f8cc62" name: "" maxdate: 1000000050.0 - known: True path: "" children: - entry: id: "b0ae56ed5ca7daa34fd7a91a28db443ab3c389a0" name: "F" maxdate: 1000000050.0 - known: True path: "F" children: - entry: id: "fa63f03d67d1a15563afe9f8ba97832dfb20f42a" name: "E" maxdate: 1000000050.0 - known: True path: "F/E" children: - entry: @@ -205,7 +190,6 @@ name: "D" dbdate: 1000000050.0 maxdate: 1000000050.0 - known: True path: "F/E/D" # Isochrone graph for R08 - rev: "a97e5c8a626510eefaa637091924cf800b1e8b06" @@ -214,28 +198,24 @@ id: "79e219827e12f40e7146cc6834ee04b617a8073a" name: "" maxdate: 1000000050.0 - known: True path: "" children: - entry: id: "9a7b5762e20b11735b93a635cda451c75bd31270" name: "F" maxdate: 1000000050.0 - known: True path: "F" children: - entry: id: "81b84d8fd8ceebd47f51896d19ce1aa286629225" name: "E" maxdate: 1000000050.0 - known: True path: "F/E" children: - entry: id: "cb211f2d9dfee6c3968837a07960afd6ab09506c" name: "D" maxdate: 1000000050.0 - known: True path: "F/E/D" # Isochrone graph for R09 - rev: "3c5ad6be812b182ee2a01e84884b8ab7d384a4a0" @@ -282,14 +262,12 @@ id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "E" maxdate: 1000000090.0 - known: True path: "F/E" children: - entry: id: "2cb3ae467165716d1d0e7fa85190d753c3b76d78" name: "D" maxdate: 1000000090.0 - known: True path: "F/E/D" # Isochrone graph for R11 - rev: "f4b2d6d273a6f0d9f2b1299c668b7b7ea095a6a2" @@ -310,7 +288,6 @@ id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "E" maxdate: 1000000090.0 - known: True path: "G/E" children: - entry: @@ -318,7 +295,6 @@ name: "D" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/E/D" # Isochrone graph for R12 - rev: "99bd98e1803343ecfabe4b05d0218475c2b1bf74" @@ -339,7 +315,6 @@ id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "H" maxdate: 1000000090.0 - known: True path: "G/H" children: - entry: @@ -347,7 +322,6 @@ name: "D" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/H/D" # Isochrone graph for R13 - rev: "10287882c7ed1b7c96f43da269e6a868b98291ff" @@ -369,13 +343,11 @@ name: "D" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/D" - entry: id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "I" maxdate: 1000000090.0 - known: True path: "G/I" children: - entry: @@ -383,13 +355,11 @@ name: "D" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/I/D" - entry: id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "H" maxdate: 1000000090.0 - known: True path: "G/H" children: - entry: @@ -397,5 +367,4 @@ name: "D" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/H/D" diff --git a/swh/provenance/tests/data/graphs_cmdbts2_upper_1.yaml b/swh/provenance/tests/data/graphs_cmdbts2_upper_1.yaml --- a/swh/provenance/tests/data/graphs_cmdbts2_upper_1.yaml +++ b/swh/provenance/tests/data/graphs_cmdbts2_upper_1.yaml @@ -75,7 +75,6 @@ id: "c9cabe7f49012e3fdef6ac6b929efb5654f583cf" name: "C" maxdate: 1000000010.0 - known: True path: "A/B/C" # Isochrone graph for R03 - rev: "540bd6155a3c50cc47b2e6f43aeaace67a696d1d" @@ -84,14 +83,12 @@ id: "cea28838ec1fb757e44b724fe1365d64c6a94e24" name: "" maxdate: 1000000010.0 - known: True path: "" children: - entry: id: "48007c961cc734d1f63886d0413a6dc605e3e2ea" name: "A" maxdate: 1000000010.0 - known: True path: "A" children: - entry: @@ -99,7 +96,6 @@ name: "C" dbdate: 1000000010.0 maxdate: 1000000010.0 - known: True path: "A/C" # Isochrone graph for R04 - rev: "17ed10db0612c9b46ba340943cb6b48b25431419" @@ -108,21 +104,18 @@ id: "195601c98c28f04e0d19c218434738006990db72" name: "" maxdate: 1000000020.0 - known: True path: "" children: - entry: id: "d591b308488541aabffd854eae85a9bf83a9d9f5" name: "A" maxdate: 1000000020.0 - known: True path: "A" children: - entry: id: "0e540a8ebea2f5de3e62b92e2139902cf6f46e92" name: "B" maxdate: 1000000020.0 - known: True path: "A/B" children: - entry: @@ -130,7 +123,6 @@ name: "C" dbdate: 1000000010.0 maxdate: 1000000010.0 - known: True path: "A/B/C" # Isochrone graph for R05 - rev: "c8bef45193355db33d64f375b4a4e4f23ac2a4f6" @@ -153,28 +145,24 @@ id: "c86d2f588234098642ef6f33ca662a6a9de865bc" name: "" maxdate: 1000000050.0 - known: True path: "" children: - entry: id: "8a3993f4efa9385ce993775cab5ec4dc2c78d7f6" name: "D" maxdate: 1000000050.0 - known: True path: "D" children: - entry: id: "fa63f03d67d1a15563afe9f8ba97832dfb20f42a" name: "E" maxdate: 1000000050.0 - known: True path: "D/E" children: - entry: id: "12f1bc8ca9678ecc055bc65efd7fb4dd1f13457e" name: "D" maxdate: 1000000050.0 - known: True path: "D/E/D" # Isochrone graph for R07 - rev: "91ed6a03c80b61e0d63d328f7a4325230e7a0237" @@ -183,28 +171,24 @@ id: "641baf6738fa5ebb3c5eb39af45f62ff52f8cc62" name: "" maxdate: 1000000050.0 - known: True path: "" children: - entry: id: "b0ae56ed5ca7daa34fd7a91a28db443ab3c389a0" name: "F" maxdate: 1000000050.0 - known: True path: "F" children: - entry: id: "fa63f03d67d1a15563afe9f8ba97832dfb20f42a" name: "E" maxdate: 1000000050.0 - known: True path: "F/E" children: - entry: id: "12f1bc8ca9678ecc055bc65efd7fb4dd1f13457e" name: "D" maxdate: 1000000050.0 - known: True path: "F/E/D" # Isochrone graph for R08 - rev: "a97e5c8a626510eefaa637091924cf800b1e8b06" @@ -213,28 +197,24 @@ id: "79e219827e12f40e7146cc6834ee04b617a8073a" name: "" maxdate: 1000000050.0 - known: True path: "" children: - entry: id: "9a7b5762e20b11735b93a635cda451c75bd31270" name: "F" maxdate: 1000000050.0 - known: True path: "F" children: - entry: id: "81b84d8fd8ceebd47f51896d19ce1aa286629225" name: "E" maxdate: 1000000050.0 - known: True path: "F/E" children: - entry: id: "cb211f2d9dfee6c3968837a07960afd6ab09506c" name: "D" maxdate: 1000000050.0 - known: True path: "F/E/D" # Isochrone graph for R09 - rev: "3c5ad6be812b182ee2a01e84884b8ab7d384a4a0" @@ -281,14 +261,12 @@ id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "E" maxdate: 1000000090.0 - known: True path: "F/E" children: - entry: id: "2cb3ae467165716d1d0e7fa85190d753c3b76d78" name: "D" maxdate: 1000000090.0 - known: True path: "F/E/D" # Isochrone graph for R11 - rev: "f4b2d6d273a6f0d9f2b1299c668b7b7ea095a6a2" @@ -310,7 +288,6 @@ name: "E" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/E" # Isochrone graph for R12 - rev: "99bd98e1803343ecfabe4b05d0218475c2b1bf74" @@ -332,7 +309,6 @@ name: "H" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/H" # Isochrone graph for R13 - rev: "10287882c7ed1b7c96f43da269e6a868b98291ff" @@ -353,19 +329,16 @@ id: "2cb3ae467165716d1d0e7fa85190d753c3b76d78" name: "D" maxdate: 1000000090.0 - known: True path: "G/D" - entry: id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "I" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/I" - entry: id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "H" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/H" diff --git a/swh/provenance/tests/data/graphs_cmdbts2_upper_2.yaml b/swh/provenance/tests/data/graphs_cmdbts2_upper_2.yaml --- a/swh/provenance/tests/data/graphs_cmdbts2_upper_2.yaml +++ b/swh/provenance/tests/data/graphs_cmdbts2_upper_2.yaml @@ -75,7 +75,6 @@ id: "c9cabe7f49012e3fdef6ac6b929efb5654f583cf" name: "C" maxdate: 1000000010.0 - known: True path: "A/B/C" # Isochrone graph for R03 - rev: "540bd6155a3c50cc47b2e6f43aeaace67a696d1d" @@ -84,14 +83,12 @@ id: "cea28838ec1fb757e44b724fe1365d64c6a94e24" name: "" maxdate: 1000000010.0 - known: True path: "" children: - entry: id: "48007c961cc734d1f63886d0413a6dc605e3e2ea" name: "A" maxdate: 1000000010.0 - known: True path: "A" children: - entry: @@ -99,7 +96,6 @@ name: "C" dbdate: 1000000010.0 maxdate: 1000000010.0 - known: True path: "A/C" # Isochrone graph for R04 - rev: "17ed10db0612c9b46ba340943cb6b48b25431419" @@ -108,21 +104,18 @@ id: "195601c98c28f04e0d19c218434738006990db72" name: "" maxdate: 1000000020.0 - known: True path: "" children: - entry: id: "d591b308488541aabffd854eae85a9bf83a9d9f5" name: "A" maxdate: 1000000020.0 - known: True path: "A" children: - entry: id: "0e540a8ebea2f5de3e62b92e2139902cf6f46e92" name: "B" maxdate: 1000000020.0 - known: True path: "A/B" children: - entry: @@ -130,7 +123,6 @@ name: "C" dbdate: 1000000010.0 maxdate: 1000000010.0 - known: True path: "A/B/C" # Isochrone graph for R05 - rev: "c8bef45193355db33d64f375b4a4e4f23ac2a4f6" @@ -153,28 +145,24 @@ id: "c86d2f588234098642ef6f33ca662a6a9de865bc" name: "" maxdate: 1000000050.0 - known: True path: "" children: - entry: id: "8a3993f4efa9385ce993775cab5ec4dc2c78d7f6" name: "D" maxdate: 1000000050.0 - known: True path: "D" children: - entry: id: "fa63f03d67d1a15563afe9f8ba97832dfb20f42a" name: "E" maxdate: 1000000050.0 - known: True path: "D/E" children: - entry: id: "12f1bc8ca9678ecc055bc65efd7fb4dd1f13457e" name: "D" maxdate: 1000000050.0 - known: True path: "D/E/D" # Isochrone graph for R07 - rev: "91ed6a03c80b61e0d63d328f7a4325230e7a0237" @@ -183,14 +171,12 @@ id: "641baf6738fa5ebb3c5eb39af45f62ff52f8cc62" name: "" maxdate: 1000000050.0 - known: True path: "" children: - entry: id: "b0ae56ed5ca7daa34fd7a91a28db443ab3c389a0" name: "F" maxdate: 1000000050.0 - known: True path: "F" children: - entry: @@ -198,7 +184,6 @@ name: "E" dbdate: 1000000050.0 maxdate: 1000000050.0 - known: True path: "F/E" # Isochrone graph for R08 - rev: "a97e5c8a626510eefaa637091924cf800b1e8b06" @@ -207,28 +192,24 @@ id: "79e219827e12f40e7146cc6834ee04b617a8073a" name: "" maxdate: 1000000050.0 - known: True path: "" children: - entry: id: "9a7b5762e20b11735b93a635cda451c75bd31270" name: "F" maxdate: 1000000050.0 - known: True path: "F" children: - entry: id: "81b84d8fd8ceebd47f51896d19ce1aa286629225" name: "E" maxdate: 1000000050.0 - known: True path: "F/E" children: - entry: id: "cb211f2d9dfee6c3968837a07960afd6ab09506c" name: "D" maxdate: 1000000050.0 - known: True path: "F/E/D" # Isochrone graph for R09 - rev: "3c5ad6be812b182ee2a01e84884b8ab7d384a4a0" @@ -275,14 +256,12 @@ id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "E" maxdate: 1000000090.0 - known: True path: "F/E" children: - entry: id: "2cb3ae467165716d1d0e7fa85190d753c3b76d78" name: "D" maxdate: 1000000090.0 - known: True path: "F/E/D" # Isochrone graph for R11 - rev: "f4b2d6d273a6f0d9f2b1299c668b7b7ea095a6a2" @@ -304,7 +283,6 @@ name: "E" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/E" # Isochrone graph for R12 - rev: "99bd98e1803343ecfabe4b05d0218475c2b1bf74" @@ -326,7 +304,6 @@ name: "H" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/H" # Isochrone graph for R13 - rev: "10287882c7ed1b7c96f43da269e6a868b98291ff" @@ -347,19 +324,16 @@ id: "2cb3ae467165716d1d0e7fa85190d753c3b76d78" name: "D" maxdate: 1000000090.0 - known: True path: "G/D" - entry: id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "I" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/I" - entry: id: "8b4df27934ce48db6f4bdf326b3bce89d4571252" name: "H" dbdate: 1000000090.0 maxdate: 1000000090.0 - known: True path: "G/H" diff --git a/swh/provenance/tests/data/graphs_out-of-order_lower_1.yaml b/swh/provenance/tests/data/graphs_out-of-order_lower_1.yaml --- a/swh/provenance/tests/data/graphs_out-of-order_lower_1.yaml +++ b/swh/provenance/tests/data/graphs_out-of-order_lower_1.yaml @@ -57,21 +57,18 @@ id: "2afae58027276dad2bdced5a505e8d781a7add5b" name: "" maxdate: 1000000010.0 - known: True path: "" children: - entry: id: "4b28979d88ed209a09c272bcc80f69d9b18339c2" name: "A" maxdate: 1000000010.0 - known: True path: "A" children: - entry: id: "c9cabe7f49012e3fdef6ac6b929efb5654f583cf" name: "C" maxdate: 1000000010.0 - known: True path: "A/C" # Isochrone graph for R03 - rev: "20f4da0f48609d9f7f908ebbcac3b3741a0f25cb" @@ -80,21 +77,18 @@ id: "b3cf11b22c9f93c3c494cf90ab072f394155072d" name: "" maxdate: 1000000010.0 - known: True path: "" children: - entry: id: "baca735bf8b8720131b4bfdb47c51631a9260348" name: "A" maxdate: 1000000010.0 - known: True path: "A" children: - entry: id: "4b28979d88ed209a09c272bcc80f69d9b18339c2" name: "B" maxdate: 1000000010.0 - known: True path: "A/B" children: - entry: @@ -102,7 +96,6 @@ name: "C" dbdate: 1000000010.0 maxdate: 1000000010.0 - known: True path: "A/B/C" # Isochrone graph for R04 - rev: "0d66eadcc15e0d7f6cfd4289329a7749a1309982" @@ -111,14 +104,12 @@ id: "2afae58027276dad2bdced5a505e8d781a7add5b" name: "" maxdate: 1000000010.0 - known: True path: "" children: - entry: id: "4b28979d88ed209a09c272bcc80f69d9b18339c2" name: "A" maxdate: 1000000010.0 - known: True path: "A" children: - entry: @@ -126,7 +117,6 @@ name: "C" dbdate: 1000000010.0 maxdate: 1000000010.0 - known: True path: "A/C" # Isochrone graph for R05 - rev: "1dfac0491892096948d6a02bf12a2fed4bf75743" @@ -134,25 +124,25 @@ entry: id: "b3cf11b22c9f93c3c494cf90ab072f394155072d" name: "" - maxdate: 1000000005.0 + maxdate: 1000000010.0 path: "" children: - entry: id: "baca735bf8b8720131b4bfdb47c51631a9260348" name: "A" - maxdate: 1000000005.0 + maxdate: 1000000010.0 path: "A" children: - entry: id: "4b28979d88ed209a09c272bcc80f69d9b18339c2" name: "B" - maxdate: 1000000005.0 + maxdate: 1000000010.0 path: "A/B" children: - entry: id: "c9cabe7f49012e3fdef6ac6b929efb5654f583cf" name: "C" - maxdate: 1000000005.0 + maxdate: 1000000010.0 invalid: True path: "A/B/C" # Isochrone graph for R06 @@ -181,5 +171,4 @@ name: "C" dbdate: 1000000005.0 maxdate: 1000000005.0 - known: True path: "A/B/C" diff --git a/swh/provenance/tests/test_isochrone_graph.py b/swh/provenance/tests/test_isochrone_graph.py --- a/swh/provenance/tests/test_isochrone_graph.py +++ b/swh/provenance/tests/test_isochrone_graph.py @@ -44,7 +44,6 @@ depth=depth, ) node.maxdate = datetime.fromtimestamp(d["maxdate"], timezone.utc) - node.known = d.get("known", False) node.invalid = d.get("invalid", False) node.path = bytes(d["path"], encoding="utf-8") node.children = set(