From 67dd26fcefc48d175f6d035e3edef193b04cf740 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Mon, 3 Sep 2012 16:21:47 +0200 Subject: [PATCH] removed previous implementation of attachments --- arangod/V8Server/v8-vocbase.cpp | 5 -- arangod/VocBase/compactor.c | 6 +- arangod/VocBase/datafile.h | 3 +- arangod/VocBase/document-collection.h | 14 ----- arangod/VocBase/simple-collection.c | 82 +-------------------------- arangod/VocBase/simple-collection.h | 10 ---- 6 files changed, 3 insertions(+), 117 deletions(-) diff --git a/arangod/V8Server/v8-vocbase.cpp b/arangod/V8Server/v8-vocbase.cpp index 971464c222..6ffe6b8452 100755 --- a/arangod/V8Server/v8-vocbase.cpp +++ b/arangod/V8Server/v8-vocbase.cpp @@ -5077,11 +5077,6 @@ v8::Handle TRI_WrapShapedJson (TRI_vocbase_col_t const* collection, result->Set(v8g->FromKey, TRI_ObjectReference(marker->_fromCid, marker->_fromDid)); result->Set(v8g->ToKey, TRI_ObjectReference(marker->_toCid, marker->_toDid)); } - else if (type == TRI_DOC_MARKER_ATTACHMENT) { - TRI_doc_attachment_marker_t* marker = (TRI_doc_attachment_marker_t*) document->_data; - - result->Set(v8g->ToKey, TRI_ObjectReference(marker->_toCid, marker->_toDid)); - } // and return return scope.Close(result); diff --git a/arangod/VocBase/compactor.c b/arangod/VocBase/compactor.c index ec6ba321eb..b44d06b175 100644 --- a/arangod/VocBase/compactor.c +++ b/arangod/VocBase/compactor.c @@ -218,8 +218,7 @@ static bool Compactifier (TRI_df_marker_t const* marker, void* data, TRI_datafil // new or updated document if (marker->_type == TRI_DOC_MARKER_DOCUMENT || - marker->_type == TRI_DOC_MARKER_EDGE || - marker->_type == TRI_DOC_MARKER_ATTACHMENT) { + marker->_type == TRI_DOC_MARKER_EDGE) { TRI_doc_document_marker_t const* d; size_t markerSize; @@ -229,9 +228,6 @@ static bool Compactifier (TRI_df_marker_t const* marker, void* data, TRI_datafil else if (marker->_type == TRI_DOC_MARKER_EDGE) { markerSize = sizeof(TRI_doc_edge_marker_t); } - else if (marker->_type == TRI_DOC_MARKER_ATTACHMENT) { - markerSize = sizeof(TRI_doc_attachment_marker_t); - } else { LOG_FATAL("unknown marker type %d", (int) marker->_type); exit(EXIT_FAILURE); diff --git a/arangod/VocBase/datafile.h b/arangod/VocBase/datafile.h index 466158d1d6..b168b0d301 100644 --- a/arangod/VocBase/datafile.h +++ b/arangod/VocBase/datafile.h @@ -160,8 +160,7 @@ typedef enum { TRI_DOC_MARKER_BEGIN_TRANSACTION = 3003, // currently unused TRI_DOC_MARKER_COMMIT_TRANSACTION = 3004, // currently unused TRI_DOC_MARKER_ABORT_TRANSACTION = 3005, // currently unused - TRI_DOC_MARKER_EDGE = 3006, - TRI_DOC_MARKER_ATTACHMENT = 3007 + TRI_DOC_MARKER_EDGE = 3006 } TRI_df_marker_type_e; diff --git a/arangod/VocBase/document-collection.h b/arangod/VocBase/document-collection.h index 8c4cc38d86..50bcb87740 100644 --- a/arangod/VocBase/document-collection.h +++ b/arangod/VocBase/document-collection.h @@ -328,20 +328,6 @@ typedef struct TRI_doc_edge_marker_s { } TRI_doc_edge_marker_t; -//////////////////////////////////////////////////////////////////////////////// -/// @brief attachment datafile marker -//////////////////////////////////////////////////////////////////////////////// - -typedef struct TRI_doc_attachment_marker_s { - TRI_doc_document_marker_t base; - - TRI_voc_cid_t _toCid; - TRI_voc_did_t _toDid; - - // char data[] -} -TRI_doc_attachment_marker_t; - //////////////////////////////////////////////////////////////////////////////// /// @brief document datafile deletion marker //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/VocBase/simple-collection.c b/arangod/VocBase/simple-collection.c index e0bd303ff6..9bd7fb9c88 100644 --- a/arangod/VocBase/simple-collection.c +++ b/arangod/VocBase/simple-collection.c @@ -526,15 +526,6 @@ static TRI_doc_mptr_t RollbackUpdate (TRI_sim_collection_t* sim, data = ((char*) originalMarker) + sizeof(TRI_doc_edge_marker_t); dataLength = originalMarker->_size - sizeof(TRI_doc_edge_marker_t); } - else if (originalMarker->_type == TRI_DOC_MARKER_ATTACHMENT) { - TRI_doc_attachment_marker_t attachmentUpdate; - - memcpy(&attachmentUpdate, originalMarker, sizeof(TRI_doc_document_marker_t)); - marker = &attachmentUpdate.base; - markerLength = sizeof(TRI_doc_attachment_marker_t); - data = ((char*) originalMarker) + sizeof(TRI_doc_attachment_marker_t); - dataLength = originalMarker->_size - sizeof(TRI_doc_attachment_marker_t); - } else { TRI_doc_mptr_t mptr; TRI_set_errno(TRI_ERROR_INTERNAL); @@ -1036,32 +1027,6 @@ static TRI_doc_mptr_t CreateShapedJson (TRI_doc_collection_t* document, rid, release); } - else if (type == TRI_DOC_MARKER_ATTACHMENT) { - TRI_doc_attachment_marker_t marker; - TRI_sim_attachment_t const* attachment; - - attachment = data; - - memset(&marker, 0, sizeof(marker)); - - marker.base.base._size = sizeof(marker) + json->_data.length; - marker.base.base._type = type; - - marker.base._sid = 0; - marker.base._shape = json->_sid; - - marker._toCid = attachment->_toCid; - marker._toDid = attachment->_toDid; - - return CreateDocument(collection, - &marker.base, sizeof(marker), - json->_data.data, json->_data.length, - &result, - data, - did, - rid, - release); - } else { LOG_FATAL("unknown marker type %lu", (unsigned long) type); exit(EXIT_FAILURE); @@ -1185,38 +1150,6 @@ static TRI_doc_mptr_t UpdateShapedJson (TRI_doc_collection_t* document, true); } - // the original is an attachment - else if (original->_type == TRI_DOC_MARKER_ATTACHMENT) { - TRI_doc_attachment_marker_t marker; - TRI_doc_attachment_marker_t const* originalAttachment; - - originalAttachment = header->_data; - - // create an update - memset(&marker, 0, sizeof(marker)); - - marker.base.base._size = sizeof(marker) + json->_data.length; - marker.base.base._type = original->_type; - - marker.base._did = did; - marker.base._sid = 0; - marker.base._shape = json->_sid; - - marker._toCid = originalAttachment->_toCid; - marker._toDid = originalAttachment->_toDid; - - return UpdateDocument(collection, - header, - &marker.base, sizeof(marker), - json->_data.data, json->_data.length, - rid, - oldRid, - policy, - &result, - release, - true); - } - // do not know else { if (release) { @@ -1368,8 +1301,7 @@ static bool OpenIterator (TRI_df_marker_t const* marker, void* data, TRI_datafil // new or updated document if (marker->_type == TRI_DOC_MARKER_DOCUMENT || - marker->_type == TRI_DOC_MARKER_EDGE || - marker->_type == TRI_DOC_MARKER_ATTACHMENT) { + marker->_type == TRI_DOC_MARKER_EDGE) { TRI_doc_document_marker_t const* d = (TRI_doc_document_marker_t const*) marker; size_t markerSize; @@ -1395,18 +1327,6 @@ static bool OpenIterator (TRI_df_marker_t const* marker, void* data, TRI_datafil markerSize = sizeof(TRI_doc_edge_marker_t); } - else if (marker->_type == TRI_DOC_MARKER_ATTACHMENT) { - TRI_doc_attachment_marker_t const* a = (TRI_doc_attachment_marker_t const*) marker; - - LOG_TRACE("edge: fid %lu, did %lu, rid %lu, attachment (%lu,%lu)", - (unsigned long) datafile->_fid, - (unsigned long) d->_did, - (unsigned long) d->_rid, - (unsigned long) a->_toCid, - (unsigned long) a->_toDid); - - markerSize = sizeof(TRI_doc_attachment_marker_t); - } else { LOG_FATAL("unknown marker type %lu", (unsigned long) marker->_type); exit(EXIT_FAILURE); diff --git a/arangod/VocBase/simple-collection.h b/arangod/VocBase/simple-collection.h index e59cac5405..1a8c2e78ab 100644 --- a/arangod/VocBase/simple-collection.h +++ b/arangod/VocBase/simple-collection.h @@ -254,16 +254,6 @@ typedef struct TRI_edge_header_s { } TRI_edge_header_t; -//////////////////////////////////////////////////////////////////////////////// -/// @brief attachment to -//////////////////////////////////////////////////////////////////////////////// - -typedef struct TRI_sim_attachment_s { - TRI_voc_cid_t _toCid; - TRI_voc_did_t _toDid; -} -TRI_sim_attachment_t; - //////////////////////////////////////////////////////////////////////////////// /// @} ////////////////////////////////////////////////////////////////////////////////