Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api

arangod/Cache/FrequencyBuffer.h

@@ -100,7 +100,7 @@ class FrequencyBuffer {
   /// @brief Return a list of (event, count) pairs for each recorded event in
   /// ascending order.
   //////////////////////////////////////////////////////////////////////////////
-  std::shared_ptr<FrequencyBuffer::stats_t> getFrequencies() const {
+  std::shared_ptr<typename FrequencyBuffer::stats_t> getFrequencies() const {
     // calculate frequencies
     std::unordered_map<T, uint64_t> frequencies;
     for (size_t i = 0; i < _capacity; i++) {

js/client/modules/@arangodb/testing.js

@@ -3428,6 +3428,7 @@ const recoveryTests = [
   'resume-recovery-other',
   'resume-recovery',
   'foxx-directories',
+  'collection-duplicate',
   'collection-rename',
   'collection-properties',
   'empty-logfiles',

js/server/tests/recovery/collection-duplicate.js

@@ -0,0 +1,90 @@
+/* jshint globalstrict:false, strict:false, unused : false */
+/* global assertEqual */
+
+// //////////////////////////////////////////////////////////////////////////////
+// / @brief tests for dump/reload
+// /
+// / @file
+// /
+// / DISCLAIMER
+// /
+// / Copyright 2010-2012 triagens GmbH, Cologne, Germany
+// /
+// / Licensed under the Apache License, Version 2.0 (the "License")
+// / you may not use this file except in compliance with the License.
+// / You may obtain a copy of the License at
+// /
+// /     http://www.apache.org/licenses/LICENSE-2.0
+// /
+// / Unless required by applicable law or agreed to in writing, software
+// / distributed under the License is distributed on an "AS IS" BASIS,
+// / WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// / See the License for the specific language governing permissions and
+// / limitations under the License.
+// /
+// / Copyright holder is triAGENS GmbH, Cologne, Germany
+// /
+// / @author Jan Steemann
+// / @author Copyright 2012, triAGENS GmbH, Cologne, Germany
+// //////////////////////////////////////////////////////////////////////////////
+
+var db = require('@arangodb').db;
+var internal = require('internal');
+var jsunity = require('jsunity');
+
+function runSetup () {
+  'use strict';
+  internal.debugClearFailAt();
+
+  db._drop('UnitTestsRecovery');
+  var c = db._create('UnitTestsRecovery');
+
+  // try to re-create collection with the same name
+  try {
+    db._create('UnitTestsRecovery');
+  } catch (err) {
+  }
+
+  c.save({ _key: 'foo' }, true);
+
+  internal.debugSegfault('crashing server');
+}
+
+// //////////////////////////////////////////////////////////////////////////////
+// / @brief test suite
+// //////////////////////////////////////////////////////////////////////////////
+
+function recoverySuite () {
+  'use strict';
+  jsunity.jsUnity.attachAssertions();
+
+  return {
+    setUp: function () {},
+    tearDown: function () {},
+
+    // //////////////////////////////////////////////////////////////////////////////
+    // / @brief test whether we can restore the trx data
+    // //////////////////////////////////////////////////////////////////////////////
+
+    testCollectionDuplicate: function () {
+      var c = db._collection('UnitTestsRecovery');
+      assertEqual(1, c.count());
+    }
+
+  };
+}
+
+// //////////////////////////////////////////////////////////////////////////////
+// / @brief executes the test suite
+// //////////////////////////////////////////////////////////////////////////////
+
+function main (argv) {
+  'use strict';
+  if (argv[1] === 'setup') {
+    runSetup();
+    return 0;
+  } else {
+    jsunity.run(recoverySuite);
+    return jsunity.done().status ? 0 : 1;
+  }
+}

lib/Logger/LoggerStream.h

@@ -77,9 +77,9 @@ class LoggerStream {
   }
 
   template <typename T>
-  LoggerStream& operator<<(T const& obj) {
+  friend LoggerStream& operator<<(LoggerStream& out, T const& obj) {
-    _out << obj;
+    out << obj;
-    return *this;
+    return out;
   }
 
   template <typename T1, typename T2>