1
0
Fork 0
Commit Graph

600 Commits

Author SHA1 Message Date
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