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

2418 Commits

Author SHA1 Message Date
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
Willi Goesgens 5d76674446 In relative mode point the environment to the proper place of the ICU data. 2015-01-27 12:14:29 +01:00
Willi Goesgens 37efe55873 If we fail to initialize ICU many things will be broken, thus abort. 2015-01-27 12:13:38 +01:00
Frank Celler 1b722fe368 generated files 2015-01-26 11:59:05 +01:00
Michael Hackstein e23b81779d Setup and teardown of foxx apps and foxx dev apps should now print their errors properly 2015-01-26 11:34:50 +01:00
Michael Hackstein 59d406dc62 Started to tear appart the error handling in current devel mode. It will now print with a much closer relation to their source 2015-01-26 11:34:50 +01:00
Jan Steemann 46d701d5df made TRI_AddressVector an inline function 2015-01-24 14:04:59 +01:00
Willi Goesgens c25199219d Fix missing branch of TRI_LocateConfigDirectory for windows 2015-01-23 14:59:42 +01:00
Jan Steemann 7db19894ca do not pass name in TRI_ERROR_ARANGO_ILLEGAL_NAME 2015-01-23 12:38:40 +01:00
Jan Steemann 81db41763f foxx file upload 2015-01-23 11:23:58 +01:00
Willi Goesgens 3736113fdb Add the bad name of the collection to ERROR_ARANGO_ILLEGAL_NAME 2015-01-22 18:07:44 +01:00
Willi Goesgens 611d7648c7 Return configured path (if) 2015-01-20 19:43:15 +01:00
Willi Goesgens f8ecab9216 fix typo 2015-01-20 17:29:08 +01:00
Willi Goesgens b66796e69f Add sysconfdir on the winxx implementation too, so we can have etc/relative installations. 2015-01-20 16:48:11 +01:00
Jan Steemann 7212aa028b use SRWLocks instead of Mutexes on Windows 2015-01-19 15:42:18 +01:00
Jan Steemann bc656ea463 use SRWLocks instead of mutexes on Windows. 2015-01-19 13:47:22 +01:00
Jan Steemann 37ae686d4b re-introduced odd (but compatible) behavior in ObjectToJson 2015-01-17 23:24:23 +01:00
Jan Steemann 402d56c1af when parsing or converting JSON, create elements in-place if possible to avoid memory allocations 2015-01-17 21:48:18 +01:00
Jan Steemann 685d03f0d7 some cleanup 2015-01-17 19:35:11 +01:00
Jan Steemann 18467b0d66 less memory allocations when parsing AQL queries 2015-01-17 18:12:56 +01:00
Jan Steemann b54dfae96f removed several JSON functions 2015-01-13 01:31:04 +01:00
Jan Steemann 3257e6c8fc clean up 2015-01-12 23:43:30 +01:00
Jan Steemann cb03933c1e less code 2015-01-12 23:21:14 +01:00
Jan Steemann 906d22a691 make fs.move() behave identical on Linux and Windows 
Conflicts:
	CHANGELOG
 2015-01-12 20:13:11 +01:00
Jan Steemann 2de9760820 fixed empty error message 2015-01-09 23:29:36 +01:00
Frank Celler 2a77778147 added final ! 2015-01-09 14:06:28 +01:00
Frank Celler 44d5fec69b added hebrew 2015-01-09 14:02:56 +01:00
Jan Steemann 62696b6984 prerequisites for further COLLECT optimizations 2015-01-07 09:42:46 +01:00
Frank Celler 0d2e641768 fixed typo 2014-12-26 12:40:04 +01:00
Frank Celler b2c927ec70 fixed company name 2014-12-26 12:39:15 +01:00
Frank Celler 4690276775 moved GetModuleFileName to TRI_LocateBinaryPath 2014-12-26 12:03:45 +01:00
Frank Celler 6919b23373 set ICU_DATA at startup 2014-12-26 10:56:31 +01:00
Max Neunhoeffer 1cdf439845 Broken version, errors not yet fixed. 2014-12-23 16:51:48 +01:00
Jan Steemann 19d2d6668f added random iteration for collections 2014-12-19 18:01:13 +01:00
Jan Steemann 3901e7f15c ensure signedness of data 2014-12-19 11:14:29 +01:00
Frank Celler b2e1a24697 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
 2014-12-19 00:14:19 +01:00
Frank Celler aabfdc5669 cleanup of Makefiles 2014-12-19 00:13:51 +01:00
Jan Steemann d92057dd03 the great rename: array => object, list => array 2014-12-18 22:33:23 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Max Neunhoeffer 45cecf44f9 Initialise a few variables to please gcc. 2014-12-16 10:48:07 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Jan Steemann d9a945e33a include or exclude system collections from replication 2014-12-05 14:58:43 +01:00
Jan Steemann 4564f13bc8 implemented LENGTH in C++ 2014-12-04 17:10:48 +01:00
Jan Steemann cc00bb8897 optimizations 2014-12-04 16:33:48 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
threez fe02d691d8 Fixes compile issue on FreeBSD/clang 
lib/Basics/logging.cpp:1876:12: error: cannot initialize a variable of type 'CODE *' (aka '_code *') with an lvalue of type 'const CODE [25]'
    CODE * ptr = TRI_facilitynames;
           ^     ~~~~~~~~~~~~~~~~~

FreeBSD clang version 3.4.1 (tags/RELEASE_34/dot1-final 208032) 20140512
Target: x86_64-unknown-freebsd10.1
 2014-11-26 15:05:43 +01:00
Jan Steemann 34eb2a8c5a removed unused functions 2014-11-25 23:18:45 +01:00
Jan Steemann 9846fd0d36 removed unused function 2014-11-24 17:36:11 +01:00
Jan Steemann 620274047f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-functions 
Conflicts:
	CHANGELOG
 2014-11-20 14:23:01 +01:00
Frank Celler ec37174083 fixed syslog 2014-11-18 18:16:29 +01:00
Jan Steemann f1f13a4284 added several AQL functions 2014-11-18 11:26:42 +01:00
Frank Celler 77fd12b987 fixed SimpleHttpClient 2014-11-14 23:50:00 +01:00
Jan Steemann 1303595594 Visual Studio does not like thread_local 2014-11-14 17:39:01 +01:00
Jan Steemann 777f70c8e2 fixed error message 2014-11-14 16:45:51 +01:00
Jan Steemann 2622f57e07 added assertions 2014-11-13 14:15:47 +01:00
Jan Steemann 7cd1eb5474 more warnings 2014-11-12 14:52:54 +01:00
Jan Steemann 81c1919f44 minor adjustments for task API 2014-11-12 11:27:47 +01:00
Jan Steemann 5bf964ad5b issue #1086: arangoimp: Odd errors if arguments are not given properly 2014-11-06 12:07:12 +01:00
Jan Steemann 83252851e6 report warnings in queries 2014-10-30 17:33:15 +01:00
Jan Steemann cf6fcb2fc1 linted python files, regenerated derived files 2014-10-29 23:56:20 +01:00
Jan Steemann 8bb213e7ba sort and cache list expression values 
emplace

fixed wrong assertion
 2014-10-29 01:02:20 +01:00
Jan Steemann f6b8f17dfa less optimizations for simple plans 2014-10-28 15:01:44 +01:00
Jan Steemann 2808e4eee8 cppcheck 2014-10-28 00:35:18 +01:00
Jan Steemann 13d240384f less namespace pollution 2014-10-28 00:24:37 +01:00
Jan Steemann ccf7e4f131 mini cleanup 2014-10-27 22:47:36 +01:00
Jan Steemann 7452c70a3b moved backtrace functions 2014-10-27 18:15:10 +01:00
Jan Steemann 29a4416bcf issue #1056: added tests for zipFile / unzipFile 
Conflicts:
	js/common/tests/shell-fs.js
	lib/BasicsC/tri-zip.c
 2014-10-25 01:21:47 +02:00
Jan Steemann bc4ae8e7df fixed leak in IndexOperator, simplified IndexOperator API 2014-10-24 12:57:09 +02:00
Willi Goesgens adf6391968 Make it const, baby. 2014-10-22 17:34:39 +02:00
Willi Goesgens 7bf11c9aaf Add method which returns a printeable string which type a json structure is. 2014-10-21 12:42:57 +02:00
Jan Steemann ee614d6ebd v8 context handling 2014-10-17 15:25:06 +02:00
Max Neunhoeffer 183cd3eb40 Sort out temporary directory creation with individual names. 2014-10-16 20:08:21 +02:00
Jan Steemann bb0e11499d fixed races reported by helgrind 2014-10-16 19:32:14 +02:00
Jan Steemann 64fd7ea4b3 conversions 2014-10-16 10:20:04 +02:00
Jan Steemann 688e8ebbc1 better support for handling multipart requests 2014-10-16 02:05:57 +02:00
Jan Steemann e37f45253f fixed return code of mtime 2014-10-15 18:24:01 +02:00
Jan Steemann edae662eb4 added res.send() and res.sendFile() 2014-10-15 17:33:10 +02:00
Jan Steemann 6511fec7c6 added tests for fs.read and fs.write 2014-10-15 12:44:04 +02:00
Jan Steemann 6ab535bd06 nullptr 2014-10-14 15:14:38 +02:00
Jan Steemann 95cfbd7051 test fix 2014-10-14 11:18:16 +02:00
Jan Steemann 47fece8a22 removed sleep 2014-10-14 11:03:42 +02:00
Jan Steemann 47bd3f060b increased sleep 2014-10-14 10:52:25 +02:00
Jan Steemann ae99fbda3a added usleep for testing 2014-10-14 10:43:40 +02:00
Jan Steemann f09e440539 fix attempt 2014-10-14 10:27:11 +02:00
Jan Steemann 4a7164a84d removed signal handler that didn't help 2014-10-14 10:15:22 +02:00
Jan Steemann ada372f123 removed debug output 2014-10-13 13:01:12 +02:00
Jan Steemann 41ae9c8ea7 SIGCHLD 2014-10-13 12:32:22 +02:00
Jan Steemann 294d89c5e3 fixed illegal checkExternalProcess call 2014-10-13 11:34:21 +02:00
Jan Steemann 77d3433a5a fixed usage of uninitialized variable 2014-10-13 11:12:46 +02:00
Jan Steemann 1ba2030e0b debug info 2014-10-13 11:10:12 +02:00
Willi Goesgens cb50ceafa6 If we're to early for the forked process, wait & Retry. 2014-10-10 14:52:27 +02:00
Jan Steemann d9cc80bab7 fixes for Visual Studio 2014-10-10 14:37:03 +02:00
Jan Steemann 31ebe14ea6 issue #1042 2014-10-10 14:24:22 +02:00
Jan Steemann 5821ba36be use system error messages 2014-10-10 13:41:59 +02:00
Willi Goesgens 4af23ddfe3 Add the integer value of the error to our message. 2014-10-10 13:22:57 +02:00
Willi Goesgens 73d121ece7 Add the possible error messages from waitpid to the result output. 2014-10-10 11:44:48 +02:00
Willi Goesgens dd537647bc Also output the waitpid() errors on stderr, so we can see them in jenkins. 2014-10-10 09:59:09 +02:00
Jan Steemann c6948d1cff added diagnostic output for waitpid 2014-10-09 16:38:45 +02:00
Jan Steemann 6cdaaa1b85 fixes for Visual Studio 2014-10-09 10:45:31 +02:00
Jan Steemann cd50a2cbec smarter command-line options parsing 2014-10-08 23:45:02 +02:00
Jan Steemann 2c1079064f nullptr 2014-10-08 22:18:16 +02:00
Jan Steemann 066f80b2af added more test cases for arangob 
Conflicts:
	arangosh/Benchmark/arangob.cpp
	arangosh/Benchmark/test-cases.h
 2014-10-08 22:16:51 +02:00
Jan Steemann ce9499eac8 less string copying, less regex slowdown when importing CSV files 2014-09-30 23:20:12 +02:00
Max Neunhoeffer 046d4f524d Implement getSome for RemoteBlock. 2014-09-26 16:19:25 +02:00
Max Neunhoeffer 784a299ab8 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-24 16:17:44 +02:00
Max Neunhoeffer cf5e1be91e Version version of HTTP API done. 2014-09-24 16:17:18 +02:00
Jan Steemann d5fb057603 less locking 2014-09-24 13:32:39 +02:00
Max Neunhoeffer 1f74a64b58 Implement POST for HTTP API for queries. 2014-09-23 16:51:03 +02:00
Jan Steemann ae4b46ae86 fixed fake locks on macos 2014-09-23 09:56:13 +02:00
Jan Steemann f4eab1abe9 macos 2014-09-23 09:38:16 +02:00
Jan Steemann 0b647f65a0 macos 2014-09-23 09:28:09 +02:00
Jan Steemann 9202720d53 lol jan 2014-09-23 09:21:01 +02:00
Jan Steemann 9a6dfa1db2 execute several types of expressions in C++ 2014-09-19 15:21:01 +02:00
Jan Steemann 03252d6244 added reserve() method 2014-09-19 12:44:19 +02:00
Jan Steemann c0a9d189c5 better error messages if mkdir fails 2014-09-18 17:48:05 +02:00
Jan Steemann 1016debd2e more robust recovery 2014-09-18 17:47:37 +02:00
Jan Steemann 04ae26a7fe added tests for skiplists 2014-09-18 14:45:45 +02:00
Max Neunhoeffer 3c675fee44 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-09-17 14:08:18 +02:00
Max Neunhoeffer 2cdc5f4cd7 Fix skiplistback-ung and usage in AQL. 2014-09-17 14:07:23 +02:00
Jan Steemann e5e2cfe4da Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-09-17 11:50:42 +02:00
Jan Steemann 93ed0f2255 added reverse iteration for skiplists 2014-09-16 22:23:40 +02:00
Max Neunhoeffer ed63d2f58c Fix a bug introduced in the skiplist code when C++izing it. 2014-09-16 15:57:47 +02:00
Max Neunhoeffer 2b18e0379f C++-ize skip lists and introduce a backward link. 2014-09-16 14:57:16 +02:00
Max Neunhoeffer c57569a27c Start to reintroduce backpointers in skiplist. 
Also need an non-nullptr end node now.
 2014-09-16 00:17:04 +02:00
Jan Steemann 481a16fd7a removed bitarray indexes 2014-09-15 14:19:38 +02:00
Jan Steemann f2c249f16a removed debug output 2014-09-15 12:43:41 +02:00
Jan Steemann 5a1dc63946 fixed tons of compile errors in VS 2014-09-15 12:04:49 +02:00
Max Neunhoeffer 42257d51e8 Make it compile again. 2014-09-14 22:26:36 +02:00
Jan Steemann 4e6f6f2cbd finalized move to cxx 2014-09-14 00:06:00 +02:00
Jan Steemann f5c3ee89c7 renamed last C files 2014-09-13 23:29:53 +02:00
Jan Steemann aa20c9e980 renamed last C files... 2014-09-13 22:38:25 +02:00
Jan Steemann 506936dcdb rename orgy 2014-09-13 02:35:13 +02:00
Jan Steemann 669cb3b235 renamed files 2014-09-13 01:44:01 +02:00
Jan Steemann 953b8cdfe3 renamed files 2014-09-13 00:34:48 +02:00
Jan Steemann 0dc0bc834f more files renamed 2014-09-13 00:20:30 +02:00
Jan Steemann 87afcf5e8d the great rename 2014-09-13 00:10:11 +02:00
Jan Steemann 6552490cbe Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/ExecutionNode.cpp
	arangod/Aql/ExecutionNode.h
	arangod/Aql/ExecutionPlan.cpp
	arangod/Aql/OptimizerRules.cpp
 2014-09-12 15:17:50 +02:00
Jan Steemann a5c52998e8 remove redundant calculations 2014-09-12 15:10:48 +02:00
Max Neunhoeffer d6268fc75b Fix a but where a type argument was unused. 2014-09-12 14:42:26 +02:00
Jan Steemann ce104ce81a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-09-10 13:29:17 +02:00
Jan Steemann e653552c5e issue #997: added large file support for Windows 2014-09-10 13:12:18 +02:00
Willi Goesgens be1c84f480 Exceptions: don't print Backtraces if the exception is handled in the subsequent js code. 2014-08-29 12:15:19 +02:00
Willi Goesgens 91d420ea07 Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-25 13:33:59 +02:00
Willi Goesgens e65a53475b improve Exceptionhandling 
- add backtraces
  - derive public from std::exception so the usual catch to these kicks in.
 2014-08-25 13:31:53 +02:00
James 09f945eaf7 added some constructors for Json with TRI_json_t const* as arg. 2014-08-25 13:05:48 +02:00
Jan Steemann 7330597f15 fixed ambigious method JsonHelper::getStringValue 2014-08-22 21:53:29 +02:00
Jan Steemann a70a9613f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	lib/BasicsC/voc-errors.h
 2014-08-22 21:51:38 +02:00
Max Neunhoeffer 3413eec1b7 Fix a merge mistake. 2014-08-22 17:03:45 +02:00
Max Neunhoeffer 4b229c5873 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	lib/Basics/JsonHelper.h
 2014-08-22 17:02:06 +02:00
James 931aaee618 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/OptimizerRules.cpp
 2014-08-22 16:19:01 +02:00
James 4c49a3be5e deserialising of IndexRangeNode almost completed. 2014-08-22 16:17:10 +02:00
James 0c4f8c1466 adding some more helper functions to get json array entries. 2014-08-22 15:05:08 +02:00
Max Neunhoeffer e5f09bfd87 Fix an invalid throw() by removing it. 2014-08-22 13:46:33 +02:00
Jan Steemann 0f03ca0a2b cppcheck 2014-08-22 12:50:06 +02:00
Willi Goesgens 37a636d929 Add deleted constructor to avoid the compiler falling through to the bool constructor in case of missuse. 2014-08-20 16:56:52 +02:00
Jan Steemann 99ce138c12 fixed creation of subqueries from JSON input 2014-08-19 18:51:11 +02:00
Willi Goesgens 49126ea6c1 empty change 2014-08-19 16:10:38 +02:00
Frank Celler 9fa3d22d6c towards new dispatcher interface 2014-08-18 23:37:32 +02:00
Max Neunhoeffer 1e592cebb9 Delete const copy constructor for better error messages. 2014-08-15 16:38:34 +02:00
Max Neunhoeffer 86055a7773 Further cleanup of Json wrapper class. 2014-08-15 14:38:10 +02:00
Max Neunhoeffer 21eda8a212 Withdraw some operator magic for Json wrapper class. 2014-08-15 13:29:01 +02:00
Max Neunhoeffer 28f0d7be05 Sort out TRI_CompareValuesJson to use UTF8 on demand. 2014-08-13 14:22:05 +02:00
Jan Steemann a2061f66a3 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-11 14:54:25 +02:00
Jan Steemann 24f1f979d0 fixed jsonification of values 2014-08-11 14:54:14 +02:00
Max Neunhoeffer e065c1e507 Fix a bug in JsonHelper about autofree. 2014-08-11 14:28:34 +02:00
James a4f357c15e EnumerateListBlock now working for JSON lists and prepended "explicit" to Json constructors.. 2014-08-08 09:43:54 +02:00
Max Neunhoeffer 87a36596b1 Change Json format of ExecutionPlans. 2014-07-30 15:20:09 +02:00
Jan Steemann f4e8775ddc nicer parser error messages 2014-07-30 12:30:06 +02:00
Jan Steemann 641d35b906 added static v8-basic optimizations 2014-07-29 12:52:37 +02:00
Max Neunhoeffer f3a5aefffb Forgot one. 2014-07-28 16:26:50 +02:00
Jan Steemann 765e44e80b execution v0.0000001 2014-07-28 15:51:38 +02:00
Max Neunhoeffer aa7e24495f Take out debugging output. 2014-07-25 15:16:34 +02:00
Max Neunhoeffer 7c983d0f7b Fix memory allocation issues in Json class. 2014-07-25 15:09:13 +02:00
Max Neunhoeffer b6122ad3dc Snapshot, this version has memcheck problems. 2014-07-25 14:25:22 +02:00
Max Neunhoeffer 067b740146 Comment and finalise Json wrapper class. 2014-07-25 10:33:54 +02:00
Max Neunhoeffer fc83eed330 Add an explicit steal() method to Json. 2014-07-25 00:31:50 +02:00
Max Neunhoeffer f1bcf6e264 Fix operator= for Json objects. 2014-07-25 00:07:20 +02:00
Max Neunhoeffer 6a1203405f Add Json wrapper class to JsonHelpers. 2014-07-24 23:41:06 +02:00
Jan Steemann 0e5679693c fixed compile warnings 2014-07-01 13:17:46 +02:00
Jan Steemann f2ed881227 upgrade error message 2014-06-29 00:18:42 +02:00
Jan Steemann 76de1ae762 cppcheck 2014-06-27 22:20:17 +02:00
Jan Steemann 067dbf63b2 WAL recovery 2014-06-27 19:11:41 +02:00
Frank Celler 28f4433bff Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Wal/LogfileManager.cpp
 2014-06-20 16:43:28 +02:00
Jan Steemann 5556cd8dad fixed startup on Windows 2014-06-20 16:42:21 +02:00
Frank Celler 6936972d08 updated disclaimer 2014-06-20 16:41:35 +02:00
Jan Steemann 7e52ebbc3b fixes for Visual Studio 2014-06-20 15:46:33 +02:00
Jan Steemann a6bb3985bd removed doxygen comments 2014-06-18 22:15:10 +02:00
Jan Steemann 5fb901d713 cppcheck 2014-06-18 21:27:53 +02:00
Jan Steemann 9fc03ec85f cppcheck 2014-06-18 21:13:20 +02:00
Jan Steemann 51cb9257e5 speed up string-buffer reusage by simplehttpclient 2014-06-14 01:24:43 +02:00
Jan Steemann dae5a5151d call (still empty) WAL recovery procedure at startup 2014-06-12 11:28:48 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Jan Steemann edd97f9bf3 removed doxygen comments 2014-06-03 17:35:44 +02:00
Jan Steemann b7b6dafce9 removed libraryloader 2014-06-02 15:46:54 +02:00
Jan Steemann 2c934cf1aa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
 2014-06-02 09:52:05 +02:00
Jan Steemann 5962e9dfc4 added std::19337 2014-05-31 02:56:18 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Jan Steemann 36567df644 removed libbson 2014-05-16 20:32:05 +02:00
Jan Steemann 2bc4aa90af fixed issues found by scan-build 2014-05-15 10:09:06 +02:00
Jan Steemann 9f7923ace3 fixed VS warnings 2014-05-13 13:39:42 +02:00
Jan Steemann 3f6d28de8d fixed VS warnings 2014-05-13 12:44:00 +02:00
Jan Steemann 6011994329 added atomic header 2014-05-12 18:05:25 +02:00
Jan Steemann 14813638dd removed boost 2014-05-12 17:22:42 +02:00
Jan Steemann ed50f3656d added unordered_map and unordered_set 2014-05-12 17:09:26 +02:00
Esteban Lombeyda 9c1d39c1f4 Some Windows Warnings are avoided 2014-05-12 16:48:05 +02:00
Jan Steemann 2e17f4bcd7 cppcheck 2014-05-09 00:21:17 +02:00
Max Neunhoeffer df68f47338 Use StringBuffer in SimpleHttpResult rather than stringstream. 2014-05-07 16:35:40 +02:00
Frank Celler 990a041bbd added local directory to search path 2014-05-04 21:24:52 +02:00
Jan Steemann eb7a94a861 fixed compile warning 2014-04-08 13:21:25 +02:00
Max Neunhoeffer 5dc976ad45 Improve BsonHelper interface. 2014-04-07 15:07:22 +02:00
Max Neunhoeffer ac20acbda3 Draft of BsonHelper done. 2014-04-07 10:27:04 +02:00
Max Neunhoeffer 7410545842 First version of C++ frontend for libbson. 
Appending and setup OK.
Read access not yet done.
 2014-04-04 16:56:49 +02:00
Max Neunhoeffer 41befb9d85 Move BSON to C++. 2014-04-04 12:51:45 +02:00
Jan Steemann 50f2ffaaaf fixed misbehaving memory barriers for Visual Studio 2013 
seems we are affected by the issue described here:
http://lists.schmorp.de/pipermail/libev/2014q1/002318.html
 2014-04-02 14:19:40 +02:00
Max Neunhoeffer dde446fb28 Optimise hash tables by no longer using % for wraparound. 2014-03-24 14:04:24 +01:00
Jan Steemann 79defc2ef1 -Wunreachable-code reverted. Visual Studio doesn't like it 2014-03-06 11:36:58 +01:00
Jan Steemann c5c294aa6b -Wunreachable-code 2014-03-06 11:30:38 +01:00
Jan Steemann 3451c8a03e fixed createNonce call 2014-03-05 10:46:52 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
 2014-02-20 21:02:07 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Jan Steemann 79408d479a removed unused functions 2014-02-19 11:44:51 +01:00
Frank Celler 739900fc2f try to force abort 2014-02-13 12:06:52 +01:00
Jan Steemann 1b08bc6582 start up the HTTP server when starting ArangoDB in console mode 2014-01-27 09:45:26 +01:00
Max Neunhoeffer 0b2ff098f3 Start to use shared_ptr from boost. 2014-01-22 16:20:34 +01:00
Max Neunhoeffer 6b4bbe5d04 Fix a description of two methods. 2014-01-17 10:59:23 +01:00
Jan Steemann 4a805062bb changed internal APIs 2014-01-15 13:36:38 +01:00
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	utils/Makefile.files
 2014-01-10 17:41:52 +01:00
Jan Steemann 3309743c1a moved some collection parameters around 2014-01-07 11:02:49 +01:00
Jan Steemann 5571698555 serialize/unserialize collection data from agency 2014-01-03 19:04:50 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Max Neunhoeffer a79c5801d8 Fix documentation of timeout unit. 2013-12-19 12:16:30 +01:00
Frank Celler f6b40b3395 added memchr and timezone for windows 2013-12-07 18:55:51 +01:00
Frank Celler 64bf0088b4 hopefully fixing wrong include ordering 2013-11-27 20:55:29 +01:00
Jan Steemann edb356f403 print warning message w/ reason 2013-11-21 23:57:51 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 9f312e6680 fixed thread shutdown (double detach) 2013-10-29 22:29:25 +01:00
Jan Steemann c751cc80fc issue #642 2013-10-29 21:15:46 +01:00
Jan Steemann 723785b5b6 Windows warnings 2013-10-29 10:09:12 +01:00
Jan Steemann 72a2a487d3 some fixes for issue #642 2013-10-28 14:34:37 +01:00
Jan Steemann f498f8f03c faster server shutdown 2013-10-18 10:18:46 +02:00
Jan Steemann 0a6148f2d6 fixed some VS complaints 2013-10-16 17:27:35 +02:00
Jan Steemann b8318609e2 updated arangorestore 2013-10-10 16:58:21 +02:00
Jan Steemann 46a295ba43 fixed some Windows warnings 2013-10-08 12:39:47 +02:00
Jan Steemann e3d9d95f3f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	lib/Admin/ApplicationAdminServer.cpp
	lib/GeneralServer/GeneralServerDispatcher.h
 2013-09-26 17:46:05 +02:00
Jan Steemann a525dab0c4 cleanup 2013-09-26 17:27:42 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann c3a2886148 fixed some minor issues in arangob 2013-09-24 10:45:01 +02:00
Jan Steemann d6439f7bf1 properly set error code 2013-09-23 23:15:04 +02:00
Jan Steemann c6c4c70333 activated arangodump and arangorestore 2013-09-06 00:54:58 +02:00
Jan Steemann a53c1e493b multiple database, becoming standard 2013-09-02 09:52:52 +02:00
Jan Steemann 2c4ad55db1 don't call getenv in loop 2013-08-29 22:08:10 +02:00
Jan Steemann 2556b0714f fixed issues reported by VS 2012 2013-08-29 16:43:56 +02:00
Jan Steemann e72c6ab20c fixed a memleak in /_api/replication/dump 2013-08-29 11:46:33 +02:00
Jan Steemann 860ed964c3 simplify build.h 2013-08-28 22:20:06 +02:00
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann edc71e5424 support for deflate compression 2013-08-28 11:44:49 +02:00
Jan Steemann 05a7f79941 re-configuration of logger, cap constraint 2013-07-31 14:39:33 +02:00
Jan Steemann 097e8ad865 cppcheck 2013-07-28 10:47:44 +02:00
Jan Steemann f193015b5f fixed assertion 2013-07-23 10:01:20 +02:00
Jan Steemann c4f82088dd replication tests 2013-07-22 18:12:56 +02:00
Jan Steemann cf05339813 forgot to commit 2013-07-19 11:04:17 +02:00
Jan Steemann 2552d3f389 fixed compiler warnings 2013-07-19 10:54:52 +02:00
Jan Steemann 59682528e0 fixed comment 2013-07-11 17:51:15 +02:00
Jan Steemann 80362ec82f fixed issues reported by cppcheck 2013-07-11 10:02:27 +02:00
Jan Steemann ca6b184286 added TRI_JSON_STRING_REFERENCE 2013-07-10 17:00:29 +02:00
Jan Steemann 054ed3ca3f apply collection data dumps 2013-07-05 11:41:37 +02:00
Jan Steemann b178d095c2 static functions for JSON handling 2013-07-04 15:51:31 +02:00
Jan Steemann 0a98279259 replaced LOGGER_ with LOG_ (better control over memory allocation) 2013-06-28 19:04:32 +02:00
Jan Steemann ca9187854a added (unconditional) caching for PathHandler 2013-06-20 14:36:39 +02:00
Jan Steemann d31573a8b4 fixed a few type issues, updated TODOs 2013-06-07 11:31:42 +02:00
Jan Steemann d7b64d4ae2 merged patches by @guidoreina 2013-05-21 11:33:43 +02:00
Guido Reina 3c352b9ab2 The comment for the method reserve() was wrong (it was copied from the method annihilate()). 2013-05-01 11:01:35 +02:00
Frank Celler a0278476da Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	lib/Basics/StringUtils.cpp
 2013-04-06 10:19:09 +02:00
Frank Celler ab38a0543a fixed missing length 2013-04-05 14:47:45 +02:00
Frank Celler 553ccf099c remove addtogroup blocks 2013-04-03 18:20:37 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Jan Steemann 124d7cb29f fixed file uploads 2013-03-24 18:13:13 +01:00
Frank Celler 8a54df7419 added .arangosh.rc, added /_admin/execute 2013-03-23 14:04:08 +01:00
Oreste Panaia c8ea7ddc8b prepartion for skiplist transactions 2013-03-15 18:26:15 +08:00
Oreste Panaia 36733eb19f preparation for skiplists supporting transactions 2013-03-15 18:12:20 +08:00
Jan Steemann 0216883e36 add warning on exception 2013-03-14 17:28:13 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
a-brandt 58148f33a4 changed nonce handling 2013-03-04 14:03:22 +01:00
a-brandt 8d78bb1c60 added rondom generator and nonce support 2013-03-01 16:48:37 +01:00
Oreste Panaia fc5e1ba623 merge conflicts with devel 2013-02-28 19:42:58 +08:00
Oreste Panaia a48696ec28 network modifications required for windows 2013-02-28 17:43:39 +08:00
Oreste Panaia 2c12f63d7f libev interface 2013-02-19 20:58:21 +08:00
Jan Steemann c64208de25 disable some statistics that are never queried 2013-02-15 11:36:53 +01:00
Jan Steemann 637ed65e09 expose reserve function 2013-02-15 10:22:31 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Oreste Panaia e0b7fbbf8d windows icu 2013-01-31 00:04:20 +08:00
a-brandt 00a3d87bc4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-08 10:43:28 +01:00
a-brandt 8f9e2e51f9 libicu is mandatory now 2013-01-08 10:39:19 +01:00
Jan Steemann 876cda6ce1 cppcheck 2013-01-07 22:37:52 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Jan Steemann b8ca0b2d4d fulltext index massive rewrite 2012-12-15 01:01:25 +01:00
Oreste Panaia 033adb225b Updated windows installer 2012-12-10 19:33:32 +08:00
Jan Steemann fb4afd0353 fulltext index 2012-12-10 12:16:48 +01:00
Jan Steemann cbaa57a1bd cleanup of fulltext indexes, resizing etc. 2012-12-07 18:00:01 +01:00
a-brandt c4cc85ab9f memory bugfix 2012-12-07 13:47:02 +01:00
a-brandt 1794ea49fa added new function for getting words 2012-12-07 13:09:16 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Jan Steemann b8fc158e77 mini changes 2012-12-06 13:12:49 +01:00
Jan Steemann 242a16d6f5 proper naming of ICU functions 2012-12-06 12:27:22 +01:00
Jan Steemann eb39af1e78 handle out of memory 2012-12-03 16:44:16 +01:00
a-brandt 129d6d33eb bugfix 2012-12-03 15:36:00 +01:00
a-brandt 32fbb4109c added tolower and toupper for utf8 2012-12-03 13:30:33 +01:00
Jan Steemann c53cd0b408 added TRI_SizeFile() plus test 2012-10-24 18:37:40 +02:00
Oreste Panaia 4d8d78e880 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	VisualStudio/Arango Front End Library/Arango Front End Library.vcxproj
	arangod/Actions/RestActionHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	lib/ApplicationServer/ApplicationServer.cpp
 2012-10-22 21:04:12 +08:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08:00
Frank Celler f1eaaa7f04 fixed doc issue, doxygen sometimes does not recognize the used namespace 2012-10-16 17:34:54 +02:00
Jan Steemann b642b48603 fixed memory issues 2012-10-11 14:08:38 +02:00
Jan Steemann 97723bbdf6 removed --enable-ssl configure option 
having OpenSSL installed is now a requirement for compiling ArangoDB
 2012-10-10 14:55:18 +02:00
Oreste Panaia 0e835b90b2 windows 2012-10-08 23:29:29 +08:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Oreste Panaia 2a71a3c371 minor changes for windows compatability 2012-09-28 17:34:22 +08:00
Jan Steemann 89754433dd switched to C mersenne twister implementation in BasicsC 2012-09-25 22:57:47 +02:00
Jan Steemann ce3936df9a some cleanup 2012-09-25 16:12:20 +02:00
Jan Steemann 0619c9960c fixed arangob for batch requests 2012-09-25 11:46:15 +02:00
Jan Steemann df6008849d added comment 2012-09-25 10:17:16 +02:00
Jan Steemann aeb9f5126b fixed seeding of rng 2012-09-25 09:27:43 +02:00
Jan Steemann 27dc95dd35 removed dependency on boost library 2012-09-24 19:11:38 +02:00
Jan Steemann 3bc0934dfb removed reference to boost/scoped_ptr 2012-09-24 17:59:55 +02:00
Jan Steemann 50b12a2d0e removed reference to boost/scoped_array 2012-09-24 17:59:07 +02:00
a-brandt ae318ea42f Documentation update 2012-09-24 15:37:21 +02:00
a-brandt fe7f2f8079 ICU changes 2012-09-24 11:40:06 +02:00
a-brandt cb3770a9ae Change to work with ICU 48 2012-09-20 10:13:08 +02:00
Jan Steemann 837c339e45 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 18:35:57 +02:00
Jan Steemann f9ea645a4e fixed UTF-16 comparison 2012-09-19 18:35:37 +02:00
a-brandt c90d7f5f27 Added option --default-language to arangod 2012-09-19 16:57:34 +02:00
a-brandt d077c97f2c ICU updates 2012-09-18 15:42:46 +02:00
a-brandt b505cb77c8 bug fix: wrong default locale 2012-09-17 14:02:38 +02:00
a-brandt 3666069569 Added UTF8/UTF16 normalize and compare functions (uses libicu) 2012-09-17 09:49:41 +02:00
Frank Celler 5c32ae5869 removed boost exceptions 2012-09-13 15:09:02 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Jan Steemann a667f633d5 issue #150 2012-09-04 22:30:44 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
 2012-07-24 22:56:03 +02:00
Frank Celler 041eb53b10 Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangoirb/MRClient/arangoirb.cpp
	lib/GeneralServer/GeneralServer.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/HttpsServer/ApplicationHttpsServer.cpp
 2012-07-24 22:19:46 +02:00
Jan Steemann 7ea8cff7c8 some connection refactoring 2012-07-24 18:42:31 +02:00
Jan Steemann adede89619 moved common ssl error function to file of its own 2012-07-24 12:20:51 +02:00
Jan Steemann 824206dd54 removed server startup options --server.require-keep-alive and --server.secure-require-keep-alive, small optimisations for HTTP request parsing and response header handling 2012-07-18 12:13:12 +02:00
Frank Celler 5ffff9edc4 added process title for supervisor 2012-07-11 10:46:04 +02:00
Frank Celler 957bc347dc added connection statistics 2012-07-05 17:48:12 +02:00
Frank Celler 795b2a9178 added statistics 2012-07-04 18:33:13 +02:00
Frank Celler c47353157c fixed error handling of canceled thread 2012-07-01 14:23:19 +02:00
Frank Celler 479cb7b8b8 fixed shutdown 2012-07-01 14:10:01 +02:00
Jan Steemann 5cbc0ad3c7 added some error messages when using --pid-file 2012-06-27 11:38:43 +02:00
Frank Celler 37d3ad8dc2 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/JavascriptDispatcherThread.cpp
	lib/Dispatcher/DispatcherQueue.cpp
	lib/HttpServer/HttpCommTask.cpp
 2012-06-21 23:17:48 +02:00
Jan Steemann f100e2ad82 changed async task handling 2012-06-21 16:32:54 +02:00
Frank Celler 3fc8118904 cleanup ApplicationFeature 2012-06-20 20:52:15 +02:00
Frank Celler a90635f636 fixed log msg 2012-06-17 18:13:51 +02:00
Frank Celler 704f921d0f new HttpRequest 2012-06-14 15:03:17 +02:00
Frank Celler 02e8d7382f trying to get an abstact class for HttpRequest 2012-06-13 23:29:27 +02:00
Frank Celler 2c5f7e1993 fixed typos 2012-06-13 15:01:00 +02:00
Frank Celler 73e50d932f added name for pthreads 2012-06-13 00:12:45 +02:00
Frank Celler a92cd9ffd2 preparations for ZeroMQ, removed Scheduler and Dispatcher from ApplicationServer 2012-06-12 17:10:49 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00