From 434e1009c62edcd8ff7d37b739abc667a98957f9 Mon Sep 17 00:00:00 2001 From: gschwab Date: Tue, 20 May 2014 09:52:25 +0200 Subject: [PATCH 1/4] changed to setUp and tearDown --- js/common/tests/shell-general-graph.js | 112 +++++++++++++++---------- 1 file changed, 69 insertions(+), 43 deletions(-) diff --git a/js/common/tests/shell-general-graph.js b/js/common/tests/shell-general-graph.js index d93c2c6075..ad7101f835 100644 --- a/js/common/tests/shell-general-graph.js +++ b/js/common/tests/shell-general-graph.js @@ -698,26 +698,42 @@ function GeneralGraphAQLQueriesSuite() { function EdgesAndVerticesSuite() { - try { - 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 g; var vertexIds = []; var vertexId1, vertexId2; var edgeId1, edgeId2; return { + setUp : function() { + try { + arangodb.db._collection("_graphs").remove("_graphs/blubGraph") + } catch (err) { + } + g = graph._create( + "blubGraph", + graph.edgeDefinitions( + graph._undirectedRelationDefinition("edgeCollection1", "vertexCollection1"), + graph._directedRelationDefinition("edgeCollection2", + ["vertexCollection1", "vertexCollection2"], ["vertexCollection3", "vertexCollection4"] + ) + ) + ); + + + }, + + tearDown : function() { + db.vertexCollection1.drop(); + db.vertexCollection2.drop(); + db.vertexCollection3.drop(); + db.vertexCollection4.drop(); + db.edgeCollection1.drop(); + db.edgeCollection2.drop(); + }, + + + test_edgeCollections : function () { var edgeCollections = g._edgeCollections(); @@ -743,30 +759,36 @@ function EdgesAndVerticesSuite() { }, test_vC_replace : function () { - var vertex = g.vertexCollection1.replace(vertexId1, {first_name: "Tim"}); + var vertex = g.vertexCollection1.save({first_name: "Tom"}); + var vertexId = vertex._id; + vertex = g.vertexCollection1.replace(vertexId, {first_name: "Tim"}); assertFalse(vertex.error); - var vertexObj = g.vertexCollection1.document(vertexId1); + var vertexObj = g.vertexCollection1.document(vertexId); assertEqual(vertexObj.first_name, "Tim"); }, test_vC_update : function () { - var vertex = g.vertexCollection1.update(vertexId1, {age: 42}); + var vertex = g.vertexCollection1.save({first_name: "Tim"}); + var vertexId = vertex._id; + vertex = g.vertexCollection1.update(vertexId, {age: 42}); assertFalse(vertex.error); - var vertexObj = g.vertexCollection1.document(vertexId1); + var vertexObj = g.vertexCollection1.document(vertexId); assertEqual(vertexObj.first_name, "Tim"); assertEqual(vertexObj.age, 42); }, test_vC_remove : function () { - var vertex = g.vertexCollection1.remove(vertexId1); + var vertex = g.vertexCollection1.save({first_name: "Tim"}); + var vertexId = vertex._id; + var vertex = g.vertexCollection1.remove(vertexId); assertTrue(vertex); }, test_eC_save_undirected : function() { var vertex1 = g.vertexCollection1.save({first_name: "Tom"}); - vertexId1 = vertex1._id; + var vertexId1 = vertex1._id; var vertex2 = g.vertexCollection1.save({first_name: "Tim"}); - vertexId2 = vertex2._id; + var vertexId2 = vertex2._id; var edge = g.edgeCollection1.save(vertexId1, vertexId2, {}); assertFalse(edge.error); edgeId1 = edge._id; @@ -801,7 +823,13 @@ function EdgesAndVerticesSuite() { }, test_eC_replace : function() { - var edge = g.edgeCollection1.replace(edgeId1, {label: "knows"}); + var vertex1 = g.vertexCollection1.save({first_name: "Tom"}); + var vertexId1 = vertex1._id; + var vertex2 = g.vertexCollection1.save({first_name: "Tim"}); + var vertexId2 = vertex2._id; + var edge = g.edgeCollection1.save(vertexId1, vertexId2, {}); + var edgeId1 = edge._id; + edge = g.edgeCollection1.replace(edgeId1, {label: "knows"}); assertFalse(edge.error); var edgeObj = g.edgeCollection1.document(edgeId1); assertEqual(edgeObj.label, "knows"); @@ -809,7 +837,14 @@ function EdgesAndVerticesSuite() { }, test_eC_update : function () { - var edge = g.edgeCollection1.update(edgeId1, {blub: "blub"}); + var vertex1 = g.vertexCollection1.save({first_name: "Tom"}); + var vertexId1 = vertex1._id; + var vertex2 = g.vertexCollection1.save({first_name: "Tim"}); + var vertexId2 = vertex2._id; + var edge = g.edgeCollection1.save(vertexId1, vertexId2, {}); + var edgeId1 = edge._id; + edge = g.edgeCollection1.replace(edgeId1, {label: "knows"}); + edge = g.edgeCollection1.update(edgeId1, {blub: "blub"}); assertFalse(edge.error); var edgeObj = g.edgeCollection1.document(edgeId1); assertEqual(edgeObj.label, "knows"); @@ -818,9 +853,13 @@ function EdgesAndVerticesSuite() { }, test_eC_remove : function () { - var edge = g.edgeCollection1.remove(edgeId1); - assertTrue(edge); - edge = g.edgeCollection2.remove(edgeId2); + var vertex1 = g.vertexCollection1.save({first_name: "Tom"}); + var vertexId1 = vertex1._id; + var vertex2 = g.vertexCollection1.save({first_name: "Tim"}); + var vertexId2 = vertex2._id; + var edge = g.edgeCollection1.save(vertexId1, vertexId2, {}); + var edgeId1 = edge._id; + edge = g.edgeCollection1.remove(edgeId1); assertTrue(edge); }, @@ -854,9 +893,9 @@ function EdgesAndVerticesSuite() { 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 eId15 = vertex._id; + edge = g.edgeCollection1.save(vId13, vId11, {}); var eId16 = vertex._id; edge = g.edgeCollection1.save(vId14, vId11, {}); var eId17 = vertex._id; @@ -873,21 +912,8 @@ function EdgesAndVerticesSuite() { 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("***"); - }, - - - - dump : function() { - db.vertexCollection1.drop(); - db.vertexCollection2.drop(); - db.vertexCollection3.drop(); - db.vertexCollection4.drop(); - db.edgeCollection1.drop(); - db.edgeCollection2.drop(); + var result = g._edges(vId11).toArray(); + assertEqual(result.length, 13) } }; From b3ad2e303fa78ed829ec5e80faf5d3c160c41467 Mon Sep 17 00:00:00 2001 From: gschwab Date: Tue, 20 May 2014 10:37:40 +0200 Subject: [PATCH 2/4] added tests --- js/common/tests/shell-general-graph.js | 245 ++++++++++++++----------- 1 file changed, 137 insertions(+), 108 deletions(-) diff --git a/js/common/tests/shell-general-graph.js b/js/common/tests/shell-general-graph.js index e58cb0f29a..c1641da63d 100644 --- a/js/common/tests/shell-general-graph.js +++ b/js/common/tests/shell-general-graph.js @@ -701,6 +701,58 @@ function EdgesAndVerticesSuite() { var vertexId1, vertexId2; 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 { setUp : function() { @@ -711,209 +763,186 @@ function EdgesAndVerticesSuite() { g = graph._create( "blubGraph", graph.edgeDefinitions( - graph._undirectedRelationDefinition("edgeCollection1", "vertexCollection1"), - graph._directedRelationDefinition("edgeCollection2", - ["vertexCollection1", "vertexCollection2"], ["vertexCollection3", "vertexCollection4"] + graph._undirectedRelationDefinition("unitTestEdgeCollection1", "unitTestVertexCollection1"), + graph._directedRelationDefinition("unitTestEdgeCollection2", + ["unitTestVertexCollection1", "unitTestVertexCollection2"], ["unitTestVertexCollection3", "unitTestVertexCollection4"] ) ) ); - - }, tearDown : function() { - db.vertexCollection1.drop(); - db.vertexCollection2.drop(); - db.vertexCollection3.drop(); - db.vertexCollection4.drop(); - db.edgeCollection1.drop(); - db.edgeCollection2.drop(); + db.unitTestVertexCollection1.drop(); + db.unitTestVertexCollection2.drop(); + db.unitTestVertexCollection3.drop(); + db.unitTestVertexCollection4.drop(); + db.unitTestEdgeCollection1.drop(); + db.unitTestEdgeCollection2.drop(); }, - - test_edgeCollections : function () { var edgeCollections = g._edgeCollections(); - assertEqual(edgeCollections[0].name(), 'edgeCollection1'); - assertEqual(edgeCollections[1].name(), 'edgeCollection2'); + assertEqual(edgeCollections[0].name(), 'unitTestEdgeCollection1'); + assertEqual(edgeCollections[1].name(), 'unitTestEdgeCollection2'); }, test_vertexCollections : function () { var vertexCollections = g._vertexCollections(); - assertEqual(vertexCollections[0].name(), 'vertexCollection1'); - assertEqual(vertexCollections[1].name(), 'vertexCollection2'); - assertEqual(vertexCollections[2].name(), 'vertexCollection3'); - assertEqual(vertexCollections[3].name(), 'vertexCollection4'); + assertEqual(vertexCollections[0].name(), 'unitTestVertexCollection1'); + assertEqual(vertexCollections[1].name(), 'unitTestVertexCollection2'); + assertEqual(vertexCollections[2].name(), 'unitTestVertexCollection3'); + assertEqual(vertexCollections[3].name(), 'unitTestVertexCollection4'); }, test_vC_save : function () { - var vertex = g.vertexCollection1.save({first_name: "Tom"}); + var vertex = g.unitTestVertexCollection1.save({first_name: "Tom"}); assertFalse(vertex.error); vertexId1 = vertex._id; - var vertexObj = g.vertexCollection1.document(vertexId1); + var vertexObj = g.unitTestVertexCollection1.document(vertexId1); assertEqual(vertexObj.first_name, "Tom"); }, test_vC_replace : function () { - var vertex = g.vertexCollection1.save({first_name: "Tom"}); + var vertex = g.unitTestVertexCollection1.save({first_name: "Tom"}); var vertexId = vertex._id; - vertex = g.vertexCollection1.replace(vertexId, {first_name: "Tim"}); + vertex = g.unitTestVertexCollection1.replace(vertexId, {first_name: "Tim"}); assertFalse(vertex.error); - var vertexObj = g.vertexCollection1.document(vertexId); + var vertexObj = g.unitTestVertexCollection1.document(vertexId); assertEqual(vertexObj.first_name, "Tim"); }, test_vC_update : function () { - var vertex = g.vertexCollection1.save({first_name: "Tim"}); + var vertex = g.unitTestVertexCollection1.save({first_name: "Tim"}); var vertexId = vertex._id; - vertex = g.vertexCollection1.update(vertexId, {age: 42}); + vertex = g.unitTestVertexCollection1.update(vertexId, {age: 42}); assertFalse(vertex.error); - var vertexObj = g.vertexCollection1.document(vertexId); + var vertexObj = g.unitTestVertexCollection1.document(vertexId); assertEqual(vertexObj.first_name, "Tim"); assertEqual(vertexObj.age, 42); }, test_vC_remove : function () { - var vertex = g.vertexCollection1.save({first_name: "Tim"}); + var vertex = g.unitTestVertexCollection1.save({first_name: "Tim"}); var vertexId = vertex._id; - var vertex = g.vertexCollection1.remove(vertexId); + var vertex = g.unitTestVertexCollection1.remove(vertexId); assertTrue(vertex); }, test_eC_save_undirected : function() { - var vertex1 = g.vertexCollection1.save({first_name: "Tom"}); + var vertex1 = g.unitTestVertexCollection1.save({first_name: "Tom"}); var vertexId1 = vertex1._id; - var vertex2 = g.vertexCollection1.save({first_name: "Tim"}); + var vertex2 = g.unitTestVertexCollection1.save({first_name: "Tim"}); var vertexId2 = vertex2._id; - var edge = g.edgeCollection1.save(vertexId1, vertexId2, {}); + var edge = g.unitTestEdgeCollection1.save(vertexId1, vertexId2, {}); assertFalse(edge.error); edgeId1 = edge._id; - g.vertexCollection1.remove(vertexId1); - g.vertexCollection1.remove(vertexId2); + g.unitTestVertexCollection1.remove(vertexId1); + g.unitTestVertexCollection1.remove(vertexId2); }, test_eC_save_directed : function() { - var vertex1 = g.vertexCollection2.save({first_name: "Tom"}); + var vertex1 = g.unitTestVertexCollection2.save({first_name: "Tom"}); vertexId1 = vertex1._id; - var vertex2 = g.vertexCollection4.save({first_name: "Tim"}); + var vertex2 = g.unitTestVertexCollection4.save({first_name: "Tim"}); vertexId2 = vertex2._id; - var edge = g.edgeCollection2.save(vertexId1, vertexId2, {}); + var edge = g.unitTestEdgeCollection2.save(vertexId1, vertexId2, {}); assertFalse(edge.error); edgeId2 = edge._id; - g.vertexCollection2.remove(vertexId1); - g.vertexCollection4.remove(vertexId2); + g.unitTestVertexCollection2.remove(vertexId1); + g.unitTestVertexCollection4.remove(vertexId2); }, test_eC_save_withError : function() { - var vertex1 = g.vertexCollection1.save({first_name: "Tom"}); + var vertex1 = g.unitTestVertexCollection1.save({first_name: "Tom"}); vertexId1 = vertex1._id; - var vertex2 = g.vertexCollection2.save({first_name: "Tim"}); + var vertex2 = g.unitTestVertexCollection2.save({first_name: "Tim"}); vertexId2 = vertex2._id; try { - var edge = g.edgeCollection1.save(vertexId1, vertexId2, {}); + var edge = g.unitTestEdgeCollection1.save(vertexId1, vertexId2, {}); } catch (e) { assertEqual(e, "Edge is not allowed between " + vertexId1 + " and " + vertexId2 + ".") } - g.vertexCollection1.remove(vertexId1); - g.vertexCollection2.remove(vertexId2); + g.unitTestVertexCollection1.remove(vertexId1); + g.unitTestVertexCollection2.remove(vertexId2); }, test_eC_replace : function() { - var vertex1 = g.vertexCollection1.save({first_name: "Tom"}); + var vertex1 = g.unitTestVertexCollection1.save({first_name: "Tom"}); var vertexId1 = vertex1._id; - var vertex2 = g.vertexCollection1.save({first_name: "Tim"}); + var vertex2 = g.unitTestVertexCollection1.save({first_name: "Tim"}); var vertexId2 = vertex2._id; - var edge = g.edgeCollection1.save(vertexId1, vertexId2, {}); + var edge = g.unitTestEdgeCollection1.save(vertexId1, vertexId2, {}); var edgeId1 = edge._id; - edge = g.edgeCollection1.replace(edgeId1, {label: "knows"}); + edge = g.unitTestEdgeCollection1.replace(edgeId1, {label: "knows"}); assertFalse(edge.error); - var edgeObj = g.edgeCollection1.document(edgeId1); + var edgeObj = g.unitTestEdgeCollection1.document(edgeId1); assertEqual(edgeObj.label, "knows"); assertEqual(edgeObj._id, edgeId1); }, test_eC_update : function () { - var vertex1 = g.vertexCollection1.save({first_name: "Tom"}); + var vertex1 = g.unitTestVertexCollection1.save({first_name: "Tom"}); var vertexId1 = vertex1._id; - var vertex2 = g.vertexCollection1.save({first_name: "Tim"}); + var vertex2 = g.unitTestVertexCollection1.save({first_name: "Tim"}); var vertexId2 = vertex2._id; - var edge = g.edgeCollection1.save(vertexId1, vertexId2, {}); + var edge = g.unitTestEdgeCollection1.save(vertexId1, vertexId2, {}); var edgeId1 = edge._id; - edge = g.edgeCollection1.replace(edgeId1, {label: "knows"}); - edge = g.edgeCollection1.update(edgeId1, {blub: "blub"}); + edge = g.unitTestEdgeCollection1.replace(edgeId1, {label: "knows"}); + edge = g.unitTestEdgeCollection1.update(edgeId1, {blub: "blub"}); assertFalse(edge.error); - var edgeObj = g.edgeCollection1.document(edgeId1); + var edgeObj = g.unitTestEdgeCollection1.document(edgeId1); assertEqual(edgeObj.label, "knows"); assertEqual(edgeObj.blub, "blub"); assertEqual(edgeObj._id, edgeId1); }, test_eC_remove : function () { - var vertex1 = g.vertexCollection1.save({first_name: "Tom"}); + var vertex1 = g.unitTestVertexCollection1.save({first_name: "Tom"}); var vertexId1 = vertex1._id; - var vertex2 = g.vertexCollection1.save({first_name: "Tim"}); + var vertex2 = g.unitTestVertexCollection1.save({first_name: "Tim"}); var vertexId2 = vertex2._id; - var edge = g.edgeCollection1.save(vertexId1, vertexId2, {}); + var edge = g.unitTestEdgeCollection1.save(vertexId1, vertexId2, {}); var edgeId1 = edge._id; - edge = g.edgeCollection1.remove(edgeId1); + edge = g.unitTestEdgeCollection1.remove(edgeId1); assertTrue(edge); }, test_edges : function() { - var vertex = g.vertexCollection1.save({first_name: "Tam"}); - var vId11 = vertex._id; - vertex = g.vertexCollection1.save({first_name: "Tem"}); - 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(vId12, vId11, {}); - var eId15 = vertex._id; - edge = g.edgeCollection1.save(vId13, 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).toArray(); + var ids = fillCollections(); + var result = g._edges(ids.vId11).toArray(); assertEqual(result.length, 13) + }, + + 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) + }, + + test_getInVertex : function() { + var ids = fillCollections(); + var result = g._getInVertex(ids.eId11); + assertEqual(result._id, ids.vId11); + }, + + 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); } + + }; } From 8879e27738152717b1a486d6f3b1c9a75ddf94b4 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Tue, 20 May 2014 11:30:02 +0200 Subject: [PATCH 3/4] removed unused struct --- UnitTests/Basics/structure-size-test.cpp | 27 +----------------------- arangod/VocBase/datafile.h | 9 -------- arangod/VocBase/primary-collection.h | 5 +---- 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/UnitTests/Basics/structure-size-test.cpp b/UnitTests/Basics/structure-size-test.cpp index 7cccca5f60..cdd67d2e40 100644 --- a/UnitTests/Basics/structure-size-test.cpp +++ b/UnitTests/Basics/structure-size-test.cpp @@ -121,32 +121,6 @@ BOOST_AUTO_TEST_CASE (tst_df_footer_marker) { 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 //////////////////////////////////////////////////////////////////////////////// @@ -178,6 +152,7 @@ BOOST_AUTO_TEST_CASE (tst_doc_document_key_marker) { BOOST_CHECK_EQUAL(40, offsetof(struct TRI_doc_document_key_marker_s, _shape)); BOOST_CHECK_EQUAL(48, offsetof(struct TRI_doc_document_key_marker_s, _offsetKey)); BOOST_CHECK_EQUAL(50, offsetof(struct TRI_doc_document_key_marker_s, _offsetJson)); + BOOST_CHECK_EQUAL(52, offsetof(struct TRI_doc_document_key_marker_s, _offsetLegend)); } //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/VocBase/datafile.h b/arangod/VocBase/datafile.h index 35315b1c47..53fc59f984 100644 --- a/arangod/VocBase/datafile.h +++ b/arangod/VocBase/datafile.h @@ -415,15 +415,6 @@ typedef struct TRI_df_document_marker_s { } 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; - //////////////////////////////////////////////////////////////////////////////// /// @} //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/VocBase/primary-collection.h b/arangod/VocBase/primary-collection.h index 14922239ab..3e1732f0aa 100644 --- a/arangod/VocBase/primary-collection.h +++ b/arangod/VocBase/primary-collection.h @@ -355,10 +355,7 @@ typedef struct TRI_doc_document_key_marker_s { uint16_t _offsetKey; uint16_t _offsetJson; - -#ifdef TRI_PADDING_32 - char _padding_df_marker[4]; -#endif + uint32_t _offsetLegend; } TRI_doc_document_key_marker_t; From c9e49c5446258a800eeb4afd163eda78f226bae5 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Tue, 20 May 2014 11:39:15 +0200 Subject: [PATCH 4/4] reverted struct change --- UnitTests/Basics/structure-size-test.cpp | 1 - arangod/VocBase/primary-collection.h | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/UnitTests/Basics/structure-size-test.cpp b/UnitTests/Basics/structure-size-test.cpp index cdd67d2e40..4ff86b2d39 100644 --- a/UnitTests/Basics/structure-size-test.cpp +++ b/UnitTests/Basics/structure-size-test.cpp @@ -152,7 +152,6 @@ BOOST_AUTO_TEST_CASE (tst_doc_document_key_marker) { BOOST_CHECK_EQUAL(40, offsetof(struct TRI_doc_document_key_marker_s, _shape)); BOOST_CHECK_EQUAL(48, offsetof(struct TRI_doc_document_key_marker_s, _offsetKey)); BOOST_CHECK_EQUAL(50, offsetof(struct TRI_doc_document_key_marker_s, _offsetJson)); - BOOST_CHECK_EQUAL(52, offsetof(struct TRI_doc_document_key_marker_s, _offsetLegend)); } //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/VocBase/primary-collection.h b/arangod/VocBase/primary-collection.h index 3e1732f0aa..14922239ab 100644 --- a/arangod/VocBase/primary-collection.h +++ b/arangod/VocBase/primary-collection.h @@ -355,7 +355,10 @@ typedef struct TRI_doc_document_key_marker_s { uint16_t _offsetKey; uint16_t _offsetJson; - uint32_t _offsetLegend; + +#ifdef TRI_PADDING_32 + char _padding_df_marker[4]; +#endif } TRI_doc_document_key_marker_t;