From 6f2bf0b1396747aeea622dd9f7fed8e346db85c4 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Mon, 18 Mar 2013 16:41:48 +0100 Subject: [PATCH 1/9] removed unused property --- arangod/VocBase/document-collection.c | 4 +++- arangod/VocBase/primary-collection.c | 2 -- arangod/VocBase/primary-collection.h | 13 ++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/arangod/VocBase/document-collection.c b/arangod/VocBase/document-collection.c index fbc04e80bc..8c0a29c6b7 100644 --- a/arangod/VocBase/document-collection.c +++ b/arangod/VocBase/document-collection.c @@ -2706,7 +2706,9 @@ static int FillIndex (TRI_document_collection_t* document, TRI_index_t* idx) { ++inserted; if (inserted % 10000 == 0) { - LOG_DEBUG("indexed %llu documents of collection %llu", (unsigned long long) inserted, (unsigned long long) primary->base._info._cid); + LOG_DEBUG("indexed %llu documents of collection %llu", + (unsigned long long) inserted, + (unsigned long long) primary->base._info._cid); } } } diff --git a/arangod/VocBase/primary-collection.c b/arangod/VocBase/primary-collection.c index af31decca2..0b16aef06e 100644 --- a/arangod/VocBase/primary-collection.c +++ b/arangod/VocBase/primary-collection.c @@ -597,7 +597,6 @@ void TRI_InitContextPrimaryCollection (TRI_doc_operation_context_t* const contex context->_expectedRid = 0; context->_previousRid = NULL; context->_sync = forceSync || primary->base._info._waitForSync; - context->_allowRollback = true; } //////////////////////////////////////////////////////////////////////////////// @@ -611,7 +610,6 @@ void TRI_InitReadContextPrimaryCollection (TRI_doc_operation_context_t* const co context->_expectedRid = 0; context->_previousRid = NULL; context->_sync = false; - context->_allowRollback = false; } //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/VocBase/primary-collection.h b/arangod/VocBase/primary-collection.h index 09e8d366cd..f91dd27c6b 100644 --- a/arangod/VocBase/primary-collection.h +++ b/arangod/VocBase/primary-collection.h @@ -126,7 +126,6 @@ typedef struct TRI_doc_operation_context_s { TRI_voc_rid_t* _previousRid; // a variable that the previous revsion id found in the database will be pushed into. only used if set and for update/delete TRI_doc_update_policy_e _policy; // the update policy bool _sync : 1; // force syncing to disk after successful operation - bool _allowRollback : 1; // allow rollback of operation. this is normally true except for contexts created by rollback operations } TRI_doc_operation_context_t; @@ -135,12 +134,12 @@ TRI_doc_operation_context_t; //////////////////////////////////////////////////////////////////////////////// typedef struct TRI_doc_mptr_s { - TRI_voc_rid_t _rid; // this is the revision identifier - TRI_voc_fid_t _fid; // this is the datafile identifier - TRI_voc_tick_t _validFrom; // this is the creation time - TRI_voc_tick_t _validTo; // this is the deletion time (0 if document is not yet deleted) - void const* _data; // this is the pointer to the beginning of the raw marker - char* _key; // this is the document identifier (string) + TRI_voc_rid_t _rid; // this is the revision identifier + TRI_voc_fid_t _fid; // this is the datafile identifier + TRI_voc_tick_t _validFrom; // this is the creation time + TRI_voc_tick_t _validTo; // this is the deletion time (0 if document is not yet deleted) + void const* _data; // this is the pointer to the beginning of the raw marker + char* _key; // this is the document identifier (string) } TRI_doc_mptr_t; From 08bc3fc2be5a3f1904815ee17215d7d7e003f03a Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Mon, 18 Mar 2013 17:13:12 +0100 Subject: [PATCH 2/9] css & view fixes --- frontend/css/collectionView.css | 8 ++++++++ frontend/css/collectionsView.css | 6 ++++++ frontend/css/layout.css | 7 +++++++ frontend/css/navigationView.css | 4 +--- frontend/css/shellView.css | 4 ++++ frontend/js/templates/collectionsView.ejs | 2 +- frontend/js/templates/documentView.ejs | 2 +- frontend/js/views/documentView.js | 1 - frontend/js/views/documentsView.js | 18 ++++++++++++------ frontend/js/views/logsView.js | 1 - frontend/js/views/queryView.js | 1 - 11 files changed, 40 insertions(+), 14 deletions(-) diff --git a/frontend/css/collectionView.css b/frontend/css/collectionView.css index e69de29bb2..9af19ae425 100644 --- a/frontend/css/collectionView.css +++ b/frontend/css/collectionView.css @@ -0,0 +1,8 @@ +#save-new-collection, #save-modified-collection { + margin-right: 2px !important; +} + +#delete-modified-collection { + margin-left: 1px !important; +} + diff --git a/frontend/css/collectionsView.css b/frontend/css/collectionsView.css index 873b70f957..ace8002462 100644 --- a/frontend/css/collectionsView.css +++ b/frontend/css/collectionsView.css @@ -1,4 +1,10 @@ +.arango-nav li { + margin-left: 1px !important; +} +#transparentHeader .btn-group { + margin-top: 6px !important; +} #newCollection { margin-left: 22px; diff --git a/frontend/css/layout.css b/frontend/css/layout.css index 090605e37a..9d6afc9f0b 100644 --- a/frontend/css/layout.css +++ b/frontend/css/layout.css @@ -200,3 +200,10 @@ table .sorting { margin-bottom: 10px; } +.disabledHover { + cursor: default !important; +} + +.disabledHover:hover { + background-color: #8F8D8C !important; +} diff --git a/frontend/css/navigationView.css b/frontend/css/navigationView.css index 9639440a5c..c75bac90c1 100644 --- a/frontend/css/navigationView.css +++ b/frontend/css/navigationView.css @@ -1,6 +1,4 @@ -.arango-nav .active { - border-left: 1px solid black; - border-right: 1px solid black; +.arango-nav { } .dropdown-menu li > a:hover, .dropdown-menu li > a:focus, .dropdown-submenu:hover > a { diff --git a/frontend/css/shellView.css b/frontend/css/shellView.css index 063c068374..b2e70df091 100644 --- a/frontend/css/shellView.css +++ b/frontend/css/shellView.css @@ -125,3 +125,7 @@ .jqconsole-blurred .jqconsole-prompt, .jqconsole-blurred .jqconsole-old-prompt{ opacity: 0.7; } + +#queryOutput .ace_gutter-cell { + background-color: #F0F0F0 !important; +} diff --git a/frontend/js/templates/collectionsView.ejs b/frontend/js/templates/collectionsView.ejs index 6ad6ed76d9..cf17a56567 100644 --- a/frontend/js/templates/collectionsView.ejs +++ b/frontend/js/templates/collectionsView.ejs @@ -3,7 +3,7 @@
- +
    diff --git a/frontend/js/templates/documentView.ejs b/frontend/js/templates/documentView.ejs index 931a8613d9..331d5bd680 100644 --- a/frontend/js/templates/documentView.ejs +++ b/frontend/js/templates/documentView.ejs @@ -16,7 +16,7 @@ - + diff --git a/frontend/js/views/documentView.js b/frontend/js/views/documentView.js index f8d78f1bc5..28361d58e4 100644 --- a/frontend/js/views/documentView.js +++ b/frontend/js/views/documentView.js @@ -42,7 +42,6 @@ var documentView = Backbone.View.extend({ listenKey: function(e) { if (e.keyCode === 13) { - console.log('enter'); $('.btn-success').click(); } }, diff --git a/frontend/js/views/documentsView.js b/frontend/js/views/documentsView.js index ba4d2841c2..f0cc7b9d9d 100644 --- a/frontend/js/views/documentsView.js +++ b/frontend/js/views/documentsView.js @@ -210,7 +210,18 @@ var documentsView = Backbone.View.extend({ }, drawTable: function() { var self = this; + var toCheck = true; $.each(window.arangoDocumentsStore.models, function(key, value) { + + if (toCheck === true) { + $(self.table).dataTable().fnAddData([ + '', + 'Add document', + '' + ]); + toCheck = false; + } + $(self.table).dataTable().fnAddData([ //value.attributes.id, value.attributes.key, @@ -218,13 +229,7 @@ var documentsView = Backbone.View.extend({ '
    ' + self.cutByResolution(JSON.stringify(value.attributes.content)) + '
    ', '' ]); - console.log(value.attributes.key); }); - $(self.table).dataTable().fnAddData([ - '', - 'Add document', - '' - ]); $(".prettify").snippet("javascript", {style: "nedit", menu: false, startText: false, transparent: true, showNum: false}); /* $(".prettify").tooltip({ html: true, @@ -249,6 +254,7 @@ var documentsView = Backbone.View.extend({ this.collectionContext = window.arangoCollectionsStore.getPosition(this.colid); $(this.el).html(this.template.text); + this.initTable(); this.breadcrumb(); if (this.collectionContext.prev === null) { $('#collectionPrev').parent().addClass('disabledPag'); diff --git a/frontend/js/views/logsView.js b/frontend/js/views/logsView.js index 92e156d210..6a12e3e841 100644 --- a/frontend/js/views/logsView.js +++ b/frontend/js/views/logsView.js @@ -153,7 +153,6 @@ var logsView = Backbone.View.extend({ self.lastTable(); } else { - console.log("Number: " + i); self.jumpToTable(i); } options.page = i; diff --git a/frontend/js/views/queryView.js b/frontend/js/views/queryView.js index 7e855b27ae..67aabdaa62 100644 --- a/frontend/js/views/queryView.js +++ b/frontend/js/views/queryView.js @@ -56,7 +56,6 @@ var queryView = Backbone.View.extend({ var queryContent = localStorage.getItem("queryContent"); var queryOutput = localStorage.getItem("queryOutput"); editor.setValue(queryContent); - console.log(queryOutput); editor2.setValue(queryOutput); } return this; From e8a6c9ee6ee9102d8cacb463c25934fadacb6d8e Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Mon, 18 Mar 2013 17:34:17 +0100 Subject: [PATCH 3/9] cleaned up doc operation context --- arangod/CapConstraint/cap-constraint.c | 2 +- arangod/Utils/Transaction.h | 14 ++++++------ arangod/V8Server/v8-query.cpp | 2 +- arangod/VocBase/document-collection.c | 4 ++-- arangod/VocBase/primary-collection.c | 17 +-------------- arangod/VocBase/primary-collection.h | 30 +++++++++----------------- 6 files changed, 22 insertions(+), 47 deletions(-) diff --git a/arangod/CapConstraint/cap-constraint.c b/arangod/CapConstraint/cap-constraint.c index 233e31d40e..55d53eda79 100644 --- a/arangod/CapConstraint/cap-constraint.c +++ b/arangod/CapConstraint/cap-constraint.c @@ -115,7 +115,7 @@ static int PostInsertCapConstraint (TRI_index_t* idx, LOG_DEBUG("removing document '%s' because of cap constraint", (char*) oldest->_key); - TRI_InitContextPrimaryCollection(&rollbackContext, primary, TRI_DOC_UPDATE_LAST_WRITE, false); + TRI_InitContextPrimaryCollection(&rollbackContext, primary, TRI_DOC_UPDATE_LAST_WRITE); res = TRI_DeleteDocumentDocumentCollection(&rollbackContext, oldest); if (res != TRI_ERROR_NO_ERROR) { diff --git a/arangod/Utils/Transaction.h b/arangod/Utils/Transaction.h index 04dcc32d15..8cefd47834 100644 --- a/arangod/Utils/Transaction.h +++ b/arangod/Utils/Transaction.h @@ -452,7 +452,7 @@ namespace triagens { const string& key, const bool lock) { TRI_doc_operation_context_t context; - TRI_InitReadContextPrimaryCollection(&context, primary); + TRI_InitContextPrimaryCollection(&context, primary, TRI_DOC_UPDATE_LAST_WRITE); if (lock) { // READ-LOCK START @@ -476,7 +476,7 @@ namespace triagens { int readCollectionDocuments (TRI_primary_collection_t* const primary, vector& ids) { TRI_doc_operation_context_t context; - TRI_InitReadContextPrimaryCollection(&context, primary); + TRI_InitContextPrimaryCollection(&context, primary, TRI_DOC_UPDATE_LAST_WRITE); // READ-LOCK START this->lockExplicit(primary, TRI_TRANSACTION_READ); @@ -513,7 +513,7 @@ namespace triagens { TRI_voc_size_t limit, uint32_t* total) { TRI_doc_operation_context_t context; - TRI_InitReadContextPrimaryCollection(&context, primary); + TRI_InitContextPrimaryCollection(&context, primary, TRI_DOC_UPDATE_LAST_WRITE); if (limit == 0) { // nothing to do @@ -646,7 +646,7 @@ namespace triagens { const bool lock) { TRI_doc_operation_context_t context; - TRI_InitContextPrimaryCollection(&context, primary, TRI_DOC_UPDATE_LAST_WRITE, forceSync); + TRI_InitContextPrimaryCollection(&context, primary, TRI_DOC_UPDATE_LAST_WRITE); // TODO: set transaction lock here return primary->insert(&context, key, mptr, markerType, shaped, data, lock, forceSync); @@ -693,7 +693,7 @@ namespace triagens { const bool lock) { TRI_doc_operation_context_t context; - TRI_InitContextPrimaryCollection(&context, primary, policy, forceSync); + TRI_InitContextPrimaryCollection(&context, primary, policy); context._expectedRid = expectedRevision; context._previousRid = actualRevision; @@ -714,7 +714,7 @@ namespace triagens { TRI_voc_rid_t* actualRevision, const bool forceSync) { TRI_doc_operation_context_t context; - TRI_InitContextPrimaryCollection(&context, primary, policy, forceSync); + TRI_InitContextPrimaryCollection(&context, primary, policy); context._expectedRid = expectedRevision; context._previousRid = actualRevision; @@ -745,7 +745,7 @@ namespace triagens { } TRI_doc_operation_context_t context; - TRI_InitContextPrimaryCollection(&context, primary, TRI_DOC_UPDATE_LAST_WRITE, forceSync); + TRI_InitContextPrimaryCollection(&context, primary, TRI_DOC_UPDATE_LAST_WRITE); size_t n = ids.size(); res = TRI_ERROR_NO_ERROR; diff --git a/arangod/V8Server/v8-query.cpp b/arangod/V8Server/v8-query.cpp index 9f9842fc92..743aa69211 100644 --- a/arangod/V8Server/v8-query.cpp +++ b/arangod/V8Server/v8-query.cpp @@ -1829,7 +1829,7 @@ static v8::Handle JS_ByExampleQuery (v8::Arguments const& argv) { TRI_doc_operation_context_t context; - TRI_InitReadContextPrimaryCollection(&context, primary); + TRI_InitContextPrimaryCollection(&context, primary, TRI_DOC_UPDATE_LAST_WRITE); trx.lockRead(); diff --git a/arangod/VocBase/document-collection.c b/arangod/VocBase/document-collection.c index 8c0a29c6b7..2ca60480cf 100644 --- a/arangod/VocBase/document-collection.c +++ b/arangod/VocBase/document-collection.c @@ -850,7 +850,7 @@ static int DeleteDocument (TRI_doc_operation_context_t* context, // wait for sync // ............................................................................. - if (context->_sync) { + if (forceSync) { WaitSync(document, journal, ((char const*) result) + totalSize); } @@ -2680,7 +2680,7 @@ static int FillIndex (TRI_document_collection_t* document, TRI_index_t* idx) { primary = &document->base; - TRI_InitContextPrimaryCollection(&context, primary, TRI_DOC_UPDATE_LAST_WRITE, false); + TRI_InitContextPrimaryCollection(&context, primary, TRI_DOC_UPDATE_LAST_WRITE); // update index ptr = primary->_primaryIndex._table; diff --git a/arangod/VocBase/primary-collection.c b/arangod/VocBase/primary-collection.c index 0b16aef06e..6bb26134d0 100644 --- a/arangod/VocBase/primary-collection.c +++ b/arangod/VocBase/primary-collection.c @@ -590,26 +590,11 @@ bool TRI_CloseCompactorPrimaryCollection (TRI_primary_collection_t* primary, void TRI_InitContextPrimaryCollection (TRI_doc_operation_context_t* const context, TRI_primary_collection_t* const primary, - TRI_doc_update_policy_e policy, - bool forceSync) { + TRI_doc_update_policy_e policy) { context->_collection = primary; context->_policy = policy; context->_expectedRid = 0; context->_previousRid = NULL; - context->_sync = forceSync || primary->base._info._waitForSync; -} - -//////////////////////////////////////////////////////////////////////////////// -/// @brief initialise a new operation context for reads -//////////////////////////////////////////////////////////////////////////////// - -void TRI_InitReadContextPrimaryCollection (TRI_doc_operation_context_t* const context, - TRI_primary_collection_t* const primary) { - context->_collection = primary; - context->_policy = TRI_DOC_UPDATE_LAST_WRITE; - context->_expectedRid = 0; - context->_previousRid = NULL; - context->_sync = false; } //////////////////////////////////////////////////////////////////////////////// diff --git a/arangod/VocBase/primary-collection.h b/arangod/VocBase/primary-collection.h index f91dd27c6b..e7120fa4c4 100644 --- a/arangod/VocBase/primary-collection.h +++ b/arangod/VocBase/primary-collection.h @@ -121,11 +121,9 @@ TRI_doc_update_policy_e; typedef struct TRI_doc_operation_context_s { struct TRI_primary_collection_s* _collection; // collection to be used - struct TRI_transaction_s* _transaction; // transaction context TRI_voc_rid_t _expectedRid; // the expected revision id of a document. only used if set and for update/delete TRI_voc_rid_t* _previousRid; // a variable that the previous revsion id found in the database will be pushed into. only used if set and for update/delete TRI_doc_update_policy_e _policy; // the update policy - bool _sync : 1; // force syncing to disk after successful operation } TRI_doc_operation_context_t; @@ -441,7 +439,7 @@ int TRI_InitPrimaryCollection (TRI_primary_collection_t*, TRI_shaper_t*); /// @brief destroys a primary collection //////////////////////////////////////////////////////////////////////////////// -void TRI_DestroyPrimaryCollection (TRI_primary_collection_t* collection); +void TRI_DestroyPrimaryCollection (TRI_primary_collection_t*); //////////////////////////////////////////////////////////////////////////////// /// @} @@ -460,34 +458,34 @@ void TRI_DestroyPrimaryCollection (TRI_primary_collection_t* collection); /// @brief finds a datafile description //////////////////////////////////////////////////////////////////////////////// -TRI_doc_datafile_info_t* TRI_FindDatafileInfoPrimaryCollection (TRI_primary_collection_t* collection, - TRI_voc_fid_t fid); +TRI_doc_datafile_info_t* TRI_FindDatafileInfoPrimaryCollection (TRI_primary_collection_t*, + TRI_voc_fid_t); //////////////////////////////////////////////////////////////////////////////// /// @brief creates a new journal //////////////////////////////////////////////////////////////////////////////// -TRI_datafile_t* TRI_CreateJournalPrimaryCollection (TRI_primary_collection_t* collection); +TRI_datafile_t* TRI_CreateJournalPrimaryCollection (TRI_primary_collection_t*); //////////////////////////////////////////////////////////////////////////////// /// @brief closes an existing journal //////////////////////////////////////////////////////////////////////////////// -bool TRI_CloseJournalPrimaryCollection (TRI_primary_collection_t* collection, - size_t position); +bool TRI_CloseJournalPrimaryCollection (TRI_primary_collection_t*, + size_t); //////////////////////////////////////////////////////////////////////////////// /// @brief creates a new compactor file //////////////////////////////////////////////////////////////////////////////// -TRI_datafile_t* TRI_CreateCompactorPrimaryCollection (TRI_primary_collection_t* collection); +TRI_datafile_t* TRI_CreateCompactorPrimaryCollection (TRI_primary_collection_t*); //////////////////////////////////////////////////////////////////////////////// /// @brief closes an existing compactor file //////////////////////////////////////////////////////////////////////////////// -bool TRI_CloseCompactorPrimaryCollection (TRI_primary_collection_t* collection, - size_t position); +bool TRI_CloseCompactorPrimaryCollection (TRI_primary_collection_t*, + size_t); //////////////////////////////////////////////////////////////////////////////// /// @brief initialise a new operation context @@ -495,15 +493,7 @@ bool TRI_CloseCompactorPrimaryCollection (TRI_primary_collection_t* collection, void TRI_InitContextPrimaryCollection (TRI_doc_operation_context_t* const, TRI_primary_collection_t* const, - TRI_doc_update_policy_e, - bool); - -//////////////////////////////////////////////////////////////////////////////// -/// @brief initialise a new operation context for reads -//////////////////////////////////////////////////////////////////////////////// - -void TRI_InitReadContextPrimaryCollection (TRI_doc_operation_context_t* const, - TRI_primary_collection_t* const); + TRI_doc_update_policy_e); //////////////////////////////////////////////////////////////////////////////// /// @brief compare revision of found document with revision specified in policy From 7f43cf409584ae17f5c4a3daa42e6c7b78a8c83c Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Mon, 18 Mar 2013 17:49:21 +0100 Subject: [PATCH 4/9] added count of totaldocuments --- frontend/css/documentsView.css | 7 +++++++ frontend/js/views/.DS_Store | Bin 6148 -> 0 bytes frontend/js/views/documentsView.js | 9 +++++---- 3 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 frontend/js/views/.DS_Store diff --git a/frontend/css/documentsView.css b/frontend/css/documentsView.css index ee87d52e39..259caea8f5 100644 --- a/frontend/css/documentsView.css +++ b/frontend/css/documentsView.css @@ -28,6 +28,13 @@ table.dataTable td { padding-bottom: 15px; } +#totalDocuments{ + float: left; + color: black; + padding-left: 20px; + margin-top: -65px !important; +} + #documentsStatus { padding-top: 10px; float:left; diff --git a/frontend/js/views/.DS_Store b/frontend/js/views/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0
    • '); $('#documentsToolbarF').append('
    '); - //$('#documentsToolbarF2').append('Total: ' + this.documentsCount + ' documents'); + $('#documentsToolbarFL').append('Total: ' + this.documentsCount + ' documents '); }, breadcrumb: function () { var name = window.location.hash.split("/")[1]; From 15399b0840571993cc83d4a2266e34a010b7ab13 Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Mon, 18 Mar 2013 19:12:18 +0100 Subject: [PATCH 5/9] fixed lostfocus bug --- frontend/js/arango/arango.js | 3 ++- frontend/js/views/documentView.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/js/arango/arango.js b/frontend/js/arango/arango.js index ea02733270..af2d71839c 100644 --- a/frontend/js/arango/arango.js +++ b/frontend/js/arango/arango.js @@ -17,7 +17,8 @@ arangoHelper = { arangoNotification: function (message) { $.gritter.add({ title: "Notification:", - text: message + text: message, + time: 800 }); }, arangoError: function (message) { diff --git a/frontend/js/views/documentView.js b/frontend/js/views/documentView.js index 28361d58e4..7bf89b3046 100644 --- a/frontend/js/views/documentView.js +++ b/frontend/js/views/documentView.js @@ -338,7 +338,8 @@ var documentView = Backbone.View.extend({ cancelcssclass: 'btn btn-danger pull-right', cancel: '
    KeyAttribute   Value type