From 9f0762b90cc1d85900064c24fad8f7d5a8b73afe Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>

Date: Wed, 9 Mar 2022 15:23:29 +0100

Subject: [PATCH 1/5] Revert "Add xml_parse_main_metadata_together to python

 parser examples"

This reverts commit 0633e31e491179f0153ef8267874812b4691957b.

---

 examples/python/repodata_parsing.py | 46 -----------------------------

 1 file changed, 46 deletions(-)

diff --git a/examples/python/repodata_parsing.py b/examples/python/repodata_parsing.py

index 4519518..ea517a1 100755

--- a/examples/python/repodata_parsing.py

+++ b/examples/python/repodata_parsing.py

@@ -211,48 +211,6 @@ def second_method():

     for pkg in packages.values():

         print_package_info(pkg)

-def third_method():

-    """Parsing main metadata types (primary, filelists, other) at the same time.

-    This approach significantly reduces memory footprint because we don't need

-    to keep all the packages in memory, user can handle them one by one.

-

-    The API reflects xml_parse_primary/filelists/other except that it handles

-    all of them at the same time.

-

-    """

-    def warningcb(warning_type, message):

-        print("PARSER WARNING: %s" % message)

-        return True

-

-    repomd = cr.Repomd()

-    cr.xml_parse_repomd(os.path.join(REPO_PATH, "repodata/repomd.xml"), repomd, warningcb)

-

-    primary_xml_path   = None

-    filelists_xml_path = None

-    other_xml_path     = None

-    for record in repomd.records:

-        if record.type == "primary":

-            primary_xml_path = os.path.join(REPO_PATH, record.location_href)

-        elif record.type == "filelists":

-            filelists_xml_path = os.path.join(REPO_PATH, record.location_href)

-        elif record.type == "other":

-            other_xml_path = os.path.join(REPO_PATH, record.location_href)

-

-    #

-    # Main XML metadata parsing (primary, filelists, other)

-    #

-

-    def pkgcb(pkg):

-        # Called when whole package entry from all 3 metadata xml files is parsed

-        print_package_info(pkg)

-

-    cr.xml_parse_main_metadata_together(primary_xml_path,

-                                        filelists_xml_path,

-                                        other_xml_path,

-                                        None,

-                                        pkgcb,

-                                        warningcb,

-                                        False)

 if __name__ == "__main__":

     print('"All in one shot" method:')

@@ -263,7 +221,3 @@ if __name__ == "__main__":

     print("Callback based method:")

     second_method()

-    print()

-

-    print("Streaming callback based method:")

-    third_method()

-- 

2.35.1

From 01493aea9bc53e46a0e1020656e60ecb6c543bca Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>

Date: Wed, 9 Mar 2022 15:23:40 +0100

Subject: [PATCH 2/5] Revert "Add python tests for parsing metadata together"

This reverts commit 0c050128f7e24222011cdfcc67ba58da744affa9.

---

 tests/python/tests/test_xml_parser.py | 206 --------------------------

 1 file changed, 206 deletions(-)

diff --git a/tests/python/tests/test_xml_parser.py b/tests/python/tests/test_xml_parser.py

index ed13cac..ddc089f 100644

--- a/tests/python/tests/test_xml_parser.py

+++ b/tests/python/tests/test_xml_parser.py

@@ -950,209 +950,3 @@ class TestCaseXmlParserRepomd(unittest.TestCase):

         self.assertEqual(repomd.content_tags, [])

         self.assertEqual(len(repomd.records), 3)

-class TestCaseXmlParserMainMetadataTogether(unittest.TestCase):

-    def test_xml_parser_main_metadata_together_repo01(self):

-        userdata = {

-                "pkgs": [],

-                "pkgcb_calls": 0,

-                "warnings": []

-            }

-

-        def newpkgcb(pkgId, name, arch):

-            pkg = cr.Package()

-            userdata["pkgs"].append(pkg)

-            return pkg

-

-        def pkgcb(pkg):

-            userdata["pkgcb_calls"] += 1

-

-        def warningcb(warn_type, msg):

-            userdata["warnings"].append((warn_type, msg))

-

-        cr.xml_parse_main_metadata_together(primary=REPO_01_PRIXML, filelists=REPO_01_FILXML, other=REPO_01_OTHXML,

-                                            newpkgcb=newpkgcb, pkgcb=pkgcb, warningcb=warningcb)

-

-        self.assertEqual([pkg.name for pkg in userdata["pkgs"]], ['super_kernel'])

-        self.assertEqual(userdata["pkgcb_calls"], 1)

-        self.assertEqual(userdata["warnings"], [])

-

-        pkg = userdata["pkgs"][0]

-        self.assertEqual(pkg.pkgId, "152824bff2aa6d54f429d43e87a3ff3a0286505c6d93ec87692b5e3a9e3b97bf")

-        self.assertEqual(pkg.name, "super_kernel")

-        self.assertEqual(pkg.arch, "x86_64")

-        self.assertEqual(pkg.version, "6.0.1")

-        self.assertEqual(pkg.epoch, "0")

-        self.assertEqual(pkg.release, "2")

-        self.assertEqual(pkg.summary, "Test package")

-        self.assertEqual(pkg.description, "This package has provides, requires, obsoletes, conflicts options.")

-        self.assertEqual(pkg.url, "http://so_super_kernel.com/it_is_awesome/yep_it_really_is")

-        self.assertEqual(pkg.time_file, 1334667003)

-        self.assertEqual(pkg.time_build, 1334667003)

-        self.assertEqual(pkg.rpm_license, "LGPLv2")

-        self.assertEqual(pkg.rpm_vendor, None)

-        self.assertEqual(pkg.rpm_group, "Applications/System")

-        self.assertEqual(pkg.rpm_buildhost, "localhost.localdomain")

-        self.assertEqual(pkg.rpm_sourcerpm, "super_kernel-6.0.1-2.src.rpm")

-        self.assertEqual(pkg.rpm_header_start, 280)

-        self.assertEqual(pkg.rpm_header_end, 2637)

-        self.assertEqual(pkg.rpm_packager, None)

-        self.assertEqual(pkg.size_package, 2845)

-        self.assertEqual(pkg.size_installed, 0)

-        self.assertEqual(pkg.size_archive, 404)

-        self.assertEqual(pkg.location_href, "super_kernel-6.0.1-2.x86_64.rpm")

-        self.assertEqual(pkg.location_base, None)

-        self.assertEqual(pkg.checksum_type, "sha256")

-        self.assertEqual(pkg.requires,

-                [('bzip2', 'GE', '0', '1.0.0', None, True),

-                 ('expat', None, None, None, None, True),

-                 ('glib', 'GE', '0', '2.26.0', None, False),

-                 ('zlib', None, None, None, None, False)])

-        self.assertEqual(pkg.provides,

-                [('not_so_super_kernel', 'LT', '0', '5.8.0', None, False),

-                 ('super_kernel', 'EQ', '0', '6.0.0', None, False),

-                 ('super_kernel', 'EQ', '0', '6.0.1', '2', False),

-                 ('super_kernel(x86-64)', 'EQ', '0', '6.0.1', '2', False)])

-        self.assertEqual(pkg.conflicts,

-                [('kernel', None, None, None, None, False),

-                 ('super_kernel', 'EQ', '0', '5.0.0', None, False),

-                 ('super_kernel', 'LT', '0', '4.0.0', None, False)])

-        self.assertEqual(pkg.obsoletes,

-                [('kernel', None, None, None, None, False),

-                 ('super_kernel', 'EQ', '0', '5.9.0', None, False)])

-        self.assertEqual(pkg.files,

-                [(None, '/usr/bin/', 'super_kernel'),

-                 (None, '/usr/share/man/', 'super_kernel.8.gz')])

-        self.assertEqual(pkg.changelogs,

-                [('Tomas Mlcoch <tmlcoch@redhat.com> - 6.0.1-1',

-                   1334664000,

-                  '- First release'),

-                 ('Tomas Mlcoch <tmlcoch@redhat.com> - 6.0.1-2',

-                   1334664001,

-                   '- Second release')])

-

-    def test_xml_parser_main_metadata_together_repo02(self):

-

-        userdata = {

-                "pkgs": [],

-                "pkgcb_calls": 0,

-                "warnings": []

-            }

-

-        def newpkgcb(pkgId, name, arch):

-            pkg = cr.Package()

-            userdata["pkgs"].append(pkg)

-            return pkg

-

-        def pkgcb(pkg):

-            userdata["pkgcb_calls"] += 1

-

-        def warningcb(warn_type, msg):

-            userdata["warnings"].append((warn_type, msg))

-

-        cr.xml_parse_main_metadata_together(REPO_02_PRIXML, REPO_02_FILXML, REPO_02_OTHXML, newpkgcb, pkgcb, warningcb,

-                                            allow_out_of_order=True)

-

-        self.assertEqual([pkg.name for pkg in userdata["pkgs"]],

-            ['fake_bash', 'super_kernel'])

-        self.assertEqual(userdata["pkgcb_calls"], 2)

-        self.assertEqual(userdata["warnings"], [])

-

-    def test_xml_parser_main_metadata_together_repo02_only_pkgcb(self):

-

-        pkgs = []

-

-        def pkgcb(pkg):

-            pkgs.append(pkg)

-

-        cr.xml_parse_main_metadata_together(REPO_02_PRIXML, REPO_02_FILXML, REPO_02_OTHXML,

-                                            None, pkgcb, None)

-

-        self.assertEqual([pkg.name for pkg in pkgs],

-            ['fake_bash', 'super_kernel'])

-

-    def test_xml_parser_main_metadata_together_repo02_no_cbs(self):

-        self.assertRaises(ValueError,

-                          cr.xml_parse_main_metadata_together,

-                          REPO_02_PRIXML, REPO_02_FILXML, REPO_02_OTHXML,

-                          None, None, None)

-

-    def test_xml_parser_main_metadata_together_warnings(self):

-        userdata = {

-                "pkgs": [],

-                "warnings": []

-            }

-

-        def newpkgcb(pkgId, name, arch):

-            pkg = cr.Package()

-            userdata["pkgs"].append(pkg)

-            return pkg

-

-        def warningcb(warn_type, msg):

-            userdata["warnings"].append((warn_type, msg))

-

-        cr.xml_parse_main_metadata_together(PRIMARY_MULTI_WARN_00_PATH,

-                                            FILELISTS_MULTI_WARN_00_PATH,

-                                            OTHER_MULTI_WARN_00_PATH,

-                                            newpkgcb, None, warningcb)

-

-        self.assertEqual([pkg.name for pkg in userdata["pkgs"]],

-            ['fake_bash', 'super_kernel'])

-        self.assertEqual(userdata["warnings"],

-            [(0, 'Unknown element "fooelement"'),

-             (1, 'Missing attribute "type" of a package element'),

-             (0, 'Unknown element "foo"'),

-             (3, 'Conversion of "foobar" to integer failed'),

-             (0, 'Unknown element "bar"'),

-             (1, 'Missing attribute "arch" of a package element'),

-             (2, 'Unknown file type "xxx"'),

-             (0, 'Unknown element "bar"'),

-             (1, 'Missing attribute "name" of a package element'),

-             (0, 'Unknown element "bar"'),

-             (3, 'Conversion of "xxx" to integer failed')])

-

-

-    def test_xml_parser_main_metadata_together_error(self):

-        userdata = { "pkgs": [] }

-

-        def newpkgcb(pkgId, name, arch):

-            pkg = cr.Package()

-            userdata["pkgs"].append(pkg)

-            return pkg

-

-        self.assertRaises(cr.CreaterepoCError, cr.xml_parse_main_metadata_together,

-                          PRIMARY_ERROR_00_PATH, FILELISTS_ERROR_00_PATH,

-                          OTHER_ERROR_00_PATH, newpkgcb, None, None)

-

-        # unlike parsing just primary, filelists or other separately when parsing together primary is parsed first fully

-        # before newpkgcb is called so the error is detected before any user package is created

-        self.assertEqual(len(userdata["pkgs"]), 0)

-

-    def test_xml_parser_main_metadata_together_newpkgcb_abort(self):

-        def newpkgcb(pkgId, name, arch):

-            raise Error("Foo error")

-        self.assertRaises(cr.CreaterepoCError,

-                          cr.xml_parse_main_metadata_together,

-                          REPO_02_PRIXML, REPO_02_FILXML, REPO_02_OTHXML,

-                          newpkgcb, None, None)

-

-    def test_xml_parser_main_metadata_together_pkgcb_abort(self):

-       def newpkgcb(pkgId, name, arch):

-           return cr.Package()

-       def pkgcb(pkg):

-           raise Error("Foo error")

-       self.assertRaises(cr.CreaterepoCError,

-                         cr.xml_parse_main_metadata_together,

-                         REPO_02_PRIXML, REPO_02_FILXML, REPO_02_OTHXML,

-                         newpkgcb, pkgcb, None)

-

-    def test_xml_parser_main_metadata_together_warningcb_abort(self):

-        def newpkgcb(pkgId, name, arch):

-            return cr.Package()

-        def warningcb(type, msg):

-            raise Error("Foo error")

-        self.assertRaises(cr.CreaterepoCError,

-                          cr.xml_parse_main_metadata_together,

-                          PRIMARY_MULTI_WARN_00_PATH,

-                          FILELISTS_MULTI_WARN_00_PATH,

-                          OTHER_MULTI_WARN_00_PATH,

-                          newpkgcb, None, warningcb)

-- 

2.35.1

From 9210f5d725a71f130bf5fb880f386c2e8e5f66fa Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>

Date: Wed, 9 Mar 2022 15:23:47 +0100

Subject: [PATCH 3/5] Revert "Wrap c api to python for parsing metadata

 together"

This reverts commit 670006b9f37d8298fe2ec1d6cfc5cdf175a3128b.

---

 src/python/createrepo_cmodule.c |   2 -

 src/python/xml_parser-py.c      | 156 +++++++-------------------------

 src/python/xml_parser-py.h      |   8 --

 3 files changed, 32 insertions(+), 134 deletions(-)

diff --git a/src/python/createrepo_cmodule.c b/src/python/createrepo_cmodule.c

index c0b9200..6937246 100644

--- a/src/python/createrepo_cmodule.c

+++ b/src/python/createrepo_cmodule.c

@@ -79,8 +79,6 @@ static struct PyMethodDef createrepo_c_methods[] = {

         METH_VARARGS, xml_parse_repomd__doc__},

     {"xml_parse_updateinfo",    (PyCFunction)py_xml_parse_updateinfo,

         METH_VARARGS, xml_parse_updateinfo__doc__},

-    {"xml_parse_main_metadata_together",(PyCFunctionWithKeywords)py_xml_parse_main_metadata_together,

-        METH_VARARGS | METH_KEYWORDS, xml_parse_main_metadata_together__doc__},

     {"checksum_name_str",       (PyCFunction)py_checksum_name_str,

         METH_VARARGS, checksum_name_str__doc__},

     {"checksum_type",           (PyCFunction)py_checksum_type,

diff --git a/src/python/xml_parser-py.c b/src/python/xml_parser-py.c

index a1f92f8..0879128 100644

--- a/src/python/xml_parser-py.c

+++ b/src/python/xml_parser-py.c

@@ -34,7 +34,7 @@ typedef struct {

     PyObject *py_newpkgcb;

     PyObject *py_pkgcb;

     PyObject *py_warningcb;

-    PyObject *py_pkgs;       /*!< Current processed package */

+    PyObject *py_pkg;       /*!< Current processed package */

 } CbData;

 static int

@@ -48,6 +48,12 @@ c_newpkgcb(cr_Package **pkg,

     PyObject *arglist, *result;

     CbData *data = cbdata;

+    if (data->py_pkg) {

+        // Decref ref count on previous processed package

+        Py_DECREF(data->py_pkg);

+        data->py_pkg = NULL;

+    }

+

     arglist = Py_BuildValue("(sss)", pkgId, name, arch);

     result = PyObject_CallObject(data->py_newpkgcb, arglist);

     Py_DECREF(arglist);

@@ -67,18 +73,13 @@ c_newpkgcb(cr_Package **pkg,

     if (result == Py_None) {

         *pkg = NULL;

+        data->py_pkg = NULL;

+        Py_DECREF(result);

     } else {

         *pkg = Package_FromPyObject(result);

-        if (data->py_pkgcb != Py_None) {

-            // Store reference to the python pkg (result) only if we will need it later

-            PyObject *keyFromPtr = PyLong_FromVoidPtr(*pkg);

-            PyDict_SetItem(data->py_pkgs, keyFromPtr, result);

-            Py_DECREF(keyFromPtr);

-        }

+        data->py_pkg = result; // Store reference to current package

     }

-    Py_DECREF(result);

-

     return CR_CB_RET_OK;

 }

@@ -90,23 +91,16 @@ c_pkgcb(cr_Package *pkg,

     PyObject *arglist, *result, *py_pkg;

     CbData *data = cbdata;

-    PyObject *keyFromPtr = PyLong_FromVoidPtr(pkg);

-    py_pkg = PyDict_GetItem(data->py_pkgs, keyFromPtr);

-    if (py_pkg) {

-        arglist = Py_BuildValue("(O)", py_pkg);

-        result = PyObject_CallObject(data->py_pkgcb, arglist);

-        PyDict_DelItem(data->py_pkgs, keyFromPtr);

-    } else {

-        // The package was not provided by user in c_newpkgcb,

-        // create new python package object

-        PyObject *new_py_pkg = Object_FromPackage(pkg, 1);

-        arglist = Py_BuildValue("(O)", new_py_pkg);

-        result = PyObject_CallObject(data->py_pkgcb, arglist);

-        Py_DECREF(new_py_pkg);

-    }

+    if (data->py_pkg)

+        py_pkg = data->py_pkg;

+    else

+        py_pkg = Object_FromPackage(pkg, 1);

+    arglist = Py_BuildValue("(O)", py_pkg);

+    result = PyObject_CallObject(data->py_pkgcb, arglist);

     Py_DECREF(arglist);

-    Py_DECREF(keyFromPtr);

+    Py_DECREF(py_pkg);

+    data->py_pkg = NULL;

     if (result == NULL) {

         // Exception raised

@@ -197,7 +191,7 @@ py_xml_parse_primary(G_GNUC_UNUSED PyObject *self, PyObject *args)

     cbdata.py_newpkgcb  = py_newpkgcb;

     cbdata.py_pkgcb     = py_pkgcb;

     cbdata.py_warningcb = py_warningcb;

-    cbdata.py_pkgs      = PyDict_New();

+    cbdata.py_pkg       = NULL;

     cr_xml_parse_primary(filename,

                          ptr_c_newpkgcb,

@@ -212,8 +206,7 @@ py_xml_parse_primary(G_GNUC_UNUSED PyObject *self, PyObject *args)

     Py_XDECREF(py_newpkgcb);

     Py_XDECREF(py_pkgcb);

     Py_XDECREF(py_warningcb);

-

-    Py_XDECREF(cbdata.py_pkgs);

+    Py_XDECREF(cbdata.py_pkg);

     if (tmp_err) {

         nice_exception(&tmp_err, NULL);

@@ -279,7 +272,7 @@ py_xml_parse_primary_snippet(G_GNUC_UNUSED PyObject *self, PyObject *args)

     cbdata.py_newpkgcb  = py_newpkgcb;

     cbdata.py_pkgcb     = py_pkgcb;

     cbdata.py_warningcb = py_warningcb;

-    cbdata.py_pkgs      = PyDict_New();

+    cbdata.py_pkg       = NULL;

     cr_xml_parse_primary_snippet(target, ptr_c_newpkgcb, &cbdata, ptr_c_pkgcb, &cbdata,

                                  ptr_c_warningcb, &cbdata, do_files, &tmp_err);

@@ -287,7 +280,7 @@ py_xml_parse_primary_snippet(G_GNUC_UNUSED PyObject *self, PyObject *args)

     Py_XDECREF(py_newpkgcb);

     Py_XDECREF(py_pkgcb);

     Py_XDECREF(py_warningcb);

-    Py_XDECREF(cbdata.py_pkgs);

+    Py_XDECREF(cbdata.py_pkg);

     if (tmp_err) {

         nice_exception(&tmp_err, NULL);

@@ -351,7 +344,7 @@ py_xml_parse_filelists(G_GNUC_UNUSED PyObject *self, PyObject *args)

     cbdata.py_newpkgcb  = py_newpkgcb;

     cbdata.py_pkgcb     = py_pkgcb;

     cbdata.py_warningcb = py_warningcb;

-    cbdata.py_pkgs      = PyDict_New();

+    cbdata.py_pkg       = NULL;

     cr_xml_parse_filelists(filename,

                            ptr_c_newpkgcb,

@@ -365,7 +358,7 @@ py_xml_parse_filelists(G_GNUC_UNUSED PyObject *self, PyObject *args)

     Py_XDECREF(py_newpkgcb);

     Py_XDECREF(py_pkgcb);

     Py_XDECREF(py_warningcb);

-    Py_XDECREF(cbdata.py_pkgs);

+    Py_XDECREF(cbdata.py_pkg);

     if (tmp_err) {

         nice_exception(&tmp_err, NULL);

@@ -429,7 +422,7 @@ py_xml_parse_filelists_snippet(G_GNUC_UNUSED PyObject *self, PyObject *args)

     cbdata.py_newpkgcb  = py_newpkgcb;

     cbdata.py_pkgcb     = py_pkgcb;

     cbdata.py_warningcb = py_warningcb;

-    cbdata.py_pkgs      = PyDict_New();

+    cbdata.py_pkg       = NULL;

     cr_xml_parse_filelists_snippet(target, ptr_c_newpkgcb, &cbdata, ptr_c_pkgcb,

                                    &cbdata, ptr_c_warningcb, &cbdata, &tmp_err);

@@ -437,7 +430,7 @@ py_xml_parse_filelists_snippet(G_GNUC_UNUSED PyObject *self, PyObject *args)

     Py_XDECREF(py_newpkgcb);

     Py_XDECREF(py_pkgcb);

     Py_XDECREF(py_warningcb);

-    Py_XDECREF(cbdata.py_pkgs);

+    Py_XDECREF(cbdata.py_pkg);

     if (tmp_err) {

         nice_exception(&tmp_err, NULL);

@@ -501,7 +494,7 @@ py_xml_parse_other(G_GNUC_UNUSED PyObject *self, PyObject *args)

     cbdata.py_newpkgcb  = py_newpkgcb;

     cbdata.py_pkgcb     = py_pkgcb;

     cbdata.py_warningcb = py_warningcb;

-    cbdata.py_pkgs      = PyDict_New();

+    cbdata.py_pkg       = NULL;

     cr_xml_parse_other(filename,

                        ptr_c_newpkgcb,

@@ -515,7 +508,7 @@ py_xml_parse_other(G_GNUC_UNUSED PyObject *self, PyObject *args)

     Py_XDECREF(py_newpkgcb);

     Py_XDECREF(py_pkgcb);

     Py_XDECREF(py_warningcb);

-    Py_XDECREF(cbdata.py_pkgs);

+    Py_XDECREF(cbdata.py_pkg);

     if (tmp_err) {

         nice_exception(&tmp_err, NULL);

@@ -579,7 +572,7 @@ py_xml_parse_other_snippet(G_GNUC_UNUSED PyObject *self, PyObject *args)

     cbdata.py_newpkgcb  = py_newpkgcb;

     cbdata.py_pkgcb     = py_pkgcb;

     cbdata.py_warningcb = py_warningcb;

-    cbdata.py_pkgs      = PyDict_New();

+    cbdata.py_pkg       = NULL;

     cr_xml_parse_other_snippet(target, ptr_c_newpkgcb, &cbdata, ptr_c_pkgcb, &cbdata,

                                ptr_c_warningcb, &cbdata, &tmp_err);

@@ -587,7 +580,7 @@ py_xml_parse_other_snippet(G_GNUC_UNUSED PyObject *self, PyObject *args)

     Py_XDECREF(py_newpkgcb);

     Py_XDECREF(py_pkgcb);

     Py_XDECREF(py_warningcb);

-    Py_XDECREF(cbdata.py_pkgs);

+    Py_XDECREF(cbdata.py_pkg);

     if (tmp_err) {

         nice_exception(&tmp_err, NULL);

@@ -630,7 +623,7 @@ py_xml_parse_repomd(G_GNUC_UNUSED PyObject *self, PyObject *args)

     cbdata.py_newpkgcb  = NULL;

     cbdata.py_pkgcb     = NULL;

     cbdata.py_warningcb = py_warningcb;

-    cbdata.py_pkgs      = NULL;

+    cbdata.py_pkg       = NULL;

     repomd = Repomd_FromPyObject(py_repomd);

@@ -684,7 +677,7 @@ py_xml_parse_updateinfo(G_GNUC_UNUSED PyObject *self, PyObject *args)

     cbdata.py_newpkgcb  = NULL;

     cbdata.py_pkgcb     = NULL;

     cbdata.py_warningcb = py_warningcb;

-    cbdata.py_pkgs      = NULL;

+    cbdata.py_pkg       = NULL;

     updateinfo = UpdateInfo_FromPyObject(py_updateinfo);

@@ -704,88 +697,3 @@ py_xml_parse_updateinfo(G_GNUC_UNUSED PyObject *self, PyObject *args)

     Py_RETURN_NONE;

 }

-

-

-PyObject *

-py_xml_parse_main_metadata_together(G_GNUC_UNUSED PyObject *self, PyObject *args, PyObject *kwargs)

-{

-    char *primary_filename;

-    char *filelists_filename;

-    char *other_filename;

-    int allow_out_of_order = 1;

-    PyObject *py_newpkgcb, *py_pkgcb, *py_warningcb;

-    CbData cbdata;

-    GError *tmp_err = NULL;

-    static char *kwlist[] = { "primary", "filelists", "other", "newpkgcb", "pkgcb",

-                              "warningcb", "allow_out_of_order", NULL };

-

-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sssOOO|p:py_xml_parse_main_metadata_together", kwlist,

-                                     &primary_filename, &filelists_filename, &other_filename, &py_newpkgcb,

-                                     &py_pkgcb, &py_warningcb, &allow_out_of_order)) {

-        return NULL;

-    }

-

-    if (!PyCallable_Check(py_newpkgcb) && py_newpkgcb != Py_None) {

-        PyErr_SetString(PyExc_TypeError, "newpkgcb must be callable or None");

-        return NULL;

-    }

-

-    if (!PyCallable_Check(py_pkgcb) && py_pkgcb != Py_None) {

-        PyErr_SetString(PyExc_TypeError, "pkgcb must be callable or None");

-        return NULL;

-    }

-

-    if (!PyCallable_Check(py_warningcb) && py_warningcb != Py_None) {

-        PyErr_SetString(PyExc_TypeError, "warningcb must be callable or None");

-        return NULL;

-    }

-

-    if (py_newpkgcb == Py_None && py_pkgcb == Py_None) {

-        PyErr_SetString(PyExc_ValueError, "both pkgcb and newpkgcb cannot be None");

-        return NULL;

-    }

-

-    Py_XINCREF(py_newpkgcb);

-    Py_XINCREF(py_pkgcb);

-    Py_XINCREF(py_warningcb);

-

-    cr_XmlParserNewPkgCb    ptr_c_newpkgcb  = NULL;

-    cr_XmlParserPkgCb       ptr_c_pkgcb     = NULL;

-    cr_XmlParserWarningCb   ptr_c_warningcb = NULL;

-

-    if (py_newpkgcb != Py_None)

-        ptr_c_newpkgcb = c_newpkgcb;

-    if (py_pkgcb != Py_None)

-        ptr_c_pkgcb = c_pkgcb;

-    if (py_warningcb != Py_None)

-        ptr_c_warningcb = c_warningcb;

-

-    cbdata.py_newpkgcb  = py_newpkgcb;

-    cbdata.py_pkgcb     = py_pkgcb;

-    cbdata.py_warningcb = py_warningcb;

-    cbdata.py_pkgs      = PyDict_New();

-

-    cr_xml_parse_main_metadata_together(primary_filename,

-                                        filelists_filename,

-                                        other_filename,

-                                        ptr_c_newpkgcb,

-                                        &cbdata,

-                                        ptr_c_pkgcb,

-                                        &cbdata,

-                                        ptr_c_warningcb,

-                                        &cbdata,

-                                        allow_out_of_order,

-                                        &tmp_err);

-

-    Py_XDECREF(py_newpkgcb);

-    Py_XDECREF(py_pkgcb);

-    Py_XDECREF(py_warningcb);

-    Py_XDECREF(cbdata.py_pkgs);

-

-    if (tmp_err) {

-        nice_exception(&tmp_err, NULL);

-        return NULL;

-    }

-

-    Py_RETURN_NONE;

-}

diff --git a/src/python/xml_parser-py.h b/src/python/xml_parser-py.h

index 3260005..e5eea9f 100644

--- a/src/python/xml_parser-py.h

+++ b/src/python/xml_parser-py.h

@@ -64,12 +64,4 @@ PyDoc_STRVAR(xml_parse_updateinfo__doc__,

 PyObject *py_xml_parse_updateinfo(PyObject *self, PyObject *args);

-PyDoc_STRVAR(xml_parse_main_metadata_together__doc__,

-"xml_parse_main_metadata_together(primary_filename, filelists_filename, other_filename, newpkgcb, pkgcb, warningcb) -> None\n\n"

-"Parse primary.xml, filelists.xml and other.xml together at the same time."

-"- It can handle if packages are not in the same order in all 3 files but memory requirements grow."

-"- It is not guaranteed that newpkgcb is always followed by pkgcb for the given package, it is possible newpkgcb will be called several times for different packages and only after that pkgcbs will be called.");

-

-PyObject *py_xml_parse_main_metadata_together(PyObject *self, PyObject *args, PyObject *kwargs);

-

 #endif

-- 

2.35.1

From ac6f56e87f8a4b1f0a35d9dedc02a8846c9a6390 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>

Date: Wed, 9 Mar 2022 15:23:58 +0100

Subject: [PATCH 4/5] Revert "Add c tests for parsing metadata together"

This reverts commit 3ef3d4d77e283ee916fc7977cdc3855b912463e0.

---

 tests/CMakeLists.txt                          |    4 -

 tests/fixtures.h                              |    2 -

 .../test_xml_parser_main_metadata_together.c  |  298 -----

 .../modified_repo_files/long_primary.xml      | 1060 -----------------

 .../repo_02_different_order_filelists.xml     |   16 -

 5 files changed, 1380 deletions(-)

 delete mode 100644 tests/test_xml_parser_main_metadata_together.c

 delete mode 100644 tests/testdata/modified_repo_files/long_primary.xml

 delete mode 100644 tests/testdata/modified_repo_files/repo_02_different_order_filelists.xml

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt

index 4ffe837..3936176 100644

--- a/tests/CMakeLists.txt

+++ b/tests/CMakeLists.txt

@@ -38,10 +38,6 @@ ADD_EXECUTABLE(test_xml_parser_updateinfo test_xml_parser_updateinfo.c)

 TARGET_LINK_LIBRARIES(test_xml_parser_updateinfo libcreaterepo_c ${GLIB2_LIBRARIES})

 ADD_DEPENDENCIES(tests test_xml_parser_updateinfo)

-ADD_EXECUTABLE(test_xml_parser_main_metadata_together test_xml_parser_main_metadata_together.c)

-TARGET_LINK_LIBRARIES(test_xml_parser_main_metadata_together libcreaterepo_c ${GLIB2_LIBRARIES})

-ADD_DEPENDENCIES(tests test_xml_parser_main_metadata_together)

-

 ADD_EXECUTABLE(test_xml_dump test_xml_dump.c)

 TARGET_LINK_LIBRARIES(test_xml_dump libcreaterepo_c ${GLIB2_LIBRARIES})

 ADD_DEPENDENCIES(tests test_xml_dump)

diff --git a/tests/fixtures.h b/tests/fixtures.h

index 676518c..a47dd66 100644

--- a/tests/fixtures.h

+++ b/tests/fixtures.h

@@ -85,8 +85,6 @@

 #define TEST_MRF_UE_OTH_00      TEST_MODIFIED_REPO_FILES_PATH"unknown_element_00-other.xml"

 #define TEST_MRF_UE_OTH_01      TEST_MODIFIED_REPO_FILES_PATH"unknown_element_01-other.xml"

 #define TEST_MRF_UE_OTH_02      TEST_MODIFIED_REPO_FILES_PATH"unknown_element_02-other.xml"

-#define TEST_LONG_PRIMARY       TEST_MODIFIED_REPO_FILES_PATH"long_primary.xml"

-#define TEST_DIFF_ORDER_FILELISTS TEST_MODIFIED_REPO_FILES_PATH"repo_02_different_order_filelists.xml"

 // Test files

diff --git a/tests/test_xml_parser_main_metadata_together.c b/tests/test_xml_parser_main_metadata_together.c

deleted file mode 100644

index a4e4ad7..0000000

--- a/tests/test_xml_parser_main_metadata_together.c

+++ /dev/null

@@ -1,298 +0,0 @@

-/*

- * Copyright (C) 2021 Red Hat, Inc.

- *

- * Licensed under the GNU Lesser General Public License Version 2.1

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

- * Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this library; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

- */

-

-#include <glib.h>