Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Kaveh Vahedipour 2017-06-08 14:34:56 +02:00
parent 63b5cadcd0 0c0a956a62
commit 924ef445b0
10 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
UnitTests/HttpInterface/api-index-geo-spec-mmfiles.rb → UnitTests/HttpInterface/api-index-geo-spec.rb
View File

2
arangod/Cache/Metadata.cpp
View File

@ -31,8 +31,6 @@
#include <algorithm>
#include <atomic>
#include <iostream> // TODO
using namespace arangodb::cache;
Metadata::Metadata()

1
arangod/GeneralServer/RestEngine.cpp
View File

@ -22,7 +22,6 @@
#include "RestEngine.h"
#include <iostream>
#include "GeneralServer/RestHandler.h"
#include "Logger/Logger.h"

2
arangod/MMFiles/MMFilesFulltextIndex.cpp
View File

@ -114,8 +114,6 @@ MMFilesFulltextIndex::MMFilesFulltextIndex(TRI_idx_iid_t iid,
}
}
MMFilesFulltextIndex::~MMFilesFulltextIndex() {
if (_fulltextIndex != nullptr) {
LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "destroying fulltext index";

14
arangod/MMFiles/MMFilesIndexFactory.cpp
View File

@ -170,9 +170,13 @@ static int EnhanceJsonIndexPersistent(VPackSlice const definition,
static void ProcessIndexGeoJsonFlag(VPackSlice const definition,
VPackBuilder& builder) {
bool geoJson =
basics::VelocyPackHelper::getBooleanValue(definition, "geoJson", false);
builder.add("geoJson", VPackValue(geoJson));
VPackSlice fieldsSlice = definition.get("fields");
if (fieldsSlice.isArray() && fieldsSlice.length() == 1) {
// only add geoJson for indexes with a single field (with needs to be an array)
bool geoJson =
basics::VelocyPackHelper::getBooleanValue(definition, "geoJson", false);
builder.add("geoJson", VPackValue(geoJson));
}
}
////////////////////////////////////////////////////////////////////////////////
@ -221,6 +225,10 @@ static int EnhanceJsonIndexFulltext(VPackSlice const definition,
VPackBuilder& builder, bool create) {
int res = ProcessIndexFields(definition, builder, 1, create);
if (res == TRI_ERROR_NO_ERROR) {
// hard-coded defaults
builder.add("sparse", VPackValue(true));
builder.add("unique", VPackValue(false));
// handle "minLength" attribute
int minWordLength = TRI_FULLTEXT_MIN_WORD_LENGTH_DEFAULT;
VPackSlice minLength = definition.get("minLength");

9
arangod/RestServer/AqlFeature.cpp
View File

@ -84,11 +84,16 @@ void AqlFeature::stop() {
_isStopped = true; // prevent new AQL queries from being launched
}
LOG_TOPIC(DEBUG, Logger::QUERIES) << "AQL feature stopped";
QueryRegistryFeature::QUERY_REGISTRY->destroyAll();
TraverserEngineRegistryFeature::TRAVERSER_ENGINE_REGISTRY->destroyAll();
// Wait until all AQL queries are done
while (true) {
try {
QueryRegistryFeature::QUERY_REGISTRY->destroyAll();
TraverserEngineRegistryFeature::TRAVERSER_ENGINE_REGISTRY->destroyAll();
} catch (...) {
// ignore errors here. if it fails, we'll try again in next round
}
size_t m, n, o;
{
MUTEX_LOCKER(locker, AqlFeature::_aqlFeatureMutex);

1
arangod/RocksDBEngine/RocksDBGeoIndexImpl.cpp
View File

@ -26,7 +26,6 @@
#define _USE_MATH_DEFINES
#include <cmath>
#include <cstddef>
#include <iostream>
#include <limits>
#include "RocksDBEngine/RocksDBGeoIndexImpl.h"

14
arangod/RocksDBEngine/RocksDBIndexFactory.cpp
View File

@ -170,9 +170,13 @@ static int EnhanceJsonIndexPersistent(VPackSlice const definition,
static void ProcessIndexGeoJsonFlag(VPackSlice const definition,
VPackBuilder& builder) {
bool geoJson =
basics::VelocyPackHelper::getBooleanValue(definition, "geoJson", false);
builder.add("geoJson", VPackValue(geoJson));
VPackSlice fieldsSlice = definition.get("fields");
if (fieldsSlice.isArray() && fieldsSlice.length() == 1) {
// only add geoJson for indexes with a single field (with needs to be an array)
bool geoJson =
basics::VelocyPackHelper::getBooleanValue(definition, "geoJson", false);
builder.add("geoJson", VPackValue(geoJson));
}
}
////////////////////////////////////////////////////////////////////////////////
@ -222,6 +226,10 @@ static int EnhanceJsonIndexFulltext(VPackSlice const definition,
VPackBuilder& builder, bool create) {
int res = ProcessIndexFields(definition, builder, 1, create);
if (res == TRI_ERROR_NO_ERROR) {
// hard-coded defaults
builder.add("sparse", VPackValue(true));
builder.add("unique", VPackValue(false));
// handle "minLength" attribute
int minWordLength = TRI_FULLTEXT_MIN_WORD_LENGTH_DEFAULT;
VPackSlice minLength = definition.get("minLength");

2
arangod/V8Server/v8-actions.cpp
View File

@ -48,8 +48,6 @@
#include "VocBase/ticks.h"
#include "VocBase/vocbase.h"
#include <iostream>
#include <velocypack/Buffer.h>
#include <velocypack/Builder.h>
#include <velocypack/Parser.h>

6
cmake/packages/deb.cmake
View File

@ -18,7 +18,11 @@ set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${ARANGODB_URL_INFO_ABOUT})
set(CPACK_COMPONENTS_ALL debian-extras)
set(CPACK_GENERATOR "DEB")
set(CPACK_SYSTEMD_FOUND "${SYSTEMD_FOUND}")
if (SYSTEMD_FOUND)
set(CPACK_SYSTEMD_FOUND "1")
else()
set(CPACK_SYSTEMD_FOUND "0")
endif()
# substitute the package name so debconf works:
configure_file (