[buildstream] 01/01: Revert "Merge branch 'danielsilverstone-ct/roaring-bitmaps' into 'master'"

[no...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

not-in-ldap pushed a commit to branch revert-0e471144
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit e3f19542b651d0b9f0bb69f96f202a1ccb958390
Author: Javier Jardón <jj...@gnome.org>
AuthorDate: Wed Feb 6 13:11:36 2019 +0000

    Revert "Merge branch 'danielsilverstone-ct/roaring-bitmaps' into 'master'"
    
    This reverts merge request !1128
---
 buildstream/_loader/loadelement.py | 15 +++------------
 requirements/requirements.in       |  3 ---
 requirements/requirements.txt      |  3 ---
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/buildstream/_loader/loadelement.py b/buildstream/_loader/loadelement.py
index 465d97f..7dd4237 100644
--- a/buildstream/_loader/loadelement.py
+++ b/buildstream/_loader/loadelement.py
@@ -19,9 +19,6 @@
 
 # System imports
 from collections.abc import Mapping
-from itertools import count
-
-from roaringbitmap import RoaringBitmap, ImmutableRoaringBitmap  # pylint: disable=no-name-in-module
 
 # BuildStream toplevel imports
 from .._exceptions import LoadError, LoadErrorReason
@@ -57,8 +54,6 @@ class LoadElement():
             self.element = element
             self.dep_type = dep_type
 
-    _counter = count()
-
     def __init__(self, node, filename, loader):
 
         #
@@ -68,7 +63,6 @@ class LoadElement():
         self.name = filename   # The element name
         self.full_name = None  # The element full name (with associated junction)
         self.deps = None       # The list of Dependency objects
-        self.node_id = next(self._counter)
 
         #
         # Private members
@@ -113,7 +107,7 @@ class LoadElement():
     #
     def depends(self, other):
         self._ensure_depends_cache()
-        return other.node_id in self._dep_cache
+        return self._dep_cache.get(other.full_name) is not None
 
     ###########################################
     #            Private Methods              #
@@ -123,8 +117,7 @@ class LoadElement():
         if self._dep_cache:
             return
 
-        self._dep_cache = RoaringBitmap()
-
+        self._dep_cache = {}
         for dep in self.dependencies:
             elt = dep.element
 
@@ -132,13 +125,11 @@ class LoadElement():
             elt._ensure_depends_cache()
 
             # We depend on this element
-            self._dep_cache.add(elt.node_id)
+            self._dep_cache[elt.full_name] = True
 
             # And we depend on everything this element depends on
             self._dep_cache.update(elt._dep_cache)
 
-        self._dep_cache = ImmutableRoaringBitmap(self._dep_cache)
-
 
 # _extract_depends_from_node():
 #
diff --git a/requirements/requirements.in b/requirements/requirements.in
index 9e55084..18ebb5f 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -13,6 +13,3 @@ psutil
 # See issues #571 and #790.
 ruamel.yaml >= 0.15.41, < 0.15.52
 setuptools
-# (Potentially) short-term need for roaring bitmaps for the
-# loader dependency sorting
-roaringbitmap
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index fa21c48..7bf3205 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -13,9 +13,6 @@ psutil==5.4.8
 # See issues #571 and #790.
 ruamel.yaml==0.15.51
 setuptools==39.0.1
-# (Potentially) short-term need for roaring bitmaps for the
-# loader dependency sorting
-roaringbitmap==0.6
 ## The following requirements were added by pip freeze:
 MarkupSafe==1.1.0
 six==1.12.0