8000 quod licet iovi non licet bovi by jsteemann · Pull Request #14490 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

quod licet iovi non licet bovi #14490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for 8000 GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 12, 2021
Merged

quod licet iovi non licet bovi #14490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e71fb0d
quod licet iovi non licet bovi
jsteemann Jul 8, 2021
533164a
Merge branch 'devel' of github.com:arangodb/arangodb into bug-fix/lin…
jsteemann Jul 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...server/aql/aql-optimizer-rule-late-document-materialization-arangosearch-primary-sort.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
return {
setUpAll : function () {
db._useDatabase("_system");
try { db._dropDatabase(newDbName); } catch {}
try { db._dropDatabase(newDbName); } catch (err) {}
db._createDatabase(newDbName, dbArgs);
db._useDatabase(newDbName);

Expand Down
2 changes: 1 addition & 1 deletion ...erver/aql/aql-optimizer-rule-late-document-materialization-arangosearch-stored-values.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
return {
setUpAll : function () {
db._useDatabase("_system");
try { db._dropDatabase(newDbName); } catch {}
try { db._dropDatabase(newDbName); } catch (err) {}
db._createDatabase(newDbName, dbArgs);
db._useDatabase(newDbName);

Expand Down
2 changes: 1 addition & 1 deletion tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
return {
setUpAll : function () {
db._useDatabase("_system");
try { db._dropDatabase(newDbName); } catch {}
try { db._dropDatabase(newDbName); } catch (err) {}
db._createDatabase(newDbName, dbArgs);
db._useDatabase(newDbName);

Expand Down
9 changes: 5 additions & 4 deletions tests/js/server/dump/dump-setup-common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*jshint globalstrict:false, strict:false, maxlen:4000, unused:false */
/*global assertEqual, assertUndefined, arango */

////////////////////////////////////////////////////////////////////////////////
/// @brief setup collections for dump/reload tests
Expand Down Expand Up @@ -114,7 +115,7 @@ function createMany() {

function createOrder() {
// we update & modify the order
c = db._create("UnitTestsDumpOrder");
let c = db._create("UnitTestsDumpOrder");
c.save({ _key: "one", value: 1 });
c.save({ _key: "two", value: 2 });
c.save({ _key: "three", value: 3 });
Expand Down Expand Up @@ -158,9 +159,9 @@ function createModifyCollection() {

function createMultiShard() {
// more than one shard:
c = db._create("UnitTestsDumpShards", { numberOfShards : 9 });
l = [];
for (i = 0; i < 1000; ++i) {
let c = db._create("UnitTestsDumpShards", { numberOfShards : 9 });
let l = [];
for (let i = 0; i < 1000; ++i) {
l.push({ _key : String(7 + (i*42)), value: i, more: { value: [ i, i ] } });
}
c.save(l);
Expand Down
2 changes: 1 addition & 1 deletion tests/js/server/dump/dump-test.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*jshint globalstrict:false, strict:false, maxlen:4000 */
/*global assertEqual, assertNotEqual, assertTrue, assertFalse, assertNull */
/*global assertEqual, assertNotEqual, assertTrue, assertFalse, assertNull, assertTypeOf, assertUndefined, arango */

////////////////////////////////////////////////////////////////////////////////
/// @brief tests for dump/reload
Expand Down
6 changes: 3 additions & 3 deletions utils/jslint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ if [ -z "$*" ] ; then
$(find "${WD}/js/common/modules/@arangodb" -name "*.js") \
$(find "${WD}/js/client/modules/@arangodb" -name "*.js") \
$(find "${WD}/js/server/modules/@arangodb" -name "*.js") \
$(find "${WD}/tests/js/server" -name "*.js" | grep -v "ranges-combined") \
$(find "${WD}/tests/js/common" -name "*.js" | grep -v "test-data") \
$(find "${WD}/tests/js/client" -name "*.js") \
$(find "${WD}/tests/js/server" -name "*.js" -o -name "*.inc" | grep -v "ranges-combined") \
$(find "${WD}/tests/js/common" -name "*.js" -o -name "*.inc" | grep -v "test-data") \
$(find "${WD}/tests/js/client" -name "*.js" -o -name "*.inc") \
$(find "${WD}/UnitTests" -name "*.js") \
\
$(find "${WD}/js/apps/system/_admin/aardvark/APP/frontend/js/models" -name "*.js") \
Expand Down
0