Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Michael Hackstein 2014-05-20 11:39:37 +02:00
parent d89ff71dbc c9e49c5446
commit 1be58a157c
3 changed files with 165 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
UnitTests/Basics/structure-size-test.cpp
View File

@ -121,32 +121,6 @@ BOOST_AUTO_TEST_CASE (tst_df_footer_marker) {
BOOST_CHECK_EQUAL(28, offsetof(struct TRI_df_footer_marker_s, _totalSize)); BOOST_CHECK_EQUAL(28, offsetof(struct TRI_df_footer_marker_s, _totalSize));
} }
////////////////////////////////////////////////////////////////////////////////
/// @brief test sizeof TRI_df_document_marker_t
////////////////////////////////////////////////////////////////////////////////
BOOST_AUTO_TEST_CASE (tst_df_document_marker) {
size_t s = sizeof(TRI_df_document_marker_t);
BOOST_CHECK_EQUAL(24, s); // base + own size
BOOST_CHECK_EQUAL(true, s % 8 == 0);
BOOST_CHECK_EQUAL( 0, offsetof(struct TRI_df_document_marker_s, base));
}
////////////////////////////////////////////////////////////////////////////////
/// @brief test sizeof TRI_df_skip_marker_t
////////////////////////////////////////////////////////////////////////////////
BOOST_AUTO_TEST_CASE (tst_df_skip_marker) {
size_t s = sizeof(TRI_df_skip_marker_t);
BOOST_CHECK_EQUAL(24, s); // base + own size
BOOST_CHECK_EQUAL(true, s % 8 == 0);
BOOST_CHECK_EQUAL( 0, offsetof(struct TRI_df_skip_marker_s, base));
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief test sizeof TRI_col_header_marker_t /// @brief test sizeof TRI_col_header_marker_t
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

9
arangod/VocBase/datafile.h
View File

@ -415,15 +415,6 @@ typedef struct TRI_df_document_marker_s {
} }
TRI_df_document_marker_t; TRI_df_document_marker_t;
////////////////////////////////////////////////////////////////////////////////
/// @brief datafile skip marker
////////////////////////////////////////////////////////////////////////////////
typedef struct TRI_df_skip_marker_s {
TRI_df_marker_t base; // 24 bytes
}
TRI_df_skip_marker_t;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @} /// @}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

275
js/common/tests/shell-general-graph.js
View File

@ -696,198 +696,253 @@ function GeneralGraphAQLQueriesSuite() {
function EdgesAndVerticesSuite() { function EdgesAndVerticesSuite() {
try { var g;
arangodb.db._collection("_graphs").remove("_graphs/blubGraph")
} catch (err) {
}
var g = graph._create(
"blubGraph",
graph.edgeDefinitions(
graph._undirectedRelationDefinition("edgeCollection1", "vertexCollection1"),
graph._directedRelationDefinition("edgeCollection2",
["vertexCollection1", "vertexCollection2"], ["vertexCollection3", "vertexCollection4"]
)
)
);
var vertexIds = []; var vertexIds = [];
var vertexId1, vertexId2; var vertexId1, vertexId2;
var edgeId1, edgeId2; var edgeId1, edgeId2;
fillCollections = function() {
var ids = {};
var vertex = g.vertexCollection1.save({first_name: "Tam"});
ids["vId11"] = vertex._id;
vertex = g.vertexCollection1.save({first_name: "Tem"});
ids["vId12"] = vertex._id;
vertex = g.vertexCollection1.save({first_name: "Tim"});
ids["vId13"] = vertex._id;
vertex = g.vertexCollection1.save({first_name: "Tom"});
ids["vId14"] = vertex._id;
vertex = g.vertexCollection1.save({first_name: "Tum"});
ids["vId15"] = vertex._id;
vertex = g.unitTestVertexCollection3.save({first_name: "Tam"});
ids["vId31"] = vertex._id;
vertex = g.unitTestVertexCollection3.save({first_name: "Tem"});
ids["vId32"] = vertex._id;
vertex = g.unitTestVertexCollection3.save({first_name: "Tim"});
ids["vId33"] = vertex._id;
vertex = g.unitTestVertexCollection3.save({first_name: "Tom"});
ids["vId34"] = vertex._id;
vertex = g.unitTestVertexCollection3.save({first_name: "Tum"});
ids["vId35"] = vertex._id;
var edge = g.unitTestEdgeCollection1.save(ids.vId11, ids.vId12, {});
ids["eId11"] = edge._id;
edge = g.unitTestEdgeCollection1.save(ids.vId11, ids.vId13, {});
ids["eId12"] = edge._id;
edge = g.unitTestEdgeCollection1.save(ids.vId11, ids.vId14, {});
ids["eId13"] = edge._id;
edge = g.unitTestEdgeCollection1.save(ids.vId11, ids.vId15, {});
ids["eId14"] = edge._id;
edge = g.unitTestEdgeCollection1.save(ids.vId12, ids.vId11, {});
ids["eId15"] = edge._id;
edge = g.unitTestEdgeCollection1.save(ids.vId13, ids.vId11, {});
ids["eId16"] = edge._id;
edge = g.unitTestEdgeCollection1.save(ids.vId14, ids.vId11, {});
ids["eId17"] = edge._id;
edge = g.unitTestEdgeCollection1.save(ids.vId15, ids.vId11, {});
ids["eId18"] = edge._id;
edge = g.unitTestEdgeCollection2.save(ids.vId11, ids.vId31, {});
ids["eId21"] = edge._id;
edge = g.unitTestEdgeCollection2.save(ids.vId11, ids.vId32, {});
ids["eId22"] = edge._id;
edge = g.unitTestEdgeCollection2.save(ids.vId11, ids.vId33, {});
ids["eId23"] = edge._id;
edge = g.unitTestEdgeCollection2.save(ids.vId11, ids.vId34, {});
ids["eId24"] = edge._id;
edge = g.unitTestEdgeCollection2.save(ids.vId11, ids.vId35, {});
ids["eId25"] = edge._id;
return ids;
}
return { return {
setUp : function() {
try {
arangodb.db._collection("_graphs").remove("_graphs/blubGraph")
} catch (err) {
}
g = graph._create(
"blubGraph",
graph.edgeDefinitions(
graph._undirectedRelationDefinition("unitTestEdgeCollection1", "unitTestVertexCollection1"),
graph._directedRelationDefinition("unitTestEdgeCollection2",
["unitTestVertexCollection1", "unitTestVertexCollection2"], ["unitTestVertexCollection3", "unitTestVertexCollection4"]
)
)
);
},
tearDown : function() {
db.unitTestVertexCollection1.drop();
db.unitTestVertexCollection2.drop();
db.unitTestVertexCollection3.drop();
db.unitTestVertexCollection4.drop();
db.unitTestEdgeCollection1.drop();
db.unitTestEdgeCollection2.drop();
},
test_edgeCollections : function () { test_edgeCollections : function () {
var edgeCollections = g._edgeCollections(); var edgeCollections = g._edgeCollections();
assertEqual(edgeCollections[0].name(), 'edgeCollection1'); assertEqual(edgeCollections[0].name(), 'unitTestEdgeCollection1');
assertEqual(edgeCollections[1].name(), 'edgeCollection2'); assertEqual(edgeCollections[1].name(), 'unitTestEdgeCollection2');
}, },
test_vertexCollections : function () { test_vertexCollections : function () {
var vertexCollections = g._vertexCollections(); var vertexCollections = g._vertexCollections();
assertEqual(vertexCollections[0].name(), 'vertexCollection1'); assertEqual(vertexCollections[0].name(), 'unitTestVertexCollection1');
assertEqual(vertexCollections[1].name(), 'vertexCollection2'); assertEqual(vertexCollections[1].name(), 'unitTestVertexCollection2');
assertEqual(vertexCollections[2].name(), 'vertexCollection3'); assertEqual(vertexCollections[2].name(), 'unitTestVertexCollection3');
assertEqual(vertexCollections[3].name(), 'vertexCollection4'); assertEqual(vertexCollections[3].name(), 'unitTestVertexCollection4');
}, },
test_vC_save : function () { test_vC_save : function () {
var vertex = g.vertexCollection1.save({first_name: "Tom"}); var vertex = g.unitTestVertexCollection1.save({first_name: "Tom"});
assertFalse(vertex.error); assertFalse(vertex.error);
vertexId1 = vertex._id; vertexId1 = vertex._id;
var vertexObj = g.vertexCollection1.document(vertexId1); var vertexObj = g.unitTestVertexCollection1.document(vertexId1);
assertEqual(vertexObj.first_name, "Tom"); assertEqual(vertexObj.first_name, "Tom");
}, },
test_vC_replace : function () { test_vC_replace : function () {
var vertex = g.vertexCollection1.replace(vertexId1, {first_name: "Tim"}); var vertex = g.unitTestVertexCollection1.save({first_name: "Tom"});
var vertexId = vertex._id;
vertex = g.unitTestVertexCollection1.replace(vertexId, {first_name: "Tim"});
assertFalse(vertex.error); assertFalse(vertex.error);
var vertexObj = g.vertexCollection1.document(vertexId1); var vertexObj = g.unitTestVertexCollection1.document(vertexId);
assertEqual(vertexObj.first_name, "Tim"); assertEqual(vertexObj.first_name, "Tim");
}, },
test_vC_update : function () { test_vC_update : function () {
var vertex = g.vertexCollection1.update(vertexId1, {age: 42}); var vertex = g.unitTestVertexCollection1.save({first_name: "Tim"});
var vertexId = vertex._id;
vertex = g.unitTestVertexCollection1.update(vertexId, {age: 42});
assertFalse(vertex.error); assertFalse(vertex.error);
var vertexObj = g.vertexCollection1.document(vertexId1); var vertexObj = g.unitTestVertexCollection1.document(vertexId);
assertEqual(vertexObj.first_name, "Tim"); assertEqual(vertexObj.first_name, "Tim");
assertEqual(vertexObj.age, 42); assertEqual(vertexObj.age, 42);
}, },
test_vC_remove : function () { test_vC_remove : function () {
var vertex = g.vertexCollection1.remove(vertexId1); var vertex = g.unitTestVertexCollection1.save({first_name: "Tim"});
var vertexId = vertex._id;
var vertex = g.unitTestVertexCollection1.remove(vertexId);
assertTrue(vertex); assertTrue(vertex);
}, },
test_eC_save_undirected : function() { test_eC_save_undirected : function() {
var vertex1 = g.vertexCollection1.save({first_name: "Tom"}); var vertex1 = g.unitTestVertexCollection1.save({first_name: "Tom"});
vertexId1 = vertex1._id; var vertexId1 = vertex1._id;
var vertex2 = g.vertexCollection1.save({first_name: "Tim"}); var vertex2 = g.unitTestVertexCollection1.save({first_name: "Tim"});
vertexId2 = vertex2._id; var vertexId2 = vertex2._id;
var edge = g.edgeCollection1.save(vertexId1, vertexId2, {}); var edge = g.unitTestEdgeCollection1.save(vertexId1, vertexId2, {});
assertFalse(edge.error); assertFalse(edge.error);
edgeId1 = edge._id; edgeId1 = edge._id;
g.vertexCollection1.remove(vertexId1); g.unitTestVertexCollection1.remove(vertexId1);
g.vertexCollection1.remove(vertexId2); g.unitTestVertexCollection1.remove(vertexId2);
}, },
test_eC_save_directed : function() { test_eC_save_directed : function() {
var vertex1 = g.vertexCollection2.save({first_name: "Tom"}); var vertex1 = g.unitTestVertexCollection2.save({first_name: "Tom"});
vertexId1 = vertex1._id; vertexId1 = vertex1._id;
var vertex2 = g.vertexCollection4.save({first_name: "Tim"}); var vertex2 = g.unitTestVertexCollection4.save({first_name: "Tim"});
vertexId2 = vertex2._id; vertexId2 = vertex2._id;
var edge = g.edgeCollection2.save(vertexId1, vertexId2, {}); var edge = g.unitTestEdgeCollection2.save(vertexId1, vertexId2, {});
assertFalse(edge.error); assertFalse(edge.error);
edgeId2 = edge._id; edgeId2 = edge._id;
g.vertexCollection2.remove(vertexId1); g.unitTestVertexCollection2.remove(vertexId1);
g.vertexCollection4.remove(vertexId2); g.unitTestVertexCollection4.remove(vertexId2);
}, },
test_eC_save_withError : function() { test_eC_save_withError : function() {
var vertex1 = g.vertexCollection1.save({first_name: "Tom"}); var vertex1 = g.unitTestVertexCollection1.save({first_name: "Tom"});
vertexId1 = vertex1._id; vertexId1 = vertex1._id;
var vertex2 = g.vertexCollection2.save({first_name: "Tim"}); var vertex2 = g.unitTestVertexCollection2.save({first_name: "Tim"});
vertexId2 = vertex2._id; vertexId2 = vertex2._id;
try { try {
var edge = g.edgeCollection1.save(vertexId1, vertexId2, {}); var edge = g.unitTestEdgeCollection1.save(vertexId1, vertexId2, {});
} catch (e) { } catch (e) {
assertEqual(e, "Edge is not allowed between " + vertexId1 + " and " + vertexId2 + ".") assertEqual(e, "Edge is not allowed between " + vertexId1 + " and " + vertexId2 + ".")
} }
g.vertexCollection1.remove(vertexId1); g.unitTestVertexCollection1.remove(vertexId1);
g.vertexCollection2.remove(vertexId2); g.unitTestVertexCollection2.remove(vertexId2);
}, },
test_eC_replace : function() { test_eC_replace : function() {
var edge = g.edgeCollection1.replace(edgeId1, {label: "knows"}); var vertex1 = g.unitTestVertexCollection1.save({first_name: "Tom"});
var vertexId1 = vertex1._id;
var vertex2 = g.unitTestVertexCollection1.save({first_name: "Tim"});
var vertexId2 = vertex2._id;
var edge = g.unitTestEdgeCollection1.save(vertexId1, vertexId2, {});
var edgeId1 = edge._id;
edge = g.unitTestEdgeCollection1.replace(edgeId1, {label: "knows"});
assertFalse(edge.error); assertFalse(edge.error);
var edgeObj = g.edgeCollection1.document(edgeId1); var edgeObj = g.unitTestEdgeCollection1.document(edgeId1);
assertEqual(edgeObj.label, "knows"); assertEqual(edgeObj.label, "knows");
assertEqual(edgeObj._id, edgeId1); assertEqual(edgeObj._id, edgeId1);
}, },
test_eC_update : function () { test_eC_update : function () {
var edge = g.edgeCollection1.update(edgeId1, {blub: "blub"}); var vertex1 = g.unitTestVertexCollection1.save({first_name: "Tom"});
var vertexId1 = vertex1._id;
var vertex2 = g.unitTestVertexCollection1.save({first_name: "Tim"});
var vertexId2 = vertex2._id;
var edge = g.unitTestEdgeCollection1.save(vertexId1, vertexId2, {});
var edgeId1 = edge._id;
edge = g.unitTestEdgeCollection1.replace(edgeId1, {label: "knows"});
edge = g.unitTestEdgeCollection1.update(edgeId1, {blub: "blub"});
assertFalse(edge.error); assertFalse(edge.error);
var edgeObj = g.edgeCollection1.document(edgeId1); var edgeObj = g.unitTestEdgeCollection1.document(edgeId1);
assertEqual(edgeObj.label, "knows"); assertEqual(edgeObj.label, "knows");
assertEqual(edgeObj.blub, "blub"); assertEqual(edgeObj.blub, "blub");
assertEqual(edgeObj._id, edgeId1); assertEqual(edgeObj._id, edgeId1);
}, },
test_eC_remove : function () { test_eC_remove : function () {
var edge = g.edgeCollection1.remove(edgeId1); var vertex1 = g.unitTestVertexCollection1.save({first_name: "Tom"});
assertTrue(edge); var vertexId1 = vertex1._id;
edge = g.edgeCollection2.remove(edgeId2); var vertex2 = g.unitTestVertexCollection1.save({first_name: "Tim"});
var vertexId2 = vertex2._id;
var edge = g.unitTestEdgeCollection1.save(vertexId1, vertexId2, {});
var edgeId1 = edge._id;
edge = g.unitTestEdgeCollection1.remove(edgeId1);
assertTrue(edge); assertTrue(edge);
}, },
test_edges : function() { test_edges : function() {
var vertex = g.vertexCollection1.save({first_name: "Tam"}); var ids = fillCollections();
var vId11 = vertex._id; var result = g._edges(ids.vId11).toArray();
vertex = g.vertexCollection1.save({first_name: "Tem"}); assertEqual(result.length, 13)
var vId12 = vertex._id;
vertex = g.vertexCollection1.save({first_name: "Tim"});
var vId13 = vertex._id;
vertex = g.vertexCollection1.save({first_name: "Tom"});
var vId14 = vertex._id;
vertex = g.vertexCollection1.save({first_name: "Tum"});
var vId15 = vertex._id;
vertex = g.vertexCollection3.save({first_name: "Tam"});
var vId31 = vertex._id;
vertex = g.vertexCollection3.save({first_name: "Tem"});
var vId32 = vertex._id;
vertex = g.vertexCollection3.save({first_name: "Tim"});
var vId33 = vertex._id;
vertex = g.vertexCollection3.save({first_name: "Tom"});
var vId34 = vertex._id;
vertex = g.vertexCollection3.save({first_name: "Tum"});
var vId35 = vertex._id;
var edge = g.edgeCollection1.save(vId11, vId12, {});
var eId11 = vertex._id;
edge = g.edgeCollection1.save(vId11, vId13, {});
var eId12 = vertex._id;
edge = g.edgeCollection1.save(vId11, vId14, {});
var eId13 = vertex._id;
edge = g.edgeCollection1.save(vId11, vId15, {});
var eId14 = vertex._id;
edge = g.edgeCollection1.save(vId13, vId11, {});
var eId15 = vertex._id;
edge = g.edgeCollection1.save(vId12, vId11, {});
var eId16 = vertex._id;
edge = g.edgeCollection1.save(vId14, vId11, {});
var eId17 = vertex._id;
edge = g.edgeCollection1.save(vId15, vId11, {});
var eId18 = vertex._id;
edge = g.edgeCollection2.save(vId11, vId31, {});
var eId21 = vertex._id;
edge = g.edgeCollection2.save(vId11, vId32, {});
var eId22 = vertex._id;
edge = g.edgeCollection2.save(vId11, vId33, {});
var eId23 = vertex._id;
edge = g.edgeCollection2.save(vId11, vId34, {});
var eId24 = vertex._id;
edge = g.edgeCollection2.save(vId11, vId35, {});
var eId25 = vertex._id;
var result = g._EDGES(vId11)
require("internal").print("***");
require("internal").print(result);
require("internal").print("***");
}, },
test_inEdges : function() {
var ids = fillCollections();
var result = g._inEdges(ids.vId11).toArray();
assertEqual(result.length, 4)
},
test_outEdges : function() {
var ids = fillCollections();
var result = g._outEdges(ids.vId11).toArray();
assertEqual(result.length, 9)
},
dump : function() { test_getInVertex : function() {
db.vertexCollection1.drop(); var ids = fillCollections();
db.vertexCollection2.drop(); var result = g._getInVertex(ids.eId11);
db.vertexCollection3.drop(); assertEqual(result._id, ids.vId11);
db.vertexCollection4.drop(); },
db.edgeCollection1.drop();
db.edgeCollection2.drop(); test_getOutVertex : function() {
var ids = fillCollections();
var result = g._getOutVertex(ids.eId11);
assertEqual(result._id, ids.vId12);
result = g._getOutVertex(ids.eId25);
assertEqual(result._id, ids.vId35);
} }
}; };
} }