Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shorten collection name to keep index name w/in limit

Browse Source
This commit is contained in:
Don Mitchell
2013-12-06 15:33:59 -05:00
parent b5691cd4d1
commit 298e7a2343
9 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/lib/xmodule/xmodule/modulestore/mongo/base.py
View File

@@ -297,7 +297,6 @@ class MongoModuleStore(ModuleStoreWriteBase):
# that is used when querying by a location
self.collection.ensure_index(
zip(('_id.' + field for field in Location._fields), repeat(1)),
name="location_index"
)
if default_class is not None:

6
common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
View File

@@ -55,7 +55,7 @@ def mongo_store_config(data_dir):
'DOC_STORE_CONFIG': {
'host': 'localhost',
'db': 'test_xmodule',
'collection': 'modulestore_%s' % uuid4().hex,
'collection': 'modulestore{0}'.format(uuid4().hex[:5]),
},
'OPTIONS': {
'default_class': 'xmodule.raw_module.RawDescriptor',
@@ -86,7 +86,7 @@ def draft_mongo_store_config(data_dir):
'DOC_STORE_CONFIG': {
'host': 'localhost',
'db': 'test_xmodule',
'collection': 'modulestore_%s' % uuid4().hex,
'collection': 'modulestore{0}'.format(uuid4().hex[:5]),
},
'OPTIONS': modulestore_options
}
@@ -121,7 +121,7 @@ def studio_store_config(data_dir):
store_config = {
'host': 'localhost',
'db': 'test_xmodule',
'collection': 'modulestore_%s' % uuid4().hex,
'collection': 'modulestore{0}'.format(uuid4().hex[:5]),
}
options = {
'default_class': 'xmodule.raw_module.RawDescriptor',

2
common/lib/xmodule/xmodule/modulestore/tests/test_location_mapper.py
View File

@@ -20,7 +20,7 @@ class TestLocationMapper(unittest.TestCase):
modulestore_options = {
'host': 'localhost',
'db': 'test_xmodule',
'collection': 'modulestore{0}'.format(uuid.uuid4().hex),
'collection': 'modulestore{0}'.format(uuid.uuid4().hex[:5]),
}
# pylint: disable=W0142

2
common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
View File

@@ -21,7 +21,7 @@ from xmodule.modulestore.mixed import MixedModuleStore
HOST = 'localhost'
PORT = 27017
DB = 'test_mongo_%s' % uuid4().hex
DB = 'test_mongo_%s' % uuid4().hex[:5]
COLLECTION = 'modulestore'
FS_ROOT = DATA_DIR
DEFAULT_CLASS = 'xmodule.raw_module.RawDescriptor'

2
common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
View File

@@ -28,7 +28,7 @@ log = logging.getLogger(__name__)
HOST = 'localhost'
PORT = 27017
DB = 'test_mongo_%s' % uuid4().hex
DB = 'test_mongo_%s' % uuid4().hex[:5]
COLLECTION = 'modulestore'
FS_ROOT = DATA_DIR # TODO (vshnayder): will need a real fs_root for testing load_item
DEFAULT_CLASS = 'xmodule.raw_module.RawDescriptor'

2
common/lib/xmodule/xmodule/modulestore/tests/test_orphan.py
View File

@@ -33,7 +33,7 @@ class TestOrphan(unittest.TestCase):
split_course_id = 'test_org.test_course.runid'
def setUp(self):
self.db_config['collection'] = 'modulestore{0}'.format(uuid.uuid4().hex)
self.db_config['collection'] = 'modulestore{0}'.format(uuid.uuid4().hex[:5])
self.userid = random.getrandbits(32)
super(TestOrphan, self).setUp()

2
common/lib/xmodule/xmodule/modulestore/tests/test_publish.py
View File

@@ -34,7 +34,7 @@ class TestPublish(unittest.TestCase):
}
def setUp(self):
self.db_config['collection'] = 'modulestore{0}'.format(uuid.uuid4().hex)
self.db_config['collection'] = 'modulestore{0}'.format(uuid.uuid4().hex[:5])
self.old_mongo = MongoModuleStore(self.db_config, **self.modulestore_options)
self.draft_mongo = DraftMongoModuleStore(self.db_config, **self.modulestore_options)

2
common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
View File

@@ -31,7 +31,7 @@ class TestMigration(unittest.TestCase):
db_config = {
'host': 'localhost',
'db': 'test_xmodule',
'collection': 'modulestore{0}'.format(uuid.uuid4().hex),
'collection': 'modulestore{0}'.format(uuid.uuid4().hex[:5]),
}
modulestore_options = {

2
common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
View File

@@ -32,7 +32,7 @@ class SplitModuleTest(unittest.TestCase):
DOC_STORE_CONFIG = {
'host': 'localhost',
'db': 'test_xmodule',
'collection': 'modulestore{0}'.format(uuid.uuid4().hex),
'collection': 'modulestore{0}'.format(uuid.uuid4().hex[:5]),
}
modulestore_options = {
'default_class': 'xmodule.raw_module.RawDescriptor',