You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/05/20 13:14:11 UTC

[08/14] allura git commit: [#7878] ticket:771 Convert all ming.collection names to bytes

[#7878] ticket:771 Convert all ming.collection names to bytes


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/9b6e0b5a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/9b6e0b5a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/9b6e0b5a

Branch: refs/heads/ib/7878
Commit: 9b6e0b5a225edd33b3a51d96a00f26c171e2cb5d
Parents: e900dda
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue May 19 10:26:16 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue May 19 10:26:16 2015 +0000

----------------------------------------------------------------------
 Allura/allura/model/auth.py       |  2 +-
 Allura/allura/model/index.py      |  4 ++--
 Allura/allura/model/repository.py | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/9b6e0b5a/Allura/allura/model/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py
index 71a7bf1..e5c913a 100644
--- a/Allura/allura/model/auth.py
+++ b/Allura/allura/model/auth.py
@@ -965,7 +965,7 @@ class ProjectRole(MappedClass):
 
 
 audit_log = collection(
-    'audit_log', main_doc_session,
+    b'audit_log', main_doc_session,
     Field('_id', S.ObjectId()),
     Field('project_id', S.ObjectId, if_missing=None,
           index=True),  # main view of audit log queries by project_id

http://git-wip-us.apache.org/repos/asf/allura/blob/9b6e0b5a/Allura/allura/model/index.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/index.py b/Allura/allura/model/index.py
index cd4be6e..db4758a 100644
--- a/Allura/allura/model/index.py
+++ b/Allura/allura/model/index.py
@@ -45,7 +45,7 @@ log = logging.getLogger(__name__)
 
 # Collection definitions
 ArtifactReferenceDoc = collection(
-    'artifact_reference', main_doc_session,
+    b'artifact_reference', main_doc_session,
     Field('_id', str),
     Field('artifact_reference', dict(
         cls=S.Binary(),
@@ -57,7 +57,7 @@ ArtifactReferenceDoc = collection(
 )
 
 ShortlinkDoc = collection(
-    'shortlink', main_doc_session,
+    b'shortlink', main_doc_session,
     Field('_id', S.ObjectId()),
     # index needed for from_artifact() and index_tasks.py:del_artifacts
     Field('ref_id', str, index=True),

http://git-wip-us.apache.org/repos/asf/allura/blob/9b6e0b5a/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 4287a18..a34c065 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -911,7 +911,7 @@ class MergeRequest(VersionedArtifact, ActivityObject):
 # One of these for each commit in the physical repo on disk. The _id is the
 # hexsha of the commit (for Git and Hg).
 CommitDoc = collection(
-    'repo_ci', main_doc_session,
+    b'repo_ci', main_doc_session,
     Field('_id', str),
     Field('tree_id', str),
     Field('committed', SUser),
@@ -923,7 +923,7 @@ CommitDoc = collection(
 
 # Basic tree information (also see TreesDoc)
 TreeDoc = collection(
-    'repo_tree', main_doc_session,
+    b'repo_tree', main_doc_session,
     Field('_id', str),
     Field('tree_ids', [dict(name=str, id=str)]),
     Field('blob_ids', [dict(name=str, id=str)]),
@@ -931,7 +931,7 @@ TreeDoc = collection(
 
 # Information about the last commit to touch a tree
 LastCommitDoc = collection(
-    'repo_last_commit', main_doc_session,
+    b'repo_last_commit', main_doc_session,
     Field('_id', S.ObjectId()),
     Field('commit_id', str),
     Field('path', str),
@@ -944,14 +944,14 @@ LastCommitDoc = collection(
 # TreesDoc._id = CommitDoc._id
 # TreesDoc.tree_ids = [ TreeDoc._id, ... ]
 TreesDoc = collection(
-    'repo_trees', main_doc_session,
+    b'repo_trees', main_doc_session,
     Field('_id', str),
     Field('tree_ids', [str]))
 
 # List of commit runs (a run is a linear series of single-parent commits)
 # CommitRunDoc.commit_ids = [ CommitDoc._id, ... ]
 CommitRunDoc = collection(
-    'repo_commitrun', main_doc_session,
+    b'repo_commitrun', main_doc_session,
     Field('_id', str),
     Field('parent_commit_ids', [str], index=True),
     Field('commit_ids', [str], index=True),