Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimized import project functionality. #800

Merged
merged 2 commits into from
Jan 22, 2016
Merged

Optimized import project functionality. #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3201583
Optimized import project functionality.
kecso Jan 20, 2016
f4bce99
#800 enhanced code according to review findings
kecso Jan 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 40 additions & 31 deletions src/common/core/users/serialization.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ define(['common/util/assert', 'blob/BlobConfig'], function (ASSERT, BlobConfig)
ongoingTaskCounter = 0,
timerId,
root = core.getRoot(libraryRoot);

function getAttributes(node) {
var names = core.getOwnAttributeNames(node).sort(),
i,
Expand Down Expand Up @@ -829,9 +829,7 @@ define(['common/util/assert', 'blob/BlobConfig'], function (ASSERT, BlobConfig)
jsonExport,
nodes,
logTxt = '',
toRemoveGuids = [],
toUpdateGuids = [],
toInsertGuids = [];
guids = {};

function log(txt) {
logTxt += '\n' + txt;
Expand Down Expand Up @@ -958,7 +956,7 @@ define(['common/util/assert', 'blob/BlobConfig'], function (ASSERT, BlobConfig)
}

function updateNodes(guid, parent, containmentTreeObject) {
if (toUpdateGuids.indexOf(guid) !== -1) {
if (guids[guid] === 'update') {
updateNode(guid, parent);
}

Expand All @@ -968,7 +966,7 @@ define(['common/util/assert', 'blob/BlobConfig'], function (ASSERT, BlobConfig)
relid;

for (i = 0; i < keys.length; i++) {
if (toUpdateGuids.indexOf(keys[i]) === -1) {
if (guids[keys[i]] !== 'update') {
relid = updatedLibraryJson.relids[keys[i]];
if (core.getChildrenRelids(node).indexOf(relid) !== -1) {
relid = undefined;
Expand Down Expand Up @@ -1048,16 +1046,21 @@ define(['common/util/assert', 'blob/BlobConfig'], function (ASSERT, BlobConfig)
};

//pointers
keys = core.getOwnPointerNames(node);
for (i = 0; i < keys.length; i++) {
core.deletePointer(node, keys[i]);
//The base pointer should be always removed, as at this point it could be already set falsly.
core.deletePointer(node, 'base');
if (guids[guid] === 'update') {
keys = core.getOwnPointerNames(node);
for (i = 0; i < keys.length; i++) {
core.deletePointer(node, keys[i]);
}
}

keys = Object.keys(jsonNode.pointers);
for (i = 0; i < keys.length; i++) {
target = jsonNode.pointers[keys[i]];
if (target === null) {
core.setPointer(node, keys[i], null);
} else if (nodes[target] && toRemoveGuids.indexOf(target) === -1) {
} else if (nodes[target] && guids[target] !== 'remove') {
core.setPointer(node, keys[i], nodes[target]);
} else if (isCombinedId(target)) {
core.setPointer(node, keys[i], getCombinedTarget(target));
Expand All @@ -1068,10 +1071,13 @@ define(['common/util/assert', 'blob/BlobConfig'], function (ASSERT, BlobConfig)
}

//sets
keys = core.getSetNames(node);
for (i = 0; i < keys.length; i++) {
core.deleteSet(node, keys[i]);
if (guids[guid] === 'update') {
keys = core.getSetNames(node);
for (i = 0; i < keys.length; i++) {
core.deleteSet(node, keys[i]);
}
}

keys = Object.keys(jsonNode.sets);
for (i = 0; i < keys.length; i++) {
//for every set we create it, go through its members...
Expand Down Expand Up @@ -1170,7 +1176,9 @@ define(['common/util/assert', 'blob/BlobConfig'], function (ASSERT, BlobConfig)
}

function updateMeta(guid) {
core.clearMetaRules(nodes[guid]);
if (guids[guid] === 'update') {
core.clearMetaRules(nodes[guid]);
}

updateAttributeMeta(guid);
updateChildrenMeta(guid);
Expand Down Expand Up @@ -1290,44 +1298,45 @@ define(['common/util/assert', 'blob/BlobConfig'], function (ASSERT, BlobConfig)
//now we fill the insert/update/remove lists of GUIDs
var oldkeys = Object.keys(jsonExport.nodes),
newkeys = Object.keys(updatedLibraryJson.nodes),
delkeys = [],
parent,
i;

//TODO now we make three rounds although one would be sufficient on ordered lists
for (i = 0; i < oldkeys.length; i++) {
if (newkeys.indexOf(oldkeys[i]) === -1) {
if (!updatedLibraryJson.nodes[oldkeys[i]]) {
log('node ' + logId(jsonExport.nodes, oldkeys[i]) +
', all of its sub-types and its children will be removed');

toRemoveGuids.push(oldkeys[i]);
guids[oldkeys[i]] = 'remove';
delkeys.push(oldkeys[i]);
}
}

for (i = 0; i < oldkeys.length; i++) {
if (newkeys.indexOf(oldkeys[i]) !== -1) {
if (updatedLibraryJson.nodes[oldkeys[i]]) {
log('node ' + logId(jsonExport.nodes, oldkeys[i]) + ' will be updated');
toUpdateGuids.push(oldkeys[i]);
guids[oldkeys[i]] = 'update';
}
}

for (i = 0; i < newkeys.length; i++) {
if (oldkeys.indexOf(newkeys[i]) === -1) {
if (!jsonExport.nodes[newkeys[i]]) {
log('node ' + logId(jsonExport.nodes, newkeys[i]) + ' will be added');
toInsertGuids.push(newkeys[i]);
guids[newkeys[i]] = 'insert';
}
}

//Now we normalize the removedGUIDs by containment and remove them
var toDelete = [],
parent;
for (i = 0; i < toRemoveGuids.length; i++) {
parent = core.getParent(nodes[toRemoveGuids[i]]);
if (parent && toRemoveGuids.indexOf(core.getGuid(parent)) === -1) {
toDelete.push(toRemoveGuids[i]);
// Now we consolidate node list based on containment to minimize the number of deletion.
i = delkeys.length;
while (--i > 0) {
parent = core.getParent(nodes[delkeys[i]]);
if (!parent || guids[core.getGuid(parent)] === 'remove') {
delkeys.splice(i, 1);
}
}
//and as a final step we remove all that is needed
for (i = 0; i < toDelete.length; i++) {
core.deleteNode(nodes[toDelete[i]]);
// Finally we remove the necessary nodes.
for (i = 0; i < delkeys.length; i += 1) {
core.deleteNode(nodes[delkeys[i]]);
}

//as a second step we should deal with the updated nodes
Expand Down
4 changes: 3 additions & 1 deletion test-karma/client/js/client.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4313,12 +4313,14 @@ describe('GME client', function () {
superagent.get(url, function (err, result) {
expect(err).to.equal(null);

expect(result.body).to.deep.equal(refNodeProj);
client.deleteProject(projectId, function (err /*, didExist*/) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity, does this this change really matter?

expect(err).to.equal(null, 'deleteProject returned error');

done();
});

expect(result.body).to.deep.equal(refNodeProj);

});
}
);
Expand Down