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:
jsteemann 2017-06-08 13:41:11 +02:00
parent 25529aa674 5ad9423f16
commit 0c0a956a62
7 changed files with 29 additions and 11 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/Agency/Agent.cpp
View File

@ -1029,7 +1029,7 @@ void Agent::run() {
sendAppendEntriesRPC(); sendAppendEntriesRPC();
// Don't panic // Don't panic
_appendCV.wait(10); _appendCV.wait(1.0e-1*_config.minPing());
// Detect faulty agent and replace // Detect faulty agent and replace
// if possible and only if not already activating // if possible and only if not already activating

2
arangod/MMFiles/MMFilesFulltextIndex.cpp
View File

@ -114,8 +114,6 @@ MMFilesFulltextIndex::MMFilesFulltextIndex(TRI_idx_iid_t iid,
} }
} }
MMFilesFulltextIndex::~MMFilesFulltextIndex() { MMFilesFulltextIndex::~MMFilesFulltextIndex() {
if (_fulltextIndex != nullptr) { if (_fulltextIndex != nullptr) {
LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "destroying fulltext index"; 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, static void ProcessIndexGeoJsonFlag(VPackSlice const definition,
VPackBuilder& builder) { VPackBuilder& builder) {
bool geoJson = VPackSlice fieldsSlice = definition.get("fields");
basics::VelocyPackHelper::getBooleanValue(definition, "geoJson", false); if (fieldsSlice.isArray() && fieldsSlice.length() == 1) {
builder.add("geoJson", VPackValue(geoJson)); // 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) { VPackBuilder& builder, bool create) {
int res = ProcessIndexFields(definition, builder, 1, create); int res = ProcessIndexFields(definition, builder, 1, create);
if (res == TRI_ERROR_NO_ERROR) { if (res == TRI_ERROR_NO_ERROR) {
// hard-coded defaults
builder.add("sparse", VPackValue(true));
builder.add("unique", VPackValue(false));
// handle "minLength" attribute // handle "minLength" attribute
int minWordLength = TRI_FULLTEXT_MIN_WORD_LENGTH_DEFAULT; int minWordLength = TRI_FULLTEXT_MIN_WORD_LENGTH_DEFAULT;
VPackSlice minLength = definition.get("minLength"); VPackSlice minLength = definition.get("minLength");

14
arangod/RocksDBEngine/RocksDBIndexFactory.cpp
View File

@ -170,9 +170,13 @@ static int EnhanceJsonIndexPersistent(VPackSlice const definition,
static void ProcessIndexGeoJsonFlag(VPackSlice const definition, static void ProcessIndexGeoJsonFlag(VPackSlice const definition,
VPackBuilder& builder) { VPackBuilder& builder) {
bool geoJson = VPackSlice fieldsSlice = definition.get("fields");
basics::VelocyPackHelper::getBooleanValue(definition, "geoJson", false); if (fieldsSlice.isArray() && fieldsSlice.length() == 1) {
builder.add("geoJson", VPackValue(geoJson)); // 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) { VPackBuilder& builder, bool create) {
int res = ProcessIndexFields(definition, builder, 1, create); int res = ProcessIndexFields(definition, builder, 1, create);
if (res == TRI_ERROR_NO_ERROR) { if (res == TRI_ERROR_NO_ERROR) {
// hard-coded defaults
builder.add("sparse", VPackValue(true));
builder.add("unique", VPackValue(false));
// handle "minLength" attribute // handle "minLength" attribute
int minWordLength = TRI_FULLTEXT_MIN_WORD_LENGTH_DEFAULT; int minWordLength = TRI_FULLTEXT_MIN_WORD_LENGTH_DEFAULT;
VPackSlice minLength = definition.get("minLength"); VPackSlice minLength = definition.get("minLength");

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_COMPONENTS_ALL debian-extras)
set(CPACK_GENERATOR "DEB") 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: # substitute the package name so debconf works:
configure_file ( configure_file (

2
js/client/tests/agency/agency-test.js
View File

@ -86,7 +86,7 @@ function agencyTestSuite () {
method: "POST", followRedirect: false, method: "POST", followRedirect: false,
body: JSON.stringify(list), body: JSON.stringify(list),
headers: {"Content-Type": "application/json"}, headers: {"Content-Type": "application/json"},
timeout: 120 /* essentially for the huge trx package timeout: 240 /* essentially for the huge trx package
running under ASAN in the CI */ }); running under ASAN in the CI */ });
if(res.statusCode === 307) { if(res.statusCode === 307) {
agencyLeader = res.headers.location; agencyLeader = res.headers.location;