You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2013/07/12 00:33:30 UTC
[lucy-commits] [05/11] git commit: refs/heads/ivars-wip1 - Fixup Lucy store classes
IVARS glitches.
Fixup Lucy store classes IVARS glitches.
(Will be folded into earlier commit before merging to master.)
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/7af7e94f
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/7af7e94f
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/7af7e94f
Branch: refs/heads/ivars-wip1
Commit: 7af7e94f8cfeb0002a7701891746c6ef75244986
Parents: 1338770
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Thu Jul 11 15:02:53 2013 -0700
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Thu Jul 11 15:02:53 2013 -0700
----------------------------------------------------------------------
core/Lucy/Store/RAMFolder.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/7af7e94f/core/Lucy/Store/RAMFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMFolder.c b/core/Lucy/Store/RAMFolder.c
index 77440e1..055ef04 100644
--- a/core/Lucy/Store/RAMFolder.c
+++ b/core/Lucy/Store/RAMFolder.c
@@ -186,7 +186,8 @@ S_rename_or_hard_link(RAMFolder *self, const CharBuf* from, const CharBuf *to,
}
// Find the original element.
- elem = Hash_Fetch(inner_from_folder->entries, (Obj*)from_name);
+ elem = Hash_Fetch(RAMFolder_IVARS(inner_from_folder)->entries,
+ (Obj*)from_name);
if (!elem) {
if (Folder_Is_A(from_folder, COMPOUNDFILEREADER)
&& Folder_Local_Exists(from_folder, (CharBuf*)from_name)
@@ -202,7 +203,8 @@ S_rename_or_hard_link(RAMFolder *self, const CharBuf* from, const CharBuf *to,
// Execute the rename/hard-link.
if (op == OP_RENAME) {
- Obj *existing = Hash_Fetch(inner_to_folder->entries, (Obj*)to_name);
+ Obj *existing = Hash_Fetch(RAMFolder_IVARS(inner_to_folder)->entries,
+ (Obj*)to_name);
if (existing) {
bool conflict = false;
@@ -234,8 +236,10 @@ S_rename_or_hard_link(RAMFolder *self, const CharBuf* from, const CharBuf *to,
// Perform the store first, then the delete. Inform Folder objects
// about the relocation.
- Hash_Store(inner_to_folder->entries, (Obj*)to_name, INCREF(elem));
- DECREF(Hash_Delete(inner_from_folder->entries, (Obj*)from_name));
+ Hash_Store(RAMFolder_IVARS(inner_to_folder)->entries,
+ (Obj*)to_name, INCREF(elem));
+ DECREF(Hash_Delete(RAMFolder_IVARS(inner_from_folder)->entries,
+ (Obj*)from_name));
if (Obj_Is_A(elem, FOLDER)) {
CharBuf *newpath = S_fullpath(inner_to_folder, (CharBuf*)to_name);
Folder_Set_Path((Folder*)elem, newpath);
@@ -250,14 +254,15 @@ S_rename_or_hard_link(RAMFolder *self, const CharBuf* from, const CharBuf *to,
}
else {
Obj *existing
- = Hash_Fetch(inner_to_folder->entries, (Obj*)to_name);
+ = Hash_Fetch(RAMFolder_IVARS(inner_to_folder)->entries,
+ (Obj*)to_name);
if (existing) {
Err_set_error(Err_new(CB_newf("'%o' already exists", to)));
return false;
}
else {
- Hash_Store(inner_to_folder->entries, (Obj*)to_name,
- INCREF(elem));
+ Hash_Store(RAMFolder_IVARS(inner_to_folder)->entries,
+ (Obj*)to_name, INCREF(elem));
}
}
}
@@ -312,7 +317,7 @@ RAMFolder_local_delete(RAMFolder *self, const CharBuf *name) {
else {
inner_folder = (RAMFolder*)CERTIFY(entry, RAMFOLDER);
}
- if (Hash_Get_Size(inner_folder->entries)) {
+ if (Hash_Get_Size(RAMFolder_IVARS(inner_folder)->entries)) {
// Can't delete non-empty dir.
return false;
}