Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
1bd8d75b
Commit
1bd8d75b
authored
May 13, 2015
by
Raymond Hettinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #23290: Optimize set_merge() for cases where the target is empty.
(Contributed by Serhiy Storchaka.)
parent
eac503ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
10 deletions
+43
-10
Misc/NEWS
Misc/NEWS
+3
-0
Objects/setobject.c
Objects/setobject.c
+40
-10
No files found.
Misc/NEWS
View file @
1bd8d75b
...
...
@@ -12,6 +12,9 @@ Core and Builtins
- Issue #15027: The UTF-32 encoder is now 3x to 7x faster.
- Issue #23290: Optimize set_merge() for cases where the target is empty.
(Contributed by Serhiy Storchaka.)
- Issue #20274: When calling a _sqlite.Connection, it now complains if passed
any keyword arguments. Previously it silently ignored them.
...
...
Objects/setobject.c
View file @
1bd8d75b
...
...
@@ -548,16 +548,16 @@ set_merge(PySetObject *so, PyObject *otherset)
{
PySetObject
*
other
;
PyObject
*
key
;
Py_hash_t
hash
;
Py_ssize_t
i
;
setentry
*
entry
;
setentry
*
so_entry
;
setentry
*
other_entry
;
assert
(
PyAnySet_Check
(
so
));
assert
(
PyAnySet_Check
(
otherset
));
other
=
(
PySetObject
*
)
otherset
;
if
(
other
==
so
||
other
->
used
==
0
)
/* a.update(a) or a.update(
{}
); nothing to do */
/* a.update(a) or a.update(
set()
); nothing to do */
return
0
;
/* Do one big resize at the start, rather than
* incrementally resizing as we insert new keys. Expect
...
...
@@ -567,14 +567,44 @@ set_merge(PySetObject *so, PyObject *otherset)
if
(
set_table_resize
(
so
,
(
so
->
used
+
other
->
used
)
*
2
)
!=
0
)
return
-
1
;
}
for
(
i
=
0
;
i
<=
other
->
mask
;
i
++
)
{
entry
=
&
other
->
table
[
i
];
key
=
entry
->
key
;
hash
=
entry
->
hash
;
if
(
key
!=
NULL
&&
key
!=
dummy
)
{
so_entry
=
so
->
table
;
other_entry
=
other
->
table
;
/* If our table is empty, and both tables have the same size, and
there are no dummies to eliminate, then just copy the pointers. */
if
(
so
->
fill
==
0
&&
so
->
mask
==
other
->
mask
&&
other
->
fill
==
other
->
used
)
{
for
(
i
=
0
;
i
<=
other
->
mask
;
i
++
,
so_entry
++
,
other_entry
++
)
{
key
=
other_entry
->
key
;
if
(
key
!=
NULL
)
{
assert
(
so_entry
->
key
==
NULL
);
Py_INCREF
(
key
);
so_entry
->
key
=
key
;
so_entry
->
hash
=
other_entry
->
hash
;
}
}
so
->
fill
=
other
->
fill
;
so
->
used
=
other
->
used
;
return
0
;
}
/* If our table is empty, we can use set_insert_clean() */
if
(
so
->
fill
==
0
)
{
for
(
i
=
0
;
i
<=
other
->
mask
;
i
++
,
other_entry
++
)
{
key
=
other_entry
->
key
;
if
(
key
!=
NULL
&&
key
!=
dummy
)
{
Py_INCREF
(
key
);
set_insert_clean
(
so
,
key
,
other_entry
->
hash
);
}
}
return
0
;
}
/* We can't assure there are no duplicates, so do normal insertions */
for
(
i
=
0
;
i
<=
other
->
mask
;
i
++
,
other_entry
++
)
{
key
=
other_entry
->
key
;
if
(
key
!=
NULL
&&
key
!=
dummy
)
{
Py_INCREF
(
key
);
if
(
set_insert_key
(
so
,
key
,
hash
)
==
-
1
)
{
if
(
set_insert_key
(
so
,
key
,
other_entry
->
hash
)
)
{
Py_DECREF
(
key
);
return
-
1
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment