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
e39cc5df
Commit
e39cc5df
authored
Jul 02, 2014
by
Mat Peterson
Committed by
Diana Huang
Jul 11, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch offering to course and run
parent
78a29595
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
127 additions
and
88 deletions
+127
-88
cms/djangoapps/contentstore/tests/test_crud.py
+8
-7
common/lib/xmodule/xmodule/modulestore/__init__.py
+10
-7
common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
+33
-24
common/lib/xmodule/xmodule/modulestore/mixed.py
+7
-3
common/lib/xmodule/xmodule/modulestore/mongo/base.py
+7
-3
common/lib/xmodule/xmodule/modulestore/split_migrator.py
+4
-1
common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py
+5
-3
common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py
+7
-3
common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
+31
-22
common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
+5
-5
common/lib/xmodule/xmodule/modulestore/tests/test_orphan.py
+2
-2
common/lib/xmodule/xmodule/modulestore/tests/test_publish.py
+4
-4
common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
+0
-0
common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py
+3
-3
common/lib/xmodule/xmodule/modulestore/xml_importer.py
+1
-1
No files found.
cms/djangoapps/contentstore/tests/test_crud.py
View file @
e39cc5df
...
@@ -57,14 +57,15 @@ class TemplateTests(unittest.TestCase):
...
@@ -57,14 +57,15 @@ class TemplateTests(unittest.TestCase):
def
test_factories
(
self
):
def
test_factories
(
self
):
test_course
=
persistent_factories
.
PersistentCourseFactory
.
create
(
test_course
=
persistent_factories
.
PersistentCourseFactory
.
create
(
offering
=
'tempcourse
'
,
org
=
'testx'
,
course
=
'course'
,
run
=
'2014
'
,
org
=
'testx'
,
display_name
=
'fun test course'
,
user_id
=
'testbot'
display_name
=
'fun test course'
,
user_id
=
'testbot'
)
)
self
.
assertIsInstance
(
test_course
,
CourseDescriptor
)
self
.
assertIsInstance
(
test_course
,
CourseDescriptor
)
self
.
assertEqual
(
test_course
.
display_name
,
'fun test course'
)
self
.
assertEqual
(
test_course
.
display_name
,
'fun test course'
)
index_info
=
self
.
split_store
.
get_course_index_info
(
test_course
.
id
)
index_info
=
self
.
split_store
.
get_course_index_info
(
test_course
.
id
)
self
.
assertEqual
(
index_info
[
'org'
],
'testx'
)
self
.
assertEqual
(
index_info
[
'org'
],
'testx'
)
self
.
assertEqual
(
index_info
[
'offering'
],
'tempcourse'
)
self
.
assertEqual
(
index_info
[
'course'
],
'course'
)
self
.
assertEqual
(
index_info
[
'run'
],
'2014'
)
test_chapter
=
persistent_factories
.
ItemFactory
.
create
(
display_name
=
'chapter 1'
,
test_chapter
=
persistent_factories
.
ItemFactory
.
create
(
display_name
=
'chapter 1'
,
parent_location
=
test_course
.
location
)
parent_location
=
test_course
.
location
)
...
@@ -75,7 +76,7 @@ class TemplateTests(unittest.TestCase):
...
@@ -75,7 +76,7 @@ class TemplateTests(unittest.TestCase):
with
self
.
assertRaises
(
DuplicateCourseError
):
with
self
.
assertRaises
(
DuplicateCourseError
):
persistent_factories
.
PersistentCourseFactory
.
create
(
persistent_factories
.
PersistentCourseFactory
.
create
(
offering
=
'tempcourse
'
,
org
=
'testx'
,
course
=
'course'
,
run
=
'2014
'
,
org
=
'testx'
,
display_name
=
'fun test course'
,
user_id
=
'testbot'
display_name
=
'fun test course'
,
user_id
=
'testbot'
)
)
...
@@ -84,7 +85,7 @@ class TemplateTests(unittest.TestCase):
...
@@ -84,7 +85,7 @@ class TemplateTests(unittest.TestCase):
Test create_xblock to create non persisted xblocks
Test create_xblock to create non persisted xblocks
"""
"""
test_course
=
persistent_factories
.
PersistentCourseFactory
.
create
(
test_course
=
persistent_factories
.
PersistentCourseFactory
.
create
(
offering
=
'tempcourse
'
,
org
=
'testx'
,
course
=
'course'
,
run
=
'2014
'
,
org
=
'testx'
,
display_name
=
'fun test course'
,
user_id
=
'testbot'
display_name
=
'fun test course'
,
user_id
=
'testbot'
)
)
...
@@ -111,7 +112,7 @@ class TemplateTests(unittest.TestCase):
...
@@ -111,7 +112,7 @@ class TemplateTests(unittest.TestCase):
try saving temporary xblocks
try saving temporary xblocks
"""
"""
test_course
=
persistent_factories
.
PersistentCourseFactory
.
create
(
test_course
=
persistent_factories
.
PersistentCourseFactory
.
create
(
offering
=
'tempcourse
'
,
org
=
'testx'
,
course
=
'course'
,
run
=
'2014
'
,
org
=
'testx'
,
display_name
=
'fun test course'
,
user_id
=
'testbot'
display_name
=
'fun test course'
,
user_id
=
'testbot'
)
)
test_chapter
=
self
.
split_store
.
create_xblock
(
test_chapter
=
self
.
split_store
.
create_xblock
(
...
@@ -150,7 +151,7 @@ class TemplateTests(unittest.TestCase):
...
@@ -150,7 +151,7 @@ class TemplateTests(unittest.TestCase):
def
test_delete_course
(
self
):
def
test_delete_course
(
self
):
test_course
=
persistent_factories
.
PersistentCourseFactory
.
create
(
test_course
=
persistent_factories
.
PersistentCourseFactory
.
create
(
offering
=
'history.
doomed'
,
org
=
'edu.harvard'
,
course
=
'history'
,
run
=
'
doomed'
,
org
=
'edu.harvard'
,
display_name
=
'doomed test course'
,
display_name
=
'doomed test course'
,
user_id
=
'testbot'
)
user_id
=
'testbot'
)
persistent_factories
.
ItemFactory
.
create
(
display_name
=
'chapter 1'
,
persistent_factories
.
ItemFactory
.
create
(
display_name
=
'chapter 1'
,
...
@@ -173,7 +174,7 @@ class TemplateTests(unittest.TestCase):
...
@@ -173,7 +174,7 @@ class TemplateTests(unittest.TestCase):
Test get_block_generations
Test get_block_generations
"""
"""
test_course
=
persistent_factories
.
PersistentCourseFactory
.
create
(
test_course
=
persistent_factories
.
PersistentCourseFactory
.
create
(
offering
=
'history.
hist101'
,
org
=
'edu.harvard'
,
course
=
'history'
,
run
=
'
hist101'
,
org
=
'edu.harvard'
,
display_name
=
'history test course'
,
display_name
=
'history test course'
,
user_id
=
'testbot'
user_id
=
'testbot'
)
)
...
...
common/lib/xmodule/xmodule/modulestore/__init__.py
View file @
e39cc5df
...
@@ -317,7 +317,7 @@ class ModuleStoreWrite(ModuleStoreRead):
...
@@ -317,7 +317,7 @@ class ModuleStoreWrite(ModuleStoreRead):
:param force: fork the structure and don't update the course draftVersion if there's a version
:param force: fork the structure and don't update the course draftVersion if there's a version
conflict (only applicable to version tracking and conflict detecting persistence stores)
conflict (only applicable to version tracking and conflict detecting persistence stores)
:raises VersionConflictError: if org,
offering,
and version_guid given and the current
:raises VersionConflictError: if org,
course, run,
and version_guid given and the current
version head != version_guid and force is not True. (only applicable to version tracking stores)
version head != version_guid and force is not True. (only applicable to version tracking stores)
"""
"""
pass
pass
...
@@ -336,19 +336,20 @@ class ModuleStoreWrite(ModuleStoreRead):
...
@@ -336,19 +336,20 @@ class ModuleStoreWrite(ModuleStoreRead):
:param force: fork the structure and don't update the course draftVersion if there's a version
:param force: fork the structure and don't update the course draftVersion if there's a version
conflict (only applicable to version tracking and conflict detecting persistence stores)
conflict (only applicable to version tracking and conflict detecting persistence stores)
:raises VersionConflictError: if org,
offering,
and version_guid given and the current
:raises VersionConflictError: if org,
course, run,
and version_guid given and the current
version head != version_guid and force is not True. (only applicable to version tracking stores)
version head != version_guid and force is not True. (only applicable to version tracking stores)
"""
"""
pass
pass
@abstractmethod
@abstractmethod
def
create_course
(
self
,
org
,
offering
,
user_id
,
fields
=
None
,
**
kwargs
):
def
create_course
(
self
,
org
,
course
,
run
,
user_id
,
fields
=
None
,
**
kwargs
):
"""
"""
Creates and returns the course.
Creates and returns the course.
Args:
Args:
org (str): the organization that owns the course
org (str): the organization that owns the course
offering (str): the name of the course offering
course (str): the name of the course
run (str): the name of the run
user_id: id of the user creating the course
user_id: id of the user creating the course
fields (dict): Fields to set on the course at initialization
fields (dict): Fields to set on the course at initialization
kwargs: Any optional arguments understood by a subset of modulestores to customize instantiation
kwargs: Any optional arguments understood by a subset of modulestores to customize instantiation
...
@@ -458,7 +459,9 @@ class ModuleStoreReadBase(ModuleStoreRead):
...
@@ -458,7 +459,9 @@ class ModuleStoreReadBase(ModuleStoreRead):
return
next
(
return
next
(
(
(
c
.
id
for
c
in
self
.
get_courses
()
c
.
id
for
c
in
self
.
get_courses
()
if
c
.
id
.
org
.
lower
()
==
course_id
.
org
.
lower
()
and
c
.
id
.
offering
.
lower
()
==
course_id
.
offering
.
lower
()
if
c
.
id
.
org
.
lower
()
==
course_id
.
org
.
lower
()
and
\
c
.
id
.
course
.
lower
()
==
course_id
.
course
.
lower
()
and
\
c
.
id
.
run
.
lower
()
==
course_id
.
run
.
lower
()
),
),
None
None
)
)
...
@@ -542,7 +545,7 @@ class ModuleStoreWriteBase(ModuleStoreReadBase, ModuleStoreWrite):
...
@@ -542,7 +545,7 @@ class ModuleStoreWriteBase(ModuleStoreReadBase, ModuleStoreWrite):
:param force: fork the structure and don't update the course draftVersion if there's a version
:param force: fork the structure and don't update the course draftVersion if there's a version
conflict (only applicable to version tracking and conflict detecting persistence stores)
conflict (only applicable to version tracking and conflict detecting persistence stores)
:raises VersionConflictError: if org,
offering,
and version_guid given and the current
:raises VersionConflictError: if org,
course, run,
and version_guid given and the current
version head != version_guid and force is not True. (only applicable to version tracking stores)
version head != version_guid and force is not True. (only applicable to version tracking stores)
"""
"""
raise
NotImplementedError
raise
NotImplementedError
...
@@ -556,7 +559,7 @@ class ModuleStoreWriteBase(ModuleStoreReadBase, ModuleStoreWrite):
...
@@ -556,7 +559,7 @@ class ModuleStoreWriteBase(ModuleStoreReadBase, ModuleStoreWrite):
:param force: fork the structure and don't update the course draftVersion if there's a version
:param force: fork the structure and don't update the course draftVersion if there's a version
conflict (only applicable to version tracking and conflict detecting persistence stores)
conflict (only applicable to version tracking and conflict detecting persistence stores)
:raises VersionConflictError: if org,
offering,
and version_guid given and the current
:raises VersionConflictError: if org,
course, run,
and version_guid given and the current
version head != version_guid and force is not True. (only applicable to version tracking stores)
version head != version_guid and force is not True. (only applicable to version tracking stores)
"""
"""
raise
NotImplementedError
raise
NotImplementedError
...
...
common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
View file @
e39cc5df
...
@@ -55,13 +55,13 @@ class LocMapperStore(object):
...
@@ -55,13 +55,13 @@ class LocMapperStore(object):
self
.
cache
=
cache
self
.
cache
=
cache
# location_map functions
# location_map functions
def
create_map_entry
(
self
,
course_key
,
org
=
None
,
offering
=
None
,
def
create_map_entry
(
self
,
course_key
,
org
=
None
,
course
=
None
,
run
=
None
,
draft_branch
=
ModuleStoreEnum
.
BranchName
.
draft
,
draft_branch
=
ModuleStoreEnum
.
BranchName
.
draft
,
prod_branch
=
ModuleStoreEnum
.
BranchName
.
published
,
prod_branch
=
ModuleStoreEnum
.
BranchName
.
published
,
block_map
=
None
):
block_map
=
None
):
"""
"""
Add a new entry to map this SlashSeparatedCourseKey to the new style CourseLocator.org &
offering
. If
Add a new entry to map this SlashSeparatedCourseKey to the new style CourseLocator.org &
course & run
. If
org and
offering
are not provided, it defaults them based on course_key.
org and
course and run
are not provided, it defaults them based on course_key.
WARNING: Exactly 1 CourseLocator key should index a given SlashSeparatedCourseKey.
WARNING: Exactly 1 CourseLocator key should index a given SlashSeparatedCourseKey.
We provide no mechanism to enforce this assertion.
We provide no mechanism to enforce this assertion.
...
@@ -71,7 +71,8 @@ class LocMapperStore(object):
...
@@ -71,7 +71,8 @@ class LocMapperStore(object):
:param course_key (SlashSeparatedCourseKey): a SlashSeparatedCourseKey
:param course_key (SlashSeparatedCourseKey): a SlashSeparatedCourseKey
:param org (string): the CourseLocator style org
:param org (string): the CourseLocator style org
:param offering (string): the CourseLocator offering
:param course (string): the CourseLocator course number
:param run (string): the CourseLocator run of this course
:param draft_branch: the branch name to assign for drafts. This is hardcoded because old mongo had
:param draft_branch: the branch name to assign for drafts. This is hardcoded because old mongo had
a fixed notion that there was 2 and only 2 versions for modules: draft and production. The old mongo
a fixed notion that there was 2 and only 2 versions for modules: draft and production. The old mongo
did not, however, require that a draft version exist. The new one, however, does require a draft to
did not, however, require that a draft version exist. The new one, however, does require a draft to
...
@@ -86,15 +87,16 @@ class LocMapperStore(object):
...
@@ -86,15 +87,16 @@ class LocMapperStore(object):
:class:`CourseLocator` representing the new id for the course
:class:`CourseLocator` representing the new id for the course
Raises:
Raises:
ValueError if one and only one of org and
offering is provided. Provide either both or neither
.
ValueError if one and only one of org and
course and run is provided. Provide all of them or none of them
.
"""
"""
if
org
is
None
and
offering
is
None
:
if
org
is
None
and
course
is
None
and
run
is
None
:
assert
(
isinstance
(
course_key
,
SlashSeparated
CourseKey
))
assert
(
isinstance
(
course_key
,
CourseKey
))
org
=
course_key
.
org
org
=
course_key
.
org
offering
=
u"{0.course}.{0.run}"
.
format
(
course_key
)
course
=
course_key
.
course
elif
org
is
None
or
offering
is
None
:
run
=
course_key
.
run
elif
org
is
None
or
course
is
None
or
run
is
None
:
raise
ValueError
(
raise
ValueError
(
u"Either supply
both org and offering or neither. Not just one: {}, {}"
.
format
(
org
,
offering
)
u"Either supply
org, course and run or none of them. Not just some of them: {}, {}, {}"
.
format
(
org
,
course
,
run
)
)
)
# very like _interpret_location_id but using mongo subdoc lookup (more performant)
# very like _interpret_location_id but using mongo subdoc lookup (more performant)
...
@@ -103,14 +105,15 @@ class LocMapperStore(object):
...
@@ -103,14 +105,15 @@ class LocMapperStore(object):
self
.
location_map
.
insert
({
self
.
location_map
.
insert
({
'_id'
:
course_son
,
'_id'
:
course_son
,
'org'
:
org
,
'org'
:
org
,
'offering'
:
offering
,
'course'
:
course
,
'run'
:
run
,
'draft_branch'
:
draft_branch
,
'draft_branch'
:
draft_branch
,
'prod_branch'
:
prod_branch
,
'prod_branch'
:
prod_branch
,
'block_map'
:
block_map
or
{},
'block_map'
:
block_map
or
{},
'schema'
:
self
.
SCHEMA_VERSION
,
'schema'
:
self
.
SCHEMA_VERSION
,
})
})
return
CourseLocator
(
org
,
offering
)
return
CourseLocator
(
org
,
course
,
run
)
def
translate_location
(
self
,
location
,
published
=
True
,
def
translate_location
(
self
,
location
,
published
=
True
,
add_entry_if_missing
=
True
,
passed_block_id
=
None
):
add_entry_if_missing
=
True
,
passed_block_id
=
None
):
...
@@ -177,7 +180,8 @@ class LocMapperStore(object):
...
@@ -177,7 +180,8 @@ class LocMapperStore(object):
prod_course_locator
=
CourseLocator
(
prod_course_locator
=
CourseLocator
(
org
=
entry
[
'org'
],
org
=
entry
[
'org'
],
offering
=
entry
[
'offering'
],
course
=
entry
[
'course'
],
run
=
entry
[
'run'
],
branch
=
entry
[
'prod_branch'
]
branch
=
entry
[
'prod_branch'
]
)
)
published_usage
=
BlockUsageLocator
(
published_usage
=
BlockUsageLocator
(
...
@@ -223,7 +227,7 @@ class LocMapperStore(object):
...
@@ -223,7 +227,7 @@ class LocMapperStore(object):
if
cached_value
:
if
cached_value
:
return
cached_value
return
cached_value
# migrate any records which don't have the org and
offering
fields as
# migrate any records which don't have the org and
course and run
fields as
# this won't be able to find what it wants. (only needs to be run once ever per db,
# this won't be able to find what it wants. (only needs to be run once ever per db,
# I'm not sure how to control that, but I'm putting some check here for once per launch)
# I'm not sure how to control that, but I'm putting some check here for once per launch)
if
not
getattr
(
self
,
'offering_migrated'
,
False
):
if
not
getattr
(
self
,
'offering_migrated'
,
False
):
...
@@ -235,7 +239,8 @@ class LocMapperStore(object):
...
@@ -235,7 +239,8 @@ class LocMapperStore(object):
entry
=
self
.
location_map
.
find_one
(
bson
.
son
.
SON
([
entry
=
self
.
location_map
.
find_one
(
bson
.
son
.
SON
([
(
'org'
,
locator
.
org
),
(
'org'
,
locator
.
org
),
(
'offering'
,
locator
.
offering
),
(
'course'
,
locator
.
course
),
(
'run'
,
locator
.
run
),
]))
]))
# look for one which maps to this block block_id
# look for one which maps to this block block_id
...
@@ -257,11 +262,14 @@ class LocMapperStore(object):
...
@@ -257,11 +262,14 @@ class LocMapperStore(object):
)
)
entry_org
=
"org"
entry_org
=
"org"
entry_offering
=
"offering"
entry_course
=
"course"
entry_run
=
"run"
published_locator
=
BlockUsageLocator
(
published_locator
=
BlockUsageLocator
(
CourseLocator
(
CourseLocator
(
org
=
entry
[
entry_org
],
offering
=
entry
[
entry_offering
],
org
=
entry
[
entry_org
],
course
=
entry
[
entry_course
],
run
=
entry
[
entry_run
],
branch
=
entry
[
'prod_branch'
]
branch
=
entry
[
'prod_branch'
]
),
),
block_type
=
category
,
block_type
=
category
,
...
@@ -269,7 +277,7 @@ class LocMapperStore(object):
...
@@ -269,7 +277,7 @@ class LocMapperStore(object):
)
)
draft_locator
=
BlockUsageLocator
(
draft_locator
=
BlockUsageLocator
(
CourseLocator
(
CourseLocator
(
org
=
entry
[
entry_org
],
offering
=
entry
[
entry_offering
],
org
=
entry
[
entry_org
],
course
=
entry
[
entry_course
],
run
=
entry
[
entry_run
],
branch
=
entry
[
'draft_branch'
]
branch
=
entry
[
'draft_branch'
]
),
),
block_type
=
category
,
block_type
=
category
,
...
@@ -303,10 +311,10 @@ class LocMapperStore(object):
...
@@ -303,10 +311,10 @@ class LocMapperStore(object):
raise
ItemNotFoundError
(
course_key
)
raise
ItemNotFoundError
(
course_key
)
published_course_locator
=
CourseLocator
(
published_course_locator
=
CourseLocator
(
org
=
entry
[
'org'
],
offering
=
entry
[
'offering
'
],
branch
=
entry
[
'prod_branch'
]
org
=
entry
[
'org'
],
course
=
entry
[
'course'
],
run
=
entry
[
'run
'
],
branch
=
entry
[
'prod_branch'
]
)
)
draft_course_locator
=
CourseLocator
(
draft_course_locator
=
CourseLocator
(
org
=
entry
[
'org'
],
offering
=
entry
[
'offering
'
],
branch
=
entry
[
'draft_branch'
]
org
=
entry
[
'org'
],
course
=
entry
[
'course'
],
run
=
entry
[
'run
'
],
branch
=
entry
[
'draft_branch'
]
)
)
self
.
_cache_course_locator
(
course_key
,
published_course_locator
,
draft_course_locator
)
self
.
_cache_course_locator
(
course_key
,
published_course_locator
,
draft_course_locator
)
if
published
:
if
published
:
...
@@ -441,7 +449,7 @@ class LocMapperStore(object):
...
@@ -441,7 +449,7 @@ class LocMapperStore(object):
"""
"""
Return the string used to cache the course key
Return the string used to cache the course key
"""
"""
return
u'{0.org}+{0.
offering
}'
.
format
(
course_key
)
return
u'{0.org}+{0.
course}+{0.run
}'
.
format
(
course_key
)
def
_cache_course_locator
(
self
,
old_course_id
,
published_course_locator
,
draft_course_locator
):
def
_cache_course_locator
(
self
,
old_course_id
,
published_course_locator
,
draft_course_locator
):
"""
"""
...
@@ -534,7 +542,7 @@ class LocMapperStore(object):
...
@@ -534,7 +542,7 @@ class LocMapperStore(object):
"""
"""
If entry had an '_id' without a run, remove the whole record.
If entry had an '_id' without a run, remove the whole record.
Add fields: schema, org,
offering
Add fields: schema, org,
course, run
Remove: course_id, lower_course_id
Remove: course_id, lower_course_id
:param entry:
:param entry:
"""
"""
...
@@ -547,13 +555,14 @@ class LocMapperStore(object):
...
@@ -547,13 +555,14 @@ class LocMapperStore(object):
self
.
location_map
.
remove
({
'_id'
:
entry_id
})
self
.
location_map
.
remove
({
'_id'
:
entry_id
})
return
None
return
None
# add schema, org,
offering
, etc, remove old fields
# add schema, org,
course, run
, etc, remove old fields
entry
[
'schema'
]
=
0
entry
[
'schema'
]
=
0
entry
.
pop
(
'course_id'
,
None
)
entry
.
pop
(
'course_id'
,
None
)
entry
.
pop
(
'lower_course_id'
,
None
)
entry
.
pop
(
'lower_course_id'
,
None
)
old_course_id
=
SlashSeparatedCourseKey
(
entry
[
'_id'
][
'org'
],
entry
[
'_id'
][
'course'
],
entry
[
'_id'
][
'name'
])
old_course_id
=
SlashSeparatedCourseKey
(
entry
[
'_id'
][
'org'
],
entry
[
'_id'
][
'course'
],
entry
[
'_id'
][
'name'
])
entry
[
'org'
]
=
old_course_id
.
org
entry
[
'org'
]
=
old_course_id
.
org
entry
[
'offering'
]
=
old_course_id
.
offering
.
replace
(
'/'
,
'+'
)
entry
[
'course'
]
=
old_course_id
.
course
entry
[
'run'
]
=
old_course_id
.
run
return
self
.
_migrate_1
(
entry
,
True
)
return
self
.
_migrate_1
(
entry
,
True
)
# insert new migrations just before _migrate_top. _migrate_top sets the schema version and
# insert new migrations just before _migrate_top. _migrate_top sets the schema version and
...
...
common/lib/xmodule/xmodule/modulestore/mixed.py
View file @
e39cc5df
...
@@ -273,13 +273,14 @@ class MixedModuleStore(ModuleStoreWriteBase):
...
@@ -273,13 +273,14 @@ class MixedModuleStore(ModuleStoreWriteBase):
errs
.
update
(
store
.
get_errored_courses
())
errs
.
update
(
store
.
get_errored_courses
())
return
errs
return
errs
def
create_course
(
self
,
org
,
offering
,
user_id
,
fields
=
None
,
**
kwargs
):
def
create_course
(
self
,
org
,
course
,
run
,
user_id
,
fields
=
None
,
**
kwargs
):
"""
"""
Creates and returns the course.
Creates and returns the course.
Args:
Args:
org (str): the organization that owns the course
org (str): the organization that owns the course
offering (str): the name of the course offering
course (str): the name of the course
run (str): the name of the run
user_id: id of the user creating the course
user_id: id of the user creating the course
fields (dict): Fields to set on the course at initialization
fields (dict): Fields to set on the course at initialization
kwargs: Any optional arguments understood by a subset of modulestores to customize instantiation
kwargs: Any optional arguments understood by a subset of modulestores to customize instantiation
...
@@ -287,7 +288,10 @@ class MixedModuleStore(ModuleStoreWriteBase):
...
@@ -287,7 +288,10 @@ class MixedModuleStore(ModuleStoreWriteBase):
Returns: a CourseDescriptor
Returns: a CourseDescriptor
"""
"""
store
=
self
.
_get_modulestore_for_courseid
(
None
)
store
=
self
.
_get_modulestore_for_courseid
(
None
)
return
store
.
create_course
(
org
,
offering
,
user_id
,
fields
,
**
kwargs
)
if
not
hasattr
(
store
,
'create_course'
):
raise
NotImplementedError
(
u"Cannot create a course on store {}"
.
format
(
store
))
return
store
.
create_course
(
org
,
course
,
run
,
user_id
,
fields
,
**
kwargs
)
def
clone_course
(
self
,
source_course_id
,
dest_course_id
,
user_id
):
def
clone_course
(
self
,
source_course_id
,
dest_course_id
,
user_id
):
"""
"""
...
...
common/lib/xmodule/xmodule/modulestore/mongo/base.py
View file @
e39cc5df
...
@@ -845,13 +845,18 @@ class MongoModuleStore(ModuleStoreWriteBase):
...
@@ -845,13 +845,18 @@ class MongoModuleStore(ModuleStoreWriteBase):
modules
=
self
.
_load_items
(
course_id
,
list
(
items
))
modules
=
self
.
_load_items
(
course_id
,
list
(
items
))
return
modules
return
modules
<<<<<<<
HEAD
def
create_course
(
self
,
org
,
offering
,
user_id
,
fields
=
None
,
**
kwargs
):
def
create_course
(
self
,
org
,
offering
,
user_id
,
fields
=
None
,
**
kwargs
):
=======
def
create_course
(
self
,
org
,
course
,
run
,
user_id
=
None
,
fields
=
None
,
**
kwargs
):
>>>>>>>
Fix
up
the
signature
to
use
course
and
run
instead
of
just
offering
"""
"""
Creates and returns the course.
Creates and returns the course.
Args:
Args:
org (str): the organization that owns the course
org (str): the organization that owns the course
offering (str): the name of the course offering
course (str): the name of the course
run (str): the name of the run
user_id: id of the user creating the course
user_id: id of the user creating the course
fields (dict): Fields to set on the course at initialization
fields (dict): Fields to set on the course at initialization
kwargs: Any optional arguments understood by a subset of modulestores to customize instantiation
kwargs: Any optional arguments understood by a subset of modulestores to customize instantiation
...
@@ -859,9 +864,8 @@ class MongoModuleStore(ModuleStoreWriteBase):
...
@@ -859,9 +864,8 @@ class MongoModuleStore(ModuleStoreWriteBase):
Returns: a CourseDescriptor
Returns: a CourseDescriptor
Raises:
Raises:
InvalidLocationError: If a course with the same org
and offering
already exists
InvalidLocationError: If a course with the same org
, course, and run
already exists
"""
"""
course
,
_
,
run
=
offering
.
partition
(
'/'
)
course_id
=
SlashSeparatedCourseKey
(
org
,
course
,
run
)
course_id
=
SlashSeparatedCourseKey
(
org
,
course
,
run
)
# Check if a course with this org/course has been defined before (case-insensitive)
# Check if a course with this org/course has been defined before (case-insensitive)
...
...
common/lib/xmodule/xmodule/modulestore/split_migrator.py
View file @
e39cc5df
...
@@ -45,7 +45,10 @@ class SplitMigrator(object):
...
@@ -45,7 +45,10 @@ class SplitMigrator(object):
original_course
=
self
.
draft_modulestore
.
get_course
(
course_key
)
original_course
=
self
.
draft_modulestore
.
get_course
(
course_key
)
new_course_root_locator
=
self
.
loc_mapper
.
translate_location
(
original_course
.
location
)
new_course_root_locator
=
self
.
loc_mapper
.
translate_location
(
original_course
.
location
)
new_course
=
self
.
split_modulestore
.
create_course
(
new_course
=
self
.
split_modulestore
.
create_course
(
new_course_root_locator
.
org
,
new_course_root_locator
.
offering
,
user
.
id
,
new_course_root_locator
.
org
,
new_course_root_locator
.
course
,
new_course_root_locator
.
run
,
user
.
id
,
fields
=
self
.
_get_json_fields_translate_references
(
original_course
,
course_key
,
True
),
fields
=
self
.
_get_json_fields_translate_references
(
original_course
,
course_key
,
True
),
root_block_id
=
new_course_root_locator
.
block_id
,
root_block_id
=
new_course_root_locator
.
block_id
,
master_branch
=
new_course_root_locator
.
branch
master_branch
=
new_course_root_locator
.
branch
...
...
common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py
View file @
e39cc5df
...
@@ -68,7 +68,7 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
...
@@ -68,7 +68,7 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
# deeper than initial descendant fetch or doesn't exist
# deeper than initial descendant fetch or doesn't exist
course_info
=
course_entry_override
or
self
.
course_entry
course_info
=
course_entry_override
or
self
.
course_entry
course_key
=
CourseLocator
(
course_key
=
CourseLocator
(
course_info
.
get
(
'org'
),
course_info
.
get
(
'
offering
'
),
course_info
.
get
(
'branch'
),
course_info
.
get
(
'org'
),
course_info
.
get
(
'
course'
),
course_info
.
get
(
'run
'
),
course_info
.
get
(
'branch'
),
course_info
[
'structure'
][
'_id'
]
course_info
[
'structure'
][
'_id'
]
)
)
self
.
modulestore
.
cache_items
(
self
,
[
block_id
],
course_key
,
lazy
=
self
.
lazy
)
self
.
modulestore
.
cache_items
(
self
,
[
block_id
],
course_key
,
lazy
=
self
.
lazy
)
...
@@ -97,7 +97,8 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
...
@@ -97,7 +97,8 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
# most recent retrieval is most likely the right one for next caller (see comment above fn)
# most recent retrieval is most likely the right one for next caller (see comment above fn)
self
.
course_entry
[
'branch'
]
=
course_entry_override
[
'branch'
]
self
.
course_entry
[
'branch'
]
=
course_entry_override
[
'branch'
]
self
.
course_entry
[
'org'
]
=
course_entry_override
[
'org'
]
self
.
course_entry
[
'org'
]
=
course_entry_override
[
'org'
]
self
.
course_entry
[
'offering'
]
=
course_entry_override
[
'offering'
]
self
.
course_entry
[
'course'
]
=
course_entry_override
[
'course'
]
self
.
course_entry
[
'run'
]
=
course_entry_override
[
'run'
]
# most likely a lazy loader or the id directly
# most likely a lazy loader or the id directly
definition
=
json_data
.
get
(
'definition'
,
{})
definition
=
json_data
.
get
(
'definition'
,
{})
definition_id
=
self
.
modulestore
.
definition_locator
(
definition
)
definition_id
=
self
.
modulestore
.
definition_locator
(
definition
)
...
@@ -110,7 +111,8 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
...
@@ -110,7 +111,8 @@ class CachingDescriptorSystem(MakoDescriptorSystem):
CourseLocator
(
CourseLocator
(
version_guid
=
course_entry_override
[
'structure'
][
'_id'
],
version_guid
=
course_entry_override
[
'structure'
][
'_id'
],
org
=
course_entry_override
.
get
(
'org'
),
org
=
course_entry_override
.
get
(
'org'
),
offering
=
course_entry_override
.
get
(
'offering'
),
course
=
course_entry_override
.
get
(
'course'
),
run
=
course_entry_override
.
get
(
'run'
),
branch
=
course_entry_override
.
get
(
'branch'
),
branch
=
course_entry_override
.
get
(
'branch'
),
),
),
block_type
=
json_data
.
get
(
'category'
),
block_type
=
json_data
.
get
(
'category'
),
...
...
common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py
View file @
e39cc5df
...
@@ -84,7 +84,7 @@ class MongoConnection(object):
...
@@ -84,7 +84,7 @@ class MongoConnection(object):
return
self
.
course_index
.
find_one
(
return
self
.
course_index
.
find_one
(
son
.
SON
([
son
.
SON
([
(
key_attr
,
re
.
compile
(
case_regex
.
format
(
getattr
(
key
,
key_attr
))))
(
key_attr
,
re
.
compile
(
case_regex
.
format
(
getattr
(
key
,
key_attr
))))
for
key_attr
in
(
'org'
,
'
offering
'
)
for
key_attr
in
(
'org'
,
'
course'
,
'run
'
)
])
])
)
)
...
@@ -106,7 +106,7 @@ class MongoConnection(object):
...
@@ -106,7 +106,7 @@ class MongoConnection(object):
Update the db record for course_index
Update the db record for course_index
"""
"""
self
.
course_index
.
update
(
self
.
course_index
.
update
(
son
.
SON
([(
'org'
,
course_index
[
'org'
]),
(
'
offering'
,
course_index
[
'offering
'
])]),
son
.
SON
([(
'org'
,
course_index
[
'org'
]),
(
'
course'
,
course_index
[
'course'
]),
(
'run'
,
course_index
[
'run
'
])]),
course_index
course_index
)
)
...
@@ -114,7 +114,11 @@ class MongoConnection(object):
...
@@ -114,7 +114,11 @@ class MongoConnection(object):
"""
"""
Delete the course_index from the persistence mechanism whose id is the given course_index
Delete the course_index from the persistence mechanism whose id is the given course_index
"""
"""
return
self
.
course_index
.
remove
(
son
.
SON
([(
'org'
,
course_index
[
'org'
]),
(
'offering'
,
course_index
[
'offering'
])]))
return
self
.
course_index
.
remove
(
son
.
SON
([
(
'org'
,
course_index
[
'org'
]),
(
'course'
,
course_index
[
'course'
]),
(
'run'
,
course_index
[
'run'
])
]))
def
get_definition
(
self
,
key
):
def
get_definition
(
self
,
key
):
"""
"""
...
...
common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
View file @
e39cc5df
This diff is collapsed.
Click to expand it.
common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
View file @
e39cc5df
...
@@ -123,11 +123,7 @@ class TestMixedModuleStore(LocMapperSetupSansDjango):
...
@@ -123,11 +123,7 @@ class TestMixedModuleStore(LocMapperSetupSansDjango):
"""
"""
Create a course w/ one item in the persistence store using the given course & item location.
Create a course w/ one item in the persistence store using the given course & item location.
"""
"""
if
default
==
'split'
:
course
=
self
.
store
.
create_course
(
course_key
.
org
,
course_key
.
course
,
course_key
.
run
,
self
.
user_id
)
offering
=
course_key
.
offering
.
replace
(
'/'
,
'.'
)
else
:
offering
=
course_key
.
offering
course
=
self
.
store
.
create_course
(
course_key
.
org
,
offering
,
self
.
user_id
)
category
=
self
.
writable_chapter_location
.
category
category
=
self
.
writable_chapter_location
.
category
block_id
=
self
.
writable_chapter_location
.
name
block_id
=
self
.
writable_chapter_location
.
name
chapter
=
self
.
store
.
create_item
(
chapter
=
self
.
store
.
create_item
(
...
@@ -367,7 +363,11 @@ class TestMixedModuleStore(LocMapperSetupSansDjango):
...
@@ -367,7 +363,11 @@ class TestMixedModuleStore(LocMapperSetupSansDjango):
xml_store
=
self
.
store
.
_get_modulestore_by_type
(
ModuleStoreEnum
.
Type
.
xml
)
xml_store
=
self
.
store
.
_get_modulestore_by_type
(
ModuleStoreEnum
.
Type
.
xml
)
# the important thing is not which exception it raises but that it raises an exception
# the important thing is not which exception it raises but that it raises an exception
with
self
.
assertRaises
(
AttributeError
):
with
self
.
assertRaises
(
AttributeError
):
<<<<<<<
HEAD
xml_store
.
create_course
(
"org"
,
"course/run"
,
self
.
user_id
)
xml_store
.
create_course
(
"org"
,
"course/run"
,
self
.
user_id
)
=======
xml_store
.
create_course
(
"org"
,
"course"
,
"run"
,
999
)
>>>>>>>
Fix
up
the
signature
to
use
course
and
run
instead
of
just
offering
@ddt.data
(
'draft'
,
'split'
)
@ddt.data
(
'draft'
,
'split'
)
def
test_get_course
(
self
,
default_ms
):
def
test_get_course
(
self
,
default_ms
):
...
...
common/lib/xmodule/xmodule/modulestore/tests/test_orphan.py
View file @
e39cc5df
...
@@ -31,9 +31,9 @@ class TestOrphan(SplitWMongoCourseBoostrapper):
...
@@ -31,9 +31,9 @@ class TestOrphan(SplitWMongoCourseBoostrapper):
"""
"""
orphans
=
self
.
old_mongo
.
get_orphans
(
self
.
old_course_key
)
orphans
=
self
.
old_mongo
.
get_orphans
(
self
.
old_course_key
)
self
.
assertEqual
(
len
(
orphans
),
3
,
"Wrong # {}"
.
format
(
orphans
))
self
.
assertEqual
(
len
(
orphans
),
3
,
"Wrong # {}"
.
format
(
orphans
))
location
=
self
.
old_course_key
.
make_usage_key
(
'chapter'
,
name
=
'OrphanChapter'
)
location
=
self
.
old_course_key
.
make_usage_key
(
'chapter'
,
'OrphanChapter'
)
self
.
assertIn
(
location
.
to_deprecated_string
(),
orphans
)
self
.
assertIn
(
location
.
to_deprecated_string
(),
orphans
)
location
=
self
.
old_course_key
.
make_usage_key
(
'vertical'
,
name
=
'OrphanVert'
)
location
=
self
.
old_course_key
.
make_usage_key
(
'vertical'
,
'OrphanVert'
)
self
.
assertIn
(
location
.
to_deprecated_string
(),
orphans
)
self
.
assertIn
(
location
.
to_deprecated_string
(),
orphans
)
location
=
self
.
old_course_key
.
make_usage_key
(
'html'
,
'OrphanHtml'
)
location
=
self
.
old_course_key
.
make_usage_key
(
'html'
,
'OrphanHtml'
)
self
.
assertIn
(
location
.
to_deprecated_string
(),
orphans
)
self
.
assertIn
(
location
.
to_deprecated_string
(),
orphans
)
...
...
common/lib/xmodule/xmodule/modulestore/tests/test_publish.py
View file @
e39cc5df
...
@@ -63,7 +63,7 @@ class TestPublish(SplitWMongoCourseBoostrapper):
...
@@ -63,7 +63,7 @@ class TestPublish(SplitWMongoCourseBoostrapper):
To reproduce a bug (STUD-811) publish a vertical, convert to draft, delete a child, move a child, publish.
To reproduce a bug (STUD-811) publish a vertical, convert to draft, delete a child, move a child, publish.
See if deleted and moved children still is connected or exists in db (bug was disconnected but existed)
See if deleted and moved children still is connected or exists in db (bug was disconnected but existed)
"""
"""
vert_location
=
self
.
old_course_key
.
make_usage_key
(
'vertical'
,
name
=
'Vert1'
)
vert_location
=
self
.
old_course_key
.
make_usage_key
(
'vertical'
,
block_id
=
'Vert1'
)
item
=
self
.
draft_mongo
.
get_item
(
vert_location
,
2
)
item
=
self
.
draft_mongo
.
get_item
(
vert_location
,
2
)
# Vert1 has 3 children; so, publishes 4 nodes which may mean 4 inserts & 1 bulk remove
# Vert1 has 3 children; so, publishes 4 nodes which may mean 4 inserts & 1 bulk remove
# 25-June-2014 find calls are 19. Probably due to inheritance recomputation?
# 25-June-2014 find calls are 19. Probably due to inheritance recomputation?
...
@@ -78,16 +78,16 @@ class TestPublish(SplitWMongoCourseBoostrapper):
...
@@ -78,16 +78,16 @@ class TestPublish(SplitWMongoCourseBoostrapper):
# however, children are still draft, but I'm not sure that's by design
# however, children are still draft, but I'm not sure that's by design
# delete the draft version of the discussion
# delete the draft version of the discussion
location
=
self
.
old_course_key
.
make_usage_key
(
'discussion'
,
name
=
'Discussion1'
)
location
=
self
.
old_course_key
.
make_usage_key
(
'discussion'
,
block_id
=
'Discussion1'
)
self
.
draft_mongo
.
delete_item
(
location
,
self
.
userid
)
self
.
draft_mongo
.
delete_item
(
location
,
self
.
userid
)
draft_vert
=
self
.
draft_mongo
.
get_item
(
vert_location
,
0
)
draft_vert
=
self
.
draft_mongo
.
get_item
(
vert_location
,
0
)
self
.
assertTrue
(
getattr
(
draft_vert
,
'is_draft'
,
False
),
"Deletion didn't convert parent to draft"
)
self
.
assertTrue
(
getattr
(
draft_vert
,
'is_draft'
,
False
),
"Deletion didn't convert parent to draft"
)
self
.
assertNotIn
(
location
,
draft_vert
.
children
)
self
.
assertNotIn
(
location
,
draft_vert
.
children
)
# move the other child
# move the other child
other_child_loc
=
self
.
old_course_key
.
make_usage_key
(
'html'
,
name
=
'Html2'
)
other_child_loc
=
self
.
old_course_key
.
make_usage_key
(
'html'
,
block_id
=
'Html2'
)
draft_vert
.
children
.
remove
(
other_child_loc
)
draft_vert
.
children
.
remove
(
other_child_loc
)
other_vert
=
self
.
draft_mongo
.
get_item
(
self
.
old_course_key
.
make_usage_key
(
'vertical'
,
name
=
'Vert2'
),
0
)
other_vert
=
self
.
draft_mongo
.
get_item
(
self
.
old_course_key
.
make_usage_key
(
'vertical'
,
block_id
=
'Vert2'
),
0
)
other_vert
.
children
.
append
(
other_child_loc
)
other_vert
.
children
.
append
(
other_child_loc
)
self
.
draft_mongo
.
update_item
(
draft_vert
,
self
.
userid
)
self
.
draft_mongo
.
update_item
(
draft_vert
,
self
.
userid
)
self
.
draft_mongo
.
update_item
(
other_vert
,
self
.
userid
)
self
.
draft_mongo
.
update_item
(
other_vert
,
self
.
userid
)
...
...
common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
View file @
e39cc5df
This diff is collapsed.
Click to expand it.
common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py
View file @
e39cc5df
...
@@ -40,7 +40,7 @@ class SplitWMongoCourseBoostrapper(unittest.TestCase):
...
@@ -40,7 +40,7 @@ class SplitWMongoCourseBoostrapper(unittest.TestCase):
'xblock_mixins'
:
(
InheritanceMixin
,)
'xblock_mixins'
:
(
InheritanceMixin
,)
}
}
split_course_key
=
CourseLocator
(
'test_org'
,
'test_course
.
runid'
,
branch
=
ModuleStoreEnum
.
BranchName
.
draft
)
split_course_key
=
CourseLocator
(
'test_org'
,
'test_course
'
,
'
runid'
,
branch
=
ModuleStoreEnum
.
BranchName
.
draft
)
def
setUp
(
self
):
def
setUp
(
self
):
self
.
db_config
[
'collection'
]
=
'modulestore{0}'
.
format
(
uuid
.
uuid4
()
.
hex
[:
5
])
self
.
db_config
[
'collection'
]
=
'modulestore{0}'
.
format
(
uuid
.
uuid4
()
.
hex
[:
5
])
...
@@ -135,8 +135,8 @@ class SplitWMongoCourseBoostrapper(unittest.TestCase):
...
@@ -135,8 +135,8 @@ class SplitWMongoCourseBoostrapper(unittest.TestCase):
if
split
:
if
split
:
# split requires the course to be created separately from creating items
# split requires the course to be created separately from creating items
self
.
split_mongo
.
create_course
(
self
.
split_mongo
.
create_course
(
self
.
split_course_key
.
org
,
self
.
split_course_key
.
offering
,
self
.
userid
,
fields
=
fields
,
root_block_id
=
'runid'
self
.
split_course_key
.
org
,
self
.
split_course_key
.
course
,
self
.
split_course_key
.
run
,
self
.
userid
,
fields
=
fields
,
root_block_id
=
'runid'
)
)
old_course
=
self
.
old_mongo
.
create_course
(
self
.
split_course_key
.
org
,
'test_course
/runid'
,
self
.
user
id
,
fields
=
fields
)
old_course
=
self
.
old_mongo
.
create_course
(
self
.
split_course_key
.
org
,
'test_course
'
,
'runid'
,
self
.
user_
id
,
fields
=
fields
)
self
.
old_course_key
=
old_course
.
id
self
.
old_course_key
=
old_course
.
id
self
.
runtime
=
old_course
.
runtime
self
.
runtime
=
old_course
.
runtime
common/lib/xmodule/xmodule/modulestore/xml_importer.py
View file @
e39cc5df
...
@@ -172,7 +172,7 @@ def import_from_xml(
...
@@ -172,7 +172,7 @@ def import_from_xml(
# Creates a new course if it doesn't already exist
# Creates a new course if it doesn't already exist
if
create_new_course_if_not_present
and
not
store
.
has_course
(
dest_course_id
,
ignore_case
=
True
):
if
create_new_course_if_not_present
and
not
store
.
has_course
(
dest_course_id
,
ignore_case
=
True
):
try
:
try
:
store
.
create_course
(
dest_course_id
.
org
,
dest_course_id
.
offering
,
user_id
)
store
.
create_course
(
dest_course_id
.
org
,
dest_course_id
.
course
,
dest_course_id
.
run
,
user_id
)
except
InvalidLocationError
:
except
InvalidLocationError
:
# course w/ same org and course exists
# course w/ same org and course exists
log
.
debug
(
log
.
debug
(
...
...
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