8000 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine… · georgekaf/arangodb@13a1f15 · GitHub
[go: up one dir, main page]
Skip to content

Commit 13a1f15

Browse files
mchackimchacki
committed
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2 parents 048bdf4 + aba8e42 commit 13a1f15

File tree

9 files changed

+20
-191
lines changed

9 files changed

+20
-191
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ addons:
2424
- ubuntu-toolchain-r-test
2525
- george-edison55-precise-backports
2626
packages:
27-
- g++-4.9
28-
- gcc-4.9
27+
- g++-5
28+
- gcc-5
2929
- binutils-gold
3030
- gdb
3131
- cmake-data

‎Installation/travisCI/before_script.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ mkdir -p $HOME/bin/gold
77
chmod a+x $HOME/bin/gold/ld
88

99
# prepare CCACHE
10-
(echo '#!/bin/bash'; echo 'ccache /usr/bin/gcc-4.9 "$@"') > $HOME/bin/gcc
10+
(echo '#!/bin/bash'; echo 'ccache /usr/bin/gcc-5 "$@"') > $HOME/bin/gcc
1111
chmod a+x $HOME/bin/gcc
1212

13-
(echo '#!/bin/bash'; echo 'ccache /usr/bin/g++-4.9 "$@"') > $HOME/bin/g++
13+
(echo '#!/bin/bash'; echo 'ccache /usr/bin/g++-5 "$@"') > $HOME/bin/g++
1414
chmod a+x $HOME/bin/g++
1515

1616
# prepare files for unit test

‎arangod/Cache/Cache.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,11 @@ uint64_t Cache::usage() {
142142
}
143143

144144
std::pair<double, double> Cache::hitRates() {
145-
double lifetimeRate = std::nan("");
146145
double windowedRate = std::nan("");
147146

148147
uint64_t currentMisses = _findMisses.load();
149148
uint64_t currentHits = _findHits.load();
150-
lifetimeRate = 100 * (static_cast<double>(currentHits) /
149+
double lifetimeRate = 100 * (static_cast<double>(currentHits) /
151150
static_cast<double>(currentHits + currentMisses));
152151

153152
if (_enableWindowedStats && _findStats.get() != nullptr) {

‎arangod/Cache/Manager.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,10 @@ uint64_t Manager::globalAllocation() {
197197
}
198198

199199
std::pair<double, double> Manager::globalHitRates() {
200-
double lifetimeRate = std::nan("");
201200
double windowedRate = std::nan("");
202-
203201
uint64_t currentMisses = _findMisses.load();
204202
uint64_t currentHits = _findHits.load();
205-
lifetimeRate = 100 * (static_cast<double>(currentHits) /
203+
double lifetimeRate = 100 * (static_cast<double>(currentHits) /
206204
static_cast<double>(currentHits + currentMisses));
207205

208206
if (_enableWindowedStats && _findStats.get() != nullptr) {

‎bootstrap.sh

Lines changed: 0 additions & 139 deletions
This file was deleted.

‎lib/Basics/AttributeNameParser.cpp

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -210,19 +210,6 @@ bool arangodb::basics::TRI_AttributeNamesHaveExpansion(
210210
/// @brief append the attribute name to an output stream
211211
////////////////////////////////////////////////////////////////////////////////
212212

213-
std::ostream& operator<<(std::ostream& stream,
214-
arangodb::basics::AttributeName const* name) {
215-
stream << name->name;
216-
if (name->shouldExpand) {
217-
stream << "[*]";
218-
}
219-
return stream;
220-
}
221-
222-
////////////////////////////////////////////////////////////////////////////////
223-
/// @brief append the attribute name to an output stream
224-
////////////////////////////////////////////////////////////////////////////////
225-
226213
std::ostream& operator<<(std::ostream& stream,
227214
arangodb::basics::AttributeName const& name) {
228215
stream << name.name;
@@ -236,23 +223,6 @@ std::ostream& operator<<(std::ostream& stream,
236223
/// @brief append the attribute names to an output stream
237224
////////////////////////////////////////////////////////////////////////////////
238225

239-
std::ostream& operator<<(
240-
std::ostream& stream,
241-
std::vector<arangodb::basics::AttributeName> const* attributes) {
242-
size_t const n = attributes->size();
243-
for (size_t i = 0; i < n; ++i) {
244-
if (i > 0) {
245-
stream << ".";
246-
}
247-
stream << attributes[i];
248-
}
249-
return stream;
250-
}
251-
252-
////////////////////////////////////////////////////////////////////////////////
253-
/// @brief append the attribute names to an output stream
254-
////////////////////////////////////////////////////////////////////////////////
255-
256226
std::ostream& operator<<(
257227
std::ostream& stream,
258228
std::vector<arangodb::basics::AttributeName> const& attributes) {

‎lib/Basics/AttributeNameParser.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,7 @@ bool TRI_AttributeNamesHaveExpansion(std::vector<AttributeName> const& input);
129129
}
130130
}
131131

132-
std::ostream& operator<<(std::ostream&, arangodb::basics::AttributeName const*);
133132
std::ostream& operator<<(std::ostream&, arangodb::basics::AttributeName const&);
134-
std::ostream& operator<<(std::ostream&,
135-
std::vector<arangodb::basics::AttributeName> const*);
136133
std::ostream& operator<<(std::ostream&,
137134
std::vector<arangodb::basics::AttributeName> const&);
138135

‎lib/Basics/debugging.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,16 @@ void TRI_ShutdownDebugging();
114114
void TRI_FlushDebugging();
115115
void TRI_FlushDebugging(char const* file, int line, char const* message);
116116

117+
////////////////////////////////////////////////////////////////////////////////
118+
/// @brief dump pair contents to an ostream
119+
////////////////////////////////////////////////////////////////////////////////
120+
121+
template <typename T1, typename T2>
122+
std::ostream& operator<<(std::ostream& stream, std::pair<T1, T2> const& obj) {
123+
stream << '(' << obj.first << ", " << obj.second << ')';
124+
return stream;
125+
}
126+
117127
////////////////////////////////////////////////////////////////////////////////
118128
/// @brief dump vector contents to an ostream
119129
////////////////////////////////////////////////////////////////////////////////
@@ -209,7 +219,7 @@ std::ostream& operator<<(std::ostream& stream,
209219
}
210220

211221
////////////////////////////////////////////////////////////////////////////////
212-
/// @brief dump unordered_map contents to an ostream
222+
/// @brief dump map contents to an ostream
213223
////////////////////////////////////////////////////////////////////////////////
214224

215225
template <typename K, typename V>

‎lib/Logger/LoggerStream.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,11 @@ class LoggerStream {
7777
}
7878

7979
template <typename T>
80-
friend LoggerStream& operator<<(LoggerStream& out, T const& obj) {
81-
out << obj;
82-
return out;
83-
}
84-
85-
template <typename T1, typename T2>
86-
LoggerStream& operator<<(std::pair<T1, T2> const& obj) {
87-
_out << '(' << obj.first << ", " << obj.second << ')';
80+
LoggerStream& operator<<(T const& obj) {
81+
_out << obj;
8882
return *this;
8983
}
90-
84+
9185
private:
9286
std::stringstream _out;
9387
size_t _topicId;

0 commit comments

Comments
 (0)
0