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

709 Commits

Author SHA1 Message Date
Jan Steemann c19352e4af adjusted timer output 2015-05-13 12:58:20 +02:00
Jan Steemann f8a4df2ad4 Merge branch 'edge-index-resize' of https://github.com/arangodb/arangodb into devel 
Conflicts:
	lib/Basics/associative-multi.cpp
 2015-05-13 12:52:38 +02:00
Willi Goesgens 421d9fbb9e Add performance logging for index building. 2015-05-13 10:49:38 +02:00
Jan Steemann ceecbf372f slight API change 2015-05-13 09:06:35 +02:00
Jan Steemann 8480c8b000 speed up resizing of edge index 2015-05-12 21:03:30 +02:00
Jan Steemann 2e75255ea6 added `--log.performance` startup option, removed `--log.severity` option 2015-05-12 12:48:13 +02:00
Jan Steemann 771f2db94b cleanup 2015-05-11 17:26:42 +02:00
Jan Steemann 6e08289511 added <array> 2015-05-08 17:32:30 +02:00
Jan Steemann e230b5a373 privatize vector->_memoryZone, too 2015-05-07 14:13:55 +02:00
Jan Steemann 6b412a1c01 Merge branch 'json-privatisierung' of https://github.com/arangodb/arangodb into json-privatisierung 2015-05-07 13:05:12 +02:00
Jan Steemann 0996d603c6 fulltext improvements 2015-05-06 14:21:32 +02:00
Jan Steemann e93225d7f5 fix cluster document fetching 2015-05-06 11:00:41 +02:00
Jan Steemann a007a867ee "privatized" TRI_vector_t internals. 
This allows changing the internals of TRI_vector_t structs in order to make the struct smaller.
On 64 bits, the size of TRI_vector_t is reduced from 48 bytes to 28 bytes.
TRI_json_t does benefit from this, as its biggest component is a TRI_vector_t.
 2015-05-05 10:31:02 +02:00
Alan Plum 4f17dfe10e Added error 1237: collection type mismatch. 2015-05-03 22:55:56 +02:00
Michael Hackstein ca0de62aa3 Moved all v8 context sensitive parts into from V8Traverser v8-vocbase 2015-05-02 21:46:54 -07:00
Max Neunhoeffer 8b8f81c25d Fix a nullptr dereferencing bug. 2015-05-02 07:03:32 +02:00
Max Neunhoeffer 97f7743d84 Less copying in Traverser. 2015-05-02 06:28:52 +02:00
Michael Hackstein 2ba5ee47df Made everything compile again 2015-05-01 17:21:15 -07:00
Michael Hackstein 91fa1cb6f8 Merge branch 'cppTrav3' of github.com:/arangodb/arangodb into cppTrav 2015-05-01 17:08:56 -07:00
Michael Hackstein 9edb48b1cf Made everything compile again 2015-05-01 17:07:02 -07:00
Michael Hackstein 0b65896500 User defined move constructor hell... 2015-05-01 17:00:43 -07:00
Michael Hackstein 73db004a85 Reduced string copy in traverser 2015-05-01 14:49:31 -07:00
Max Neunhoeffer 24d04148c8 Schaltbar. 2015-05-01 10:30:30 -07:00
Max Neunhoeffer a6bb266287 Fix a bug. 2015-05-01 01:24:53 -07:00
Max Neunhoeffer 679073cf25 First try of single-threaded search for shortest path. 2015-05-01 01:14:55 -07:00
Jan Steemann 0f521ebc37 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
Conflicts:
	arangod/Aql/Functions.cpp
 2015-04-30 16:57:05 +02:00
Jan Steemann cb0ff510d6 slightly less copying 2015-04-30 16:50:08 +02:00
Jan Steemann 8dbcf0e23f Visual Studio adjustments 2015-04-30 11:46:55 +02:00
Max Neunhoeffer cc470f3e69 Small improvement of ReadWriteLockCPP11 code. 2015-04-30 01:30:11 -07:00
Max Neunhoeffer e9ec80f6ae Fix a bug in the cluster with locking under load. 2015-04-29 16:37:04 -07:00
Max Neunhoeffer 101b07e34e Use C++11 threads for Traverser. 2015-04-25 23:29:42 -07:00
Max Neunhoeffer f4857b6595 Merge branch 'cppTrav' of ssh://github.com/arangodb/arangodb into cppTrav 2015-04-25 22:52:25 -07:00
Max Neunhoeffer 68d2f200b8 Add a proof for this algorithm. 2015-04-25 22:52:09 -07:00
Max Neunhoeffer d1ab2a9d6f Make bidirectional switchable. 2015-04-25 21:48:33 -07:00
Max Neunhoeffer f1ff888088 Fix bidirectional switch. 2015-04-25 21:47:43 -07:00
Max Neunhoeffer cda687ef9b Make a bidirectional switch in Traverser. 2015-04-25 21:47:43 -07:00
Michael Hackstein 599240fb21 Removed couts 2015-04-25 21:47:43 -07:00
Max Neunhoeffer d46772dbca Add a cout. 2015-04-25 21:46:23 -07:00
Max Neunhoeffer e7683ea8da Switch on second thread. 2015-04-25 21:42:17 -07:00
Max Neunhoeffer 398a2c3d22 Do not create thread instance. 2015-04-25 21:42:17 -07:00
Max Neunhoeffer fbfe019913 Rename lookup() to find() 2015-04-25 21:41:45 -07:00
Max Neunhoeffer b09b2cc184 Disable bidirectional search for now. 2015-04-25 21:41:45 -07:00
Max Neunhoeffer e508a1697d Use new PriorityQueue, compiles, does not work. 2015-04-25 21:41:45 -07:00
Max Neunhoeffer 3fc8243432 Fix double occurence in result. 2015-04-25 21:40:45 -07:00
Max Neunhoeffer 5ccab6b3a8 Sort out mess with strange non-copying. 2015-04-25 21:40:44 -07:00
Max Neunhoeffer 2c5f56672c Snapshot. 2015-04-25 21:39:04 -07:00
Max Neunhoeffer e7e690913a Use our threads. 2015-04-25 21:38:07 -07:00
Michael Hackstein bf497d22b5 Added shortcut if there is no possible way for shortest path 2015-04-25 21:38:07 -07:00
Max Neunhoeffer b56901f4d5 New version of PriorityQueue. 2015-04-25 21:38:07 -07:00
Frank Celler 3c6801b559 Make it compile under Linux. 2015-04-25 21:38:07 -07:00
Michael Hackstein de699494af Fixed problem with thread construction for constant string 2015-04-25 21:38:07 -07:00
Michael Hackstein c1c98b16f6 Added version with broken threads. Computation is correct, but threads do not fire up 2015-04-25 21:36:24 -07:00
Max Neunhoeffer a553548d87 Add a new priority queue implementation. 
This blends a deque and a binary heap to implement a priority queue as
it is useful for the shortest path search.
 2015-04-25 21:35:40 -07:00
Michael Hackstein 6f81b0add1 Further implementation of Shortest Path. The Shortest path is found in cpp conversion to JS not yet working 2015-04-25 21:35:40 -07:00
Michael Hackstein 9f1830b4c5 Started implementing the Expander function. Not et finished does not compile but i am moving over to a new machine 2015-04-25 21:34:41 -07:00
Michael Hackstein 015c197e2a Proper class wrapping of Traverser. Started implemented dual-sided search algorithm. Implemented shered memmory access. Next up threads 2015-04-25 21:34:40 -07:00
Max Neunhoeffer 82594dcd5b Make bidirectional switchable. 2015-04-26 06:21:59 +02:00
Max Neunhoeffer aaa8e6a912 Fix bidirectional switch. 2015-04-26 03:33:55 +02:00
Max Neunhoeffer ce32d62094 Make a bidirectional switch in Traverser. 2015-04-26 03:32:01 +02:00
Michael Hackstein 40531fe6a6 Removed couts 2015-04-25 18:31:16 -07:00
Max Neunhoeffer 4d7b3d79db Add a cout. 2015-04-24 23:42:55 -07:00
Max Neunhoeffer 6fd2e9cf42 Switch on second thread. 2015-04-24 09:40:08 -07:00
Max Neunhoeffer 44a1554cfa Do not create thread instance. 2015-04-24 09:33:45 -07:00
Max Neunhoeffer b8ef4782ca Rename lookup() to find() 2015-04-24 08:59:51 -07:00
Max Neunhoeffer 589a32cda4 Disable bidirectional search for now. 2015-04-24 08:48:02 -07:00
Max Neunhoeffer d3d84385a1 Use new PriorityQueue, compiles, does not work. 2015-04-24 08:43:51 -07:00
Jan Steemann 3b09a018d5 fixed VS compile issues 2015-04-24 10:35:10 +02:00
Max Neunhoeffer b66c167ac7 Fix double occurence in result. 2015-04-24 00:32:07 -07:00
Max Neunhoeffer c55b62b609 Sort out mess with strange non-copying. 2015-04-24 06:45:39 +00:00
Max Neunhoeffer e30ae28ce5 Snapshot. 2015-04-23 22:24:59 -07:00
Max Neunhoeffer 68f4720c6b Use our threads. 2015-04-23 22:05:00 -07:00
Max Neunhoeffer 07d6653955 Merge branch 'cppTrav' of ssh://github.com/ArangoDB/ArangoDB into cppTrav 2015-04-23 19:58:51 -07:00
Michael Hackstein 3b13222f59 Added shortcut if there is no possible way for shortest path 2015-04-23 19:58:27 -07:00
Max Neunhoeffer 8884391da0 Merge branch 'cppTrav' of ssh://github.com/ArangoDB/ArangoDB into cppTrav 2015-04-23 19:57:39 -07:00
Max Neunhoeffer 4bdcfdb238 New version of PriorityQueue. 2015-04-23 19:56:18 -07:00
Frank Celler bb3fbff88a Make it compile under Linux. 2015-04-23 22:19:14 +00:00
Michael Hackstein 80e002cfc9 Fixed problem with thread construction for constant string 2015-04-23 15:18:56 -07:00
Jan Steemann 260554cb35 added encoding tests 2015-04-24 00:10:05 +02:00
Michael Hackstein 48e4fd55a8 Added version with broken threads. Computation is correct, but threads do not fire up 2015-04-23 13:40:41 -07:00
Jan Steemann 8d12f741bb issue #1315: Queries to a collection fail with an empty response if the collection contains specific JSON data 2015-04-23 20:20:58 +02:00
Jan Steemann 292e203b6b slightly faster JSON hashing 2015-04-23 18:03:38 +02:00
Jan Steemann ce8ed2cd6d slightly simplified TRI_DestroyJson 2015-04-23 16:17:48 +02:00
Jan Steemann 40ed49ebfa fast path for MERGE() 2015-04-23 13:45:31 +02:00
Max Neunhoeffer 570509a58a Merge branch 'cppTrav' of ssh://github.com/ArangoDB/ArangoDB into cppTrav 2015-04-22 23:42:20 -07:00
Max Neunhoeffer 261c6f7a5e Add a new priority queue implementation. 
This blends a deque and a binary heap to implement a priority queue as
it is useful for the shortest path search.
 2015-04-22 23:41:26 -07:00
Michael Hackstein 771b54b2cf Further implementation of Shortest Path. The Shortest path is found in cpp conversion to JS not yet working 2015-04-22 17:03:06 -07:00
Michael Hackstein aff8048e30 Started implementing the Expander function. Not et finished does not compile but i am moving over to a new machine 2015-04-21 12:01:44 -07:00
Jan Steemann 233ea81101 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-04-21 17:56:24 +02:00
Jan Steemann 794d40bbc8 moved variables into their own scope 2015-04-21 17:56:11 +02:00
Jan Steemann baa5e39348 removed lib/Basics/utf8-helper.cpp and merged with lib/Basics/Utf8Helper.cpp 2015-04-21 17:53:35 +02:00
Jan Steemann 0a64ffe785 fixed typo 2015-04-21 12:07:22 +02:00
Michael Hackstein 8e345651c0 Proper class wrapping of Traverser. Started implemented dual-sided search algorithm. Implemented shered memmory access. Next up threads 2015-04-20 17:04:18 -07:00
Jan Steemann 61499432b7 do not remove constant sorts when creating plans, but during optimization phase 
less utf8 comparisons
 2015-04-20 11:32:29 +02:00
Jan Steemann 528ec17bcd Merge branch 'devel' of https://github.com/arangodb/arangodb into hash-collect 
Conflicts:
	arangod/FulltextIndex/fulltext-handles.cpp
 2015-04-16 19:06:21 +02:00
Jan Steemann 73899168be some adjustments to satisfy scan-build 2015-04-16 16:30:20 +02:00
Jan Steemann e1312f2088 attempt to satisfy scan-build a bit 2015-04-16 11:47:18 +02:00
Willi Goesgens 77233f9b94 Add backtraces to FATAL exits. 2015-04-16 10:21:48 +02:00
Willi Goesgens 11100ffc85 Get the windows directory creation without driveletters right (finally) 2015-04-15 14:47:31 +02:00
Willi Goesgens 84e88d01b7 Port CopyRecursive to mac 2015-04-15 13:39:09 +02:00
Willi Goesgens fb768d7532 Fix windows implementation of xcopy 2015-04-15 13:01:07 +02:00
Willi Goesgens 40c5e18481 - We _must_ evaluate the return values of these system calls. 
- fix windows driveletter detection.
 2015-04-14 17:16:44 +02:00
Willi Goesgens 6579eefc33 Add function that can copy files recursive. 2015-04-14 14:46:17 +02:00
Alan Plum 83b1b4596a Added module loader errors. 2015-04-08 13:12:43 +02:00
Jan Steemann 00a7def28f convert invalid numbers (NaN, +inf, -inf) to null in JSON conversion 
The reason is that NaN, +inf, -inf cannot be safely represented in JSON and JSON-parsing these values may
fail on the client side
 2015-04-04 17:20:10 +02:00
Jan Steemann 6dfb4d4b09 Merge branch 'devel' of https://github.com/arangodb/arangodb into cursor-refactoring 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpServerJob.h
 2015-03-31 15:13:31 +02:00
Frank Celler ffbc45d2e2 new HttpServer & HttpCommTask 
Conflicts:
	Makefile.in
	arangod/Aql/RestAqlHandler.cpp
	arangod/Aql/grammar.cpp
	arangod/Cluster/RestShardHandler.cpp
	lib/GeneralServer/GeneralServer.h
	lib/GeneralServer/GeneralServerDispatcher.h
	lib/HttpServer/HttpServerJob.h
	lib/HttpServer/HttpsCommTask.h
	lib/SimpleHttpClient/SslClientConnection.cpp
 2015-03-31 09:12:01 +02:00
Jan Steemann c508eb0a81 removed some debugging features 2015-03-30 22:05:31 +02:00
Jan Steemann 886398ee41 removed unused files 2015-03-30 21:52:19 +02:00
Jan Steemann 3ddf23d093 hand-moved changes from other branch 2015-03-30 12:30:45 +02:00
Jan Steemann 3057cf7a74 added edge index iterator 
Conflicts:
	arangod/Aql/ExecutionBlock.h
 2015-03-27 17:24:47 +01:00
Jan Steemann 50b531666c optimization for AQL CONCAT() 
Conflicts:
	arangod/Aql/AqlValue.cpp
	arangod/Aql/AqlValue.h
	arangod/Aql/Ast.cpp
 2015-03-27 17:18:27 +01:00
Willi Goesgens 6a9f213340 Add more traps for the windows bug of empty URLs 2015-03-27 11:14:36 +01:00
Jan Steemann 5599259075 fixed Visual Studio compile errors 2015-03-26 10:34:38 +01:00
Jan Steemann c352ba6a03 small logging refactoring 2015-03-26 03:09:07 +01:00
Jan Steemann e41f528858 added TRI_FlushLogging 2015-03-25 21:02:33 +01:00
Jan Steemann 85fa39681e constified argument 2015-03-25 21:02:13 +01:00
Jan Steemann 7ec3a18e04 added internal.options() 2015-03-25 17:08:29 +01:00
Jan Steemann d567c012c3 added SYS_OPTIONS() to get options 2015-03-25 16:55:24 +01:00
Jan Steemann 2f58e4ea61 small cleanup 2015-03-25 12:42:44 +01:00
Jan Steemann a3c0612798 added cluster tests 2015-03-24 14:34:09 +01:00
Jan Steemann 7d5cc17d98 added tests 2015-03-23 22:28:26 +01:00
Frank Celler 4c5d57f1b8 merged Exceptions.h and Exception.h 2015-03-23 14:05:19 +01:00
Jan Steemann ecd8f15c15 free thread name string on shutdown 2015-03-20 23:19:06 +01:00
Willi Goesgens 07b3720e6d Fix windows error buffer handling 2015-03-20 13:21:59 +01:00
Jan Steemann 8c20002737 merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-03-19 16:03:26 +01:00
Jan Steemann 7dc3fc3d5c safely create collections and databases 2015-03-19 15:56:12 +01:00
Willi Goesgens ccf795a303 System error messages for lock-files in windows. 2015-03-19 14:15:00 +01:00
Willi Goesgens 6b22b1e31c Forward ERROR & FATAL logmessages into the windows eventlog. Else debugging services in the early starting phase is next to impossible. 2015-03-18 19:13:35 +01:00
Jan Steemann 8ec3d7b619 fixed Windows compile errors 2015-03-18 18:10:49 +01:00
Jan Steemann d1d4daefb8 updated documentation 2015-03-18 17:46:48 +01:00
Jan Steemann bdae982aa0 refuse to start the server when collection files or parameter.json files are not readable 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
 2015-03-18 17:44:06 +01:00
Jan Steemann daac3dd00c add group privileges for files created 
Conflicts:
	lib/Basics/json.cpp
 2015-03-18 17:39:22 +01:00
Willi Goesgens a95a496920 Add (unix) implementation for chmod 2015-03-18 13:41:26 +01:00
Jan Steemann 64ea6897e1 added default deleter for TRI_json_t 2015-03-16 11:03:50 +01:00
Jan Steemann 64d77cbe24 added query tracking feature 2015-03-12 13:02:13 +01:00
Michael Hackstein 5be310fc21 It is now possible to install Apps that are invalid if they are not configured correctly. If they get broken by configuration they are still routed and will display an errorpage. They also display an errorpage until configured. 2015-03-11 17:49:42 +01:00
Jan Steemann 022bc5ebf2 decrease loglevel 2015-03-10 11:19:10 +01:00
Frank Celler 0687e4e080 removed registry entry, using relative path to binary instead 2015-03-08 20:06:18 +01:00
Jan Steemann 407eb57af6 simplified 2015-03-04 17:18:02 +01:00
Jan Steemann 7f121fc352 use barrier 2015-03-04 11:35:32 +01:00
Jan Steemann 44483aa534 added Barrier 2015-03-03 18:57:15 +01:00
Jan Steemann 04e2acb591 removed unused method 2015-03-03 15:01:16 +01:00
Jan Steemann 9d2196ebfd VS 2015-03-03 13:12:12 +01:00
Willi Goesgens 05ec6ab259 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-03 11:57:24 +01:00
Willi Goesgens 441ad43d37 In windows you need to seek to the end of the file if you want to append. 2015-03-03 11:56:49 +01:00
Jan Steemann bc4ad22ab6 parallel secondary index building when loading collections 2015-03-03 10:52:51 +01:00
Willi Goesgens 3f983bc580 Fix windows logging function: 
vsnprintf doesn't return the required buffer size if the buffer was to small, but rather -1. If errno is set, its a fail, else we will retry with double buffer size.
 2015-02-26 16:20:20 +01:00
Willi Goesgens 8eb861e6a6 Log more information about whats going wrong with the logging. 2015-02-26 15:08:24 +01:00
Willi Goesgens 8b5819e876 if we fail to validate the format string, log it. 2015-02-26 13:25:02 +01:00
Michael Hackstein c5adf7b089 Fixed tests for foxx on multiple databases. And added generated files 2015-02-25 10:44:15 +01:00
Michael Hackstein 9dc27fa7db Fixed test to install Apps from Store. sessionapp requires oauth2 to be installed at a special location 2015-02-25 10:26:53 +01:00
Jan Steemann ff8cd454fa fixed Visual Studio compile warnings 2015-02-25 09:23:42 +01:00
Willi Goesgens b7310a5a95 Fix typo introduced by manualy editing diffs 2015-02-24 15:54:52 +01:00
Willi Goesgens 7d934c269f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-02-24 15:39:07 +01:00
Willi Goesgens 5a50843366 Use system random function under windows; our algorythm has the tendency to like single values. 2015-02-24 15:38:30 +01:00
Jan Steemann 0ba8e6e626 fixed Windows compile errors 2015-02-24 15:32:04 +01:00
Jan Steemann 6e9e87ff4c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-02-24 12:07:25 +01:00
Willi Goesgens edd26f59ba Don't return file exists as an error. 2015-02-24 11:48:49 +01:00
Jan Steemann dc893e4a31 Merge branch 'fp-madhouse' of https://github.com/arangodb/arangodb into devel 2015-02-24 11:38:22 +01:00
Jan Steemann ec9c84b7c0 added tests 2015-02-24 09:23:25 +01:00
Jan Steemann e4b0c841f5 fixed memleak 2015-02-24 08:42:51 +01:00
Jan Steemann 654d282088 added fpconv_dtoa from https://github.com/night-shift/fpconv/ 2015-02-23 22:27:02 +01:00
Willi Goesgens 270f7cc919 Fix temp-file generation broken when adding error handling. 2015-02-23 16:52:03 +01:00
Willi Goesgens 858aa5f8d4 Fix windows error mapping 2015-02-23 16:07:19 +01:00
Willi Goesgens e088c14bca Include errno... 2015-02-23 15:33:23 +01:00
Willi Goesgens dcac88c35a Fix error message on tempfile creation 2015-02-23 15:28:46 +01:00
Willi Goesgens f435789105 Fix double free introduced in last commit. 2015-02-23 12:48:52 +01:00
Willi Goesgens a58974d773 Improve error handling 
- directory creation
  - zip extraction
 2015-02-23 12:26:49 +01:00
Willi Goesgens 54892f51ef First map the error, then return it to the caller. 2015-02-20 16:12:38 +01:00
Willi Goesgens e4b52b7c47 Map windows directory errors to TRI 2015-02-20 16:03:03 +01:00
Willi Goesgens 9536857060 Fix windows build. 2015-02-20 13:04:01 +01:00
Willi Goesgens cd9ad14160 Fix error handling in directory creation: only catch errors of directory existing; throw meaningfull error message. 2015-02-20 12:55:46 +01:00
Willi Goesgens 8ce7be78e2 improve error message while moving files - now contains source, destination and system error. 2015-02-19 19:25:05 +01:00
Jan Steemann 59936f1f98 small optimizations 2015-02-19 09:31:00 +01:00
Frank Celler dc1c9ab48f fixed casts for threads 2015-02-17 12:38:33 +01:00
Michael Hackstein c6e9d98251 Added a force uninstall for foxx apps, to make sure they are removed from disk even if sth is unclear with mounting. Also created an error for foxx not found on file system has been added 2015-02-16 17:14:36 +01:00
Michael Hackstein 0c78629199 Merge branch 'foxx-pathes' of github.com:arangodb/arangodb into devel 2015-02-16 14:17:52 +01:00
Jan Steemann e250a31b0c shaper changes 2015-02-15 21:53:27 +01:00
Jan Steemann 4f6c598c42 reduce number of mallocs 2015-02-15 21:53:07 +01:00
Michael Hackstein 9d5ae45b10 Improved errors thrown when trying to install malformed applications 2015-02-13 22:11:54 +01:00
Willi Goesgens f02de55304 Namespace demangling for macos X - todo make this work. 2015-02-13 14:20:48 +01:00
Willi Goesgens df226e5a82 - install SIG11 handler which prints backtrace to the console. (in windows we don't get cores) 
- fix exit handling for windows process control.
 2015-02-13 14:11:15 +01:00
Michael Hackstein 5b3fae42aa Merge branch 'devel' of github.com:arangodb/arangodb into foxx-pathes 
Conflicts:
	js/apps/system/_admin/aardvark/APP/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	lib/Basics/voc-errors.cpp
	lib/Basics/voc-errors.h
 2015-02-13 10:20:36 +01:00
Willi Goesgens 52783bd9fa Work on more precise windows process management 2015-02-12 17:38:07 +01:00
Jan Steemann ec2b866200 Merge branch 'devel' of https://github.com/arangodb/arangodb into sparse-indexes 
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
 2015-02-11 17:53:23 +01:00
Jan Steemann ce69be69bf increase default value for maxIterations 2015-02-11 12:45:41 +01:00
Jan Steemann 83855aec86 constified 2015-02-07 16:31:27 +01:00
Jan Steemann 003d7e9112 sparse indexes, initial commit, untested 2015-02-07 03:07:41 +01:00
Michael Hackstein aad7e46f10 Merge branch 'devel' of github.com:arangodb/arangodb into foxx-pathes 
Conflicts:
	Documentation/Books/Users/SUMMARY.md
	js/actions/api-system.js
	js/common/bootstrap/modules.js
	js/server/modules/org/arangodb/foxx/manager.js
	js/server/tests/shell-routing.js
 2015-02-06 17:22:01 +01:00
Jan Steemann 423d22ed71 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-02-02 18:56:17 +01:00
Willi Goesgens 1c7b1e805c Fix windows compile with backtrace; these lines were lost in the original commit. 2015-02-02 14:46:15 +01:00
Jan Steemann 39603ebaf4 added selectivity estimates for some index types 2015-01-30 23:04:46 +01:00
Jan Steemann 857c6f5934 fixed Windows compile error 2015-01-30 17:18:25 +01:00
Jan Steemann 0896ab4155 NULL => nullptr 2015-01-30 17:09:15 +01:00
Willi Goesgens 5e1720132f Stacktraces & asserts for windows too. 2015-01-30 16:46:56 +01:00
Willi Goesgens 208cf42757 Properly shut down ICU to make valgrind happy. 2015-01-29 17:28:30 +01:00
Frank Celler b00cd1f515 avoid duplicate fatal output 2015-01-29 17:09:47 +01:00
Frank Celler 7aa4591678 arangod/Aql/Expression.cpp 2015-01-29 15:21:14 +01:00
Willi Goesgens 7224eea2e8 Windows portability: socket timeouts are handled differently. 2015-01-28 17:23:31 +01:00
Max Neunhoeffer e24278828c Changes to cluster startup for mesos cooperation. 
This simplifies the cluster startup by introducing a further agency
lookup step using "local info" to find the "id". This allows an external
discovery process (see scripts/discover.js as an example) to configure
a new server in the cluster dynamically when it starts up.

New GNUmakefile targets
  pack-tar-config
  pack-tar
 2015-01-28 12:58:24 +01:00