Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
b28af4fd
Commit
b28af4fd
authored
Sep 04, 2014
by
Don Mitchell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Temporarily disable bulk operations b/c old mongo
does too much work on exit and doesn't handle nesting
parent
23d3a918
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
4 deletions
+15
-4
cms/djangoapps/contentstore/views/course.py
+1
-1
common/lib/xmodule/xmodule/modulestore/__init__.py
+8
-0
common/lib/xmodule/xmodule/modulestore/search.py
+2
-1
common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
+2
-1
lms/djangoapps/courseware/model_data.py
+2
-1
No files found.
cms/djangoapps/contentstore/views/course.py
View file @
b28af4fd
...
...
@@ -423,7 +423,7 @@ def course_index(request, course_key):
"""
# A depth of None implies the whole course. The course outline needs this in order to compute has_changes.
# A unit may not have a draft version, but one of its components could, and hence the unit itself has changes.
with
modulestore
()
.
bulk_
operations
(
course_key
):
with
modulestore
()
.
bulk_
temp_noop_operations
(
course_key
):
# FIXME
course_module
=
_get_course_module
(
course_key
,
request
.
user
,
depth
=
None
)
lms_link
=
get_lms_link_for_item
(
course_module
.
location
)
sections
=
course_module
.
get_children
()
...
...
common/lib/xmodule/xmodule/modulestore/__init__.py
View file @
b28af4fd
...
...
@@ -566,6 +566,14 @@ class ModuleStoreReadBase(ModuleStoreRead):
finally
:
self
.
_end_bulk_operation
(
course_id
)
@contextmanager
def
bulk_temp_noop_operations
(
self
,
course_id
):
"""
A hotfix noop b/c old mongo does not properly handle nested bulk operations and does unnecessary work
if the bulk operation only reads data. Replace with bulk_operations once fixed (or don't merge to master)
"""
yield
def
_begin_bulk_operation
(
self
,
course_id
):
"""
Begin a bulk write operation on course_id.
...
...
common/lib/xmodule/xmodule/modulestore/search.py
View file @
b28af4fd
...
...
@@ -68,7 +68,8 @@ def path_to_location(modulestore, usage_key):
newpath
=
(
next_usage
,
path
)
queue
.
append
((
parent
,
newpath
))
with
modulestore
.
bulk_operations
(
usage_key
.
course_key
):
# FIXME replace with bulk_operations once it's fixed for old mongo
with
modulestore
.
bulk_temp_noop_operations
(
usage_key
.
course_key
):
if
not
modulestore
.
has_item
(
usage_key
):
raise
ItemNotFoundError
(
usage_key
)
...
...
common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
View file @
b28af4fd
...
...
@@ -714,7 +714,8 @@ class TestMixedModuleStore(unittest.TestCase):
# TODO: LMS-11220: Document why draft send count is 5
# TODO: LMS-11220: Document why draft find count is [19, 6]
# TODO: LMS-11220: Document why split find count is [2, 2]
@ddt.data
((
'draft'
,
[
19
,
6
],
0
),
(
'split'
,
[
2
,
2
],
0
))
# @ddt.data(('draft', [19, 6], 0), ('split', [2, 2], 0))
@ddt.data
((
'draft'
,
[
18
,
6
],
0
),
(
'split'
,
[
16
,
2
],
0
))
# FIXME, replace w/ above when bulk reenabled
@ddt.unpack
def
test_path_to_location
(
self
,
default_ms
,
num_finds
,
num_sends
):
"""
...
...
lms/djangoapps/courseware/model_data.py
View file @
b28af4fd
...
...
@@ -110,7 +110,8 @@ class FieldDataCache(object):
return
descriptors
with
modulestore
()
.
bulk_operations
(
descriptor
.
location
.
course_key
):
# FIXME
with
modulestore
()
.
bulk_temp_noop_operations
(
descriptor
.
location
.
course_key
):
descriptors
=
get_child_descriptors
(
descriptor
,
depth
,
descriptor_filter
)
return
FieldDataCache
(
descriptors
,
course_id
,
user
,
select_for_update
)
...
...
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