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

issue 431.1: remove error generation for empty jSON (#6007)

This commit is contained in:
Vasiliy 2018-07-26 19:03:35 +03:00 committed by Andrey Abramov
parent 1f16898027
commit a291f6dcfa
4 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/RestHandler/RestViewHandler.cpp
View File

@ -160,11 +160,6 @@ void RestViewHandler::createView() {
////////////////////////////////////////////////////////////////////////////////
void RestViewHandler::modifyView(bool partialUpdate) {
if (_request->payload().isEmptyObject()) {
generateError(rest::ResponseCode::BAD, TRI_ERROR_HTTP_CORRUPTED_JSON);
return;
}
std::vector<std::string> const& suffixes = _request->suffixes();
if ((suffixes.size() != 2) || (suffixes[1] != "properties" && suffixes[1] != "rename")) {

2
js/client/modules/@arangodb/test-utils.js
View File

@ -726,7 +726,7 @@ function runInRSpec (options, instanceInfo, file, addArgs) {
}
}
fs.remove(jsonFN);
if (fs.exists(jsonFN)) fs.remove(jsonFN);
fs.remove(tmpname);
return result;
}

25
js/common/tests/aql/aql-view-arangosearch-ddl-cluster.js
View File

@ -680,6 +680,31 @@ function IResearchFeatureDDLTestSuite () {
assertEqual(300, properties.commit.consolidate.count.segmentThreshold);
assertEqual((0.85).toFixed(6), properties.commit.consolidate.count.threshold.toFixed(6));
assertEqual("de_DE.UTF-8", properties.locale);
view.properties({}, false); // full update (reset to defaults)
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(0, result.length);
properties = view.properties();
assertTrue(Object === properties.commit.constructor);
assertEqual(10, properties.commit.cleanupIntervalStep);
assertEqual(60000, properties.commit.commitIntervalMsec);
assertTrue(Object === properties.commit.consolidate.constructor);
assertEqual(4, Object.keys(properties.commit.consolidate).length);
assertTrue(Object === properties.commit.consolidate.bytes.constructor);
assertEqual(300, properties.commit.consolidate.bytes.segmentThreshold);
assertEqual((0.85).toFixed(6), properties.commit.consolidate.bytes.threshold.toFixed(6));
assertTrue(Object === properties.commit.consolidate.bytes_accum.constructor);
assertEqual(300, properties.commit.consolidate.bytes_accum.segmentThreshold);
assertEqual((0.85).toFixed(6), properties.commit.consolidate.bytes_accum.threshold.toFixed(6));
assertTrue(Object === properties.commit.consolidate.count.constructor);
assertEqual(300, properties.commit.consolidate.count.segmentThreshold);
assertEqual((0.85).toFixed(6), properties.commit.consolidate.count.threshold.toFixed(6));
assertTrue(Object === properties.commit.consolidate.fill.constructor);
assertEqual(300, properties.commit.consolidate.fill.segmentThreshold);
assertEqual((0.85).toFixed(6), properties.commit.consolidate.fill.threshold.toFixed(6));
assertEqual("C", properties.locale);
assertTrue(Object === properties.links.constructor);
assertEqual(0, Object.keys(properties.links).length);
},
testLinkModify: function() {

25
js/common/tests/aql/aql-view-arangosearch-ddl-noncluster.js
View File

@ -600,6 +600,31 @@ function iResearchFeatureAqlTestSuite () {
assertEqual(300, properties.commit.consolidate.count.segmentThreshold);
assertEqual((0.85).toFixed(6), properties.commit.consolidate.count.threshold.toFixed(6));
assertEqual("de_DE.UTF-8", properties.locale);
view.properties({}, false); // full update (reset to defaults)
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(0, result.length);
properties = view.properties();
assertTrue(Object === properties.commit.constructor);
assertEqual(10, properties.commit.cleanupIntervalStep);
assertEqual(60000, properties.commit.commitIntervalMsec);
assertTrue(Object === properties.commit.consolidate.constructor);
assertEqual(4, Object.keys(properties.commit.consolidate).length);
assertTrue(Object === properties.commit.consolidate.bytes.constructor);
assertEqual(300, properties.commit.consolidate.bytes.segmentThreshold);
assertEqual((0.85).toFixed(6), properties.commit.consolidate.bytes.threshold.toFixed(6));
assertTrue(Object === properties.commit.consolidate.bytes_accum.constructor);
assertEqual(300, properties.commit.consolidate.bytes_accum.segmentThreshold);
assertEqual((0.85).toFixed(6), properties.commit.consolidate.bytes_accum.threshold.toFixed(6));
assertTrue(Object === properties.commit.consolidate.count.constructor);
assertEqual(300, properties.commit.consolidate.count.segmentThreshold);
assertEqual((0.85).toFixed(6), properties.commit.consolidate.count.threshold.toFixed(6));
assertTrue(Object === properties.commit.consolidate.fill.constructor);
assertEqual(300, properties.commit.consolidate.fill.segmentThreshold);
assertEqual((0.85).toFixed(6), properties.commit.consolidate.fill.threshold.toFixed(6));
assertEqual("C", properties.locale);
assertTrue(Object === properties.links.constructor);
assertEqual(0, Object.keys(properties.links).length);
},
testLinkModify: function() {