Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
29,984 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

1399 Commits

Author SHA1 Message Date
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Jan Steemann 48d0a1cbb5 micro optimizations 2016-04-21 12:46:53 +02:00
Simran Brucherseifer a5ad9f33a9 Minor corrections 
Excluded Aardvark, the graph viewer in particular
 2016-04-20 22:09:00 +02:00
Kaveh Vahedipour d53e47c7d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-20 11:23:10 +00:00
Michael Hackstein 0cb3741e4f Fixed a bug in assoc multi. One result container was not handed in by reference. 2016-04-20 11:19:55 +02:00
Michael Hackstein 3407f4b111 The edge index now hands-in the result vector for doc mptr to AssocMulti. Also fixed the batch size for index lookups 2016-04-20 09:16:51 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
jsteemann 316a1bd190 starting support for Externals 2016-04-19 22:31:40 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
 2016-04-19 07:44:00 +02:00
Jan Steemann 917a1744c9 updated vpack library 2016-04-18 15:30:26 +02:00
Frank Celler 17cd890132 WIP 2016-04-16 20:29:33 -07:00
Frank Celler 2dd798cd48 WIP 2016-04-15 22:09:55 -07:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Kaveh Vahedipour d247e7a3bd mop is fixing the cluster load 2016-04-13 15:36:11 +02:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Frank Celler 3f9dd62d4c WIP 2016-04-13 12:30:18 +02:00
Michael Hackstein a14d7dffe2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-13 08:30:48 +02:00
Jan Steemann c0fd5c5f78 removal of some JSON 2016-04-12 18:21:11 +02:00
Michael Hackstein 97623706b3 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-11 10:09:43 +02:00
Michael Hackstein df497eb8b2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-10 14:09:25 +02:00
jsteemann 607efe8f89 removed unused function 2016-04-09 10:57:07 +02:00
jsteemann 163a61f17b prevent races on shutdown 2016-04-09 00:18:41 +02:00
jsteemann e839150857 use log topics 2016-04-09 00:17:06 +02:00
Jan Steemann f2e2dbb435 pacify valgrind 
added assertion

added assertions
 2016-04-08 15:05:08 +02:00
Michael Hackstein d67b203382 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-08 13:15:16 +02:00
Michael Hackstein 541395a262 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-08 12:42:59 +02:00
Michael Hackstein 12d973504c Fixed babies creation in cluster with undefined keys. 2016-04-08 10:53:11 +02:00
Jan Steemann e4b1dd8f5f fixed tests for TRI_HashJsonByAttributes() 2016-04-07 19:55:42 +02:00
Jan Steemann 6df7221691 cleanup 2016-04-07 17:08:44 +02:00
Michael Hackstein d792432d95 Replaced HashByAttributes to only use VelocyPack. Will be removed soon. Also removed some obsolete code 2016-04-07 16:13:43 +02:00
Kaveh Vahedipour bb4d520467 VelocyPackHelper buildEmptyObject was buggy 2016-04-06 16:33:56 +00:00
Michael Hackstein 3ad837f17c Added a function to hash specific attributes of a velocypack Object 2016-04-06 16:43:59 +02:00
Max Neunhoeffer b1963d2cee Fix replication in the sense that revs are now copied over. 2016-04-05 10:27:43 +02:00
Frank Celler 5cab4cffac WIP 2016-04-04 15:23:25 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Frank Celler 873f226b5f added SchedulerFeature 2016-04-01 12:52:28 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Michael Hackstein a5d20b0041 Activated Externals in OperationCursor. This commit might break tests again. 2016-03-29 11:08:31 +02:00
Frank Celler 02c7db250e added supervisor 2016-03-26 21:12:39 +01:00
Frank Celler af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
Jan Steemann cda0646c83 removed unused error codes 2016-03-24 17:04:58 +01:00
Michael Hackstein ed7fd3c495 Added VPack MinKey as Illegal Index Element. Is used to distinguish NON existance in Array indexes 2016-03-24 13:40:16 +01:00
Jan Steemann 809c32c63d fixed typeweights 2016-03-24 12:52:08 +01:00
Michael Hackstein af14e598d1 Fixed Array Indexing. All tests are green again 2016-03-24 11:22:01 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Andreas Streichardt 8cdf8eebad More python fixes 2016-03-23 18:36:22 +01:00
Jan Steemann d5d943b4a5 adapt to branch 2016-03-23 17:09:29 +01:00
Jan Steemann c8c9288400 harmonize value comparisons for hash indexes 2016-03-23 16:36:00 +01:00
Kaveh Vahedipour 7254ad4c9e Fixing issues 2016-03-23 15:16:47 +01:00
Frank Celler e293447e25 added tty logger 2016-03-22 23:38:30 +01:00
Frank Celler 86fe838a68 new logger 2016-03-22 21:09:48 +01:00
Jan Steemann 7681c026f3 removed unused methods 2016-03-22 13:40:25 +01:00
Michael Hackstein db009fe70e Fixed a compile error if a an ifdef is not matched 2016-03-22 09:17:17 +01:00
jsteemann 9fcc5d043b removed superfluous includes 2016-03-21 22:58:42 +01:00
jsteemann f840c2e6bb remove unused typedefs and functionality 2016-03-21 22:43:57 +01:00
jsteemann 3dede4a71f cleanup 2016-03-21 22:30:00 +01:00
jsteemann e69420f04d removed unused JSON functionality 2016-03-21 21:58:33 +01:00
jsteemann d03170a93f removed unused functionality 2016-03-21 21:41:39 +01:00
jsteemann 268a2e4a62 removed unused code 2016-03-21 21:07:59 +01:00
Frank Celler 07411745f9 raised open files 2016-03-21 16:40:30 +01:00
Jan Steemann ecf3120190 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 13:24:17 +01:00
Jan Steemann c6502e752b fixed issue #1781: ArangoDB startup time increased tremendously 2016-03-21 10:52:35 +01:00
jsteemann 1bd1463b4b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 20:22:25 +01:00
jsteemann 62058d4900 allow turning off SSE4_2 variants 2016-03-18 19:39:53 +01:00
Frank Celler 531b7c5590 fixed path (dopple back-slash) 2016-03-18 18:38:05 +01:00
jsteemann 5ded90ed1c fixed compare function for Custom attributes 2016-03-18 13:55:36 +01:00
jsteemann cdd19411af class vs. struct 2016-03-16 23:42:55 +01:00
jsteemann 171488b6d2 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 23:34:29 +01:00
Andreas Streichardt 614beefc74 Throw Http error 503 when a required backend is unavailable 2016-03-16 18:04:05 +00:00
jsteemann 3a6e618a30 micro optimizations 2016-03-15 12:28:58 +01:00
jsteemann b04ec219d9 changed functions signature 2016-03-15 00:01:54 +01:00
jsteemann 91c67e0a37 fixed compile error 2016-03-14 08:34:11 +01:00
Jan Steemann 74073bf9cb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 13:04:02 +01:00
Wilfried Goesgens f7b80bf656 Add handler for TLS V1.2 as sugested by kurtkincaid in #1771 2016-03-11 11:18:28 +01:00
Jan Steemann 4c84d3f9ee Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 08:54:40 +01:00
Frank Celler 5cac7abb5b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-10 23:00:22 +00:00
Frank Celler 46b702b2cb fixed colors 2016-03-10 22:59:51 +00:00
Wilfried Goesgens ddc5369949 test for OPENSSL_NO_SSL3_METHOD; this fixes #1773 2016-03-10 23:26:36 +01:00
Jan Steemann 11d9451c8c Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-10 19:26:05 +01:00
Michael Hackstein 23f845de05 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 10:46:30 +01:00
Michael Hackstein 4c4c117059 Partially Adopted Traverser to new transaction API. This is still work in Progress. It compiles but it will not work yet. 2016-03-10 10:42:20 +01:00
Frank Celler dd36dd55e6 fixes for windows 2016-03-10 09:25:54 +00:00
jsteemann 279fb105e2 cppcheck 2016-03-09 22:57:49 +01:00
Jan Steemann 878865c53a Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 17:57:07 +01:00
Frank Celler ce28f5492f convert to escape-x notation 2016-03-09 16:29:40 +01:00
Frank Celler 2d09d64d8f convert to escape-x notation 2016-03-09 16:25:37 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann e946729306 aqlvalue$ 2016-03-08 18:52:34 +01:00
Jan Steemann 0496f99b21 expression now using VelocyPack 2016-03-08 13:03:03 +01:00
Michael Hackstein 15b4d0734a Added a generic getAndCheckNumeric value to VPackHelper 2016-03-07 19:03:40 +01:00
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Jan Steemann be8a520ab8 removed dead code 2016-03-04 14:52:15 +01:00
jsteemann 0c580f1076 removed unused includes 2016-03-04 02:37:20 +01:00
jsteemann 630c8f44aa use correct includes 2016-03-04 02:30:47 +01:00
jsteemann 053648b36c simplifications 2016-03-04 02:25:18 +01:00
jsteemann c2c509ef58 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 21:27:13 +01:00
jsteemann ffc36b1841 prevent duplicate logging 2016-03-03 21:20:05 +01:00
Jan Steemann 4e0328d46f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 17:59:27 +01:00
Jan Steemann 337fc4bca4 remove std::mutex 2016-03-03 17:47:46 +01:00
Jan Steemann 16588e33d3 less json 2016-03-03 17:30:15 +01:00
Jan Steemann 3cadcd5340 less json 2016-03-03 15:40:00 +01:00
Wilfried Goesgens ff6ecda6e2 grr 2016-03-02 17:54:41 +01:00
Wilfried Goesgens 488149e424 comment out everything for WSACleanup 2016-03-02 17:52:46 +01:00
Wilfried Goesgens 7696297038 Disable WSACleanup for now, we don't know the right time to call it in all cases. 2016-03-02 17:50:45 +01:00
Jan Steemann 4c03f4bf8d simplification 2016-03-02 15:50:52 +01:00
Jan Steemann a6124247d4 fixed threading issues 2016-03-02 15:27:31 +01:00
Jan Steemann 6b3550e148 thread issues 2016-03-02 15:21:53 +01:00
Jan Steemann 1ca358bde8 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 15:21:37 +01:00
Jan Steemann 90bf212f54 fixed shutdown issues 2016-03-02 14:56:30 +01:00
Jan Steemann 66ee7e600d less json 2016-03-02 11:58:28 +01:00
Jan Steemann 0887c50c8f fixed logger initialization and shutdown 2016-03-02 11:31:41 +01:00
Jan Steemann 87a7b0ec36 fixed logger shutdown 2016-03-02 11:29:54 +01:00
Jan Steemann fe86b1c017 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:05:13 +01:00
Jan Steemann 92493f2807 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:04:58 +01:00
Jan Steemann 2a63d04289 fix assertions in non-maintainer mode 2016-03-02 11:04:29 +01:00
Jan Steemann 4271879c08 fix assertions in non-debug builds 2016-03-02 10:54:12 +01:00
Jan Steemann e6e864cd7a removed unused functions 2016-03-02 10:53:59 +01:00
Jan Steemann 285de1998b velocypack 2016-03-01 17:54:57 +01:00
Wilfried Goesgens ac16a39315 Shut up visual studio, we know this is UTF-8. 2016-03-01 17:43:29 +01:00
Michael Hackstein d3a53cd9bf Replaced the word tokenizer TRI_string_vector_t version by a std::vector<std::string> version 2016-03-01 13:39:17 +01:00
Frank Celler 1d1538212a Merge branch 'solaris' of https://github.com/arangodb/arangodb into solaris 2016-02-27 19:52:30 +00:00
jsteemann 4845b3fc93 cleanup 2016-02-26 23:07:19 +01:00
jsteemann 6d228eabaa use forwarding 2016-02-26 22:49:06 +01:00
Jan Steemann bd9293802d marker changes, unfinished 2016-02-26 19:39:17 +01:00
Wilfried Goesgens d755808a3e Windows portability 2016-02-26 17:06:56 +01:00
Frank Celler 5927a22bd8 added functional 2016-02-26 14:09:01 +00:00
Jan Steemann 3e82064770 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:59:08 +01:00
Frank Celler 1cd53c20a1 added generateMimetypes and generateErrorfiles 2016-02-25 13:14:06 +01:00
Jan Steemann e1745608e3 inject attribute translator everywhere 2016-02-25 11:13:32 +01:00
Frank Celler 37a0a7fc05 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 10:56:14 +01:00
Jan Steemann 8f2e2de451 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 10:46:13 +01:00
jsteemann 1823ae4fd2 removed unused forwards and functions 2016-02-25 00:48:06 +01:00
jsteemann 74fa6cf207 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 00:02:03 +01:00
jsteemann b3a20e915f simplified some logging 2016-02-24 22:48:56 +01:00
Jan Steemann 5ee8493c39 cleanup 2016-02-24 19:51:12 +01:00
Frank Celler da7955e417 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-24 19:29:01 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Jan Steemann e61aec11dd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 18:52:09 +01:00
Frank Celler 6e851249e3 fixed superfluous _stop 2016-02-24 18:40:33 +01:00
Jan Steemann 4bbccedf0d Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 17:46:40 +01:00
Jan Steemann c72eee052b only close if fd is > 2 2016-02-24 15:29:00 +01:00
jsteemann 24e1669f04 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 00:22:25 +01:00
Frank Celler 017d5fa904 sanity check for stopped WorkMonitor 2016-02-23 23:07:08 +01:00
Frank Celler bed46519f9 added DETACHED state 2016-02-23 15:27:36 +01:00