1
0
Fork 0
Commit Graph

10911 Commits

Author SHA1 Message Date
jsteemann 2134afaa83 renamed method 2016-08-30 10:36:34 +02:00
jsteemann 5964ffce78 fixed some tests 2016-08-30 09:36:43 +02:00
Jan Christoph Uhde 8e38600369 fix RestExportHandler 2016-08-29 21:27:05 +02:00
Jan Christoph Uhde d8be2b4079 fix: RestcursorHandler 2016-08-29 20:33:37 +02:00
Jan Christoph Uhde 656ceb873d add vpack version of cursor.dump() 2016-08-29 14:20:42 +02:00
jsteemann b196383b6d some preparation work for response generalization 2016-08-29 10:07:31 +02:00
jsteemann 5d3946a6ba removed obsolete comment 2016-08-29 10:07:15 +02:00
Jan Christoph Uhde c31b93647a try to fix RestCursorHandler 2016-08-27 02:01:18 +02:00
Jan Christoph Uhde 3d26df27a0 prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
Jan Christoph Uhde 8e56b1df7d improve logging 2016-08-26 16:22:49 +02:00
Jan Christoph Uhde d635b720b0 try to add statistics to VppCommTask 2016-08-26 15:15:33 +02:00
Jan Christoph Uhde b30c3f8e85 Merge branch 'obi-velocystream' into obi-velocystream-agent
* obi-velocystream:
  fix CMake so it finds the PythonInterpreter even with oder versions
  added unload() functionality for indexes (untested)
  Adding Foxx access to agenc
2016-08-26 14:09:38 +02:00
Jan Christoph Uhde a0ad27499d Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream
* origin/engine-vs-velocystream:
  added unload() functionality for indexes (untested)
  Adding Foxx access to agenc
2016-08-26 14:02:46 +02:00
jsteemann 22b1b7b7e7 added unload() functionality for indexes (untested) 2016-08-26 14:00:03 +02:00
jsteemann 4b53310189 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 13:42:40 +02:00
Kaveh Vahedipour b409a1ff25 Adding Foxx access to agenc 2016-08-26 13:35:39 +02:00
Jan Christoph Uhde c2e2ff6744 Merge branch 'obi-velocystream' into obi-velocystream-agent
* obi-velocystream:
  undo simrans change - building on linux works again
  added assertions to prevent buffer overruns
  moved _compactionLock out of TRI_collection_t
  cmake: don't allow Python 3 interpreter (gyp only works with Python 2)
  updated CHANGELOG
  throw OOM error in case no buffer can be allocated
  add note about potential performance issues
2016-08-26 13:16:14 +02:00
Jan Christoph Uhde 3b3f33d74f Merge branch 'obi-velocystream' into engine-vs-velocystream
* obi-velocystream:
  add note about potential performance issues
  fix usage of unique_ptr
  rename HttpServerJob -> GeneralServerJob
  improve error handling
  improve error handling
2016-08-26 13:09:48 +02:00
jsteemann 8a6d054642 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 12:37:07 +02:00
jsteemann 900c28aec9 moved _compactionLock out of TRI_collection_t 2016-08-26 11:53:42 +02:00
Jan Christoph Uhde 221b35267c Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-agent
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (29 commits)
  removed define that was used only once
  fix dumping of VPackSlices without CustomTypeHandler
  remove includes
  add no-throttling hint for compactor, too
  remove function pointers from TRI_datafile_t, added constructor and destructor
  moved functionality into engine
  fixed tests
  finalize classes
  fix agency shutdown
  cppcheck
  cppcheck
  fix agency shutdown
  removed unused file
  more diagnostic output
  issue #2006: added more diagnostic output for some replication errors
  allow dropping system collections in some rare cases
  updated CHANGELOG
  fixed issue #2012
  explain why we fail to fetch the git revision.
  Cleanup cmake process so it doesn't barf on problems to detect the git version.
  ...
2016-08-26 11:47:23 +02:00
jsteemann 8025ec0266 removed define that was used only once 2016-08-26 11:07:50 +02:00
Jan Steemann 0392ba9b1a throw OOM error in case no buffer can be allocated 2016-08-26 11:00:05 +02:00
Jan Christoph Uhde ae77145651 clean up commtaks - and prepare for merge with jan that will avoid exceptions 2016-08-26 10:58:36 +02:00
jsteemann 9ae2cb36e9 fix dumping of VPackSlices without CustomTypeHandler 2016-08-26 10:51:54 +02:00
Jan Christoph Uhde 77262f064d add note about potential performance issues 2016-08-26 10:20:24 +02:00
jsteemann 83cc1a1d5a remove includes 2016-08-26 10:18:30 +02:00
Jan Christoph Uhde c42bc4016a Merge branch 'obi-velocystream' into obi-velocystream-agent
* obi-velocystream:
  fix usage of unique_ptr
  rename HttpServerJob -> GeneralServerJob
  improve error handling
  improve error handling

Conflicts:
	arangod/GeneralServer/GeneralServer.cpp
2016-08-26 09:20:12 +02:00
jsteemann bcd3e927a9 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 09:18:58 +02:00
Jan Christoph Uhde 999991bd44 fix usage of unique_ptr 2016-08-26 09:15:54 +02:00
jsteemann 7a308c1d76 add no-throttling hint for compactor, too 2016-08-26 09:14:43 +02:00
jsteemann 6150da7420 remove function pointers from TRI_datafile_t, added constructor and destructor 2016-08-26 09:08:24 +02:00
Jan Christoph Uhde b5cd47e579 rename HttpServerJob -> GeneralServerJob 2016-08-26 09:04:06 +02:00
Jan Christoph Uhde 2f8e27af0c Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream
* 'obi-velocystream' of github.com:arangodb/arangodb:
  improve error handling
2016-08-25 16:49:05 +02:00
Jan Christoph Uhde 88695ea334 improve error handling 2016-08-25 16:46:56 +02:00
Jan Christoph Uhde 8e950a9d2a improve error handling 2016-08-25 16:39:49 +02:00
Jan Christoph Uhde 975a3a8aa0 StatisticsAgent is no longer CommTask base - http_server tests ok! 2016-08-25 16:21:45 +02:00
jsteemann 999e2dab1b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 15:38:12 +02:00
jsteemann e9fe772469 moved functionality into engine 2016-08-25 15:37:55 +02:00
Jan Steemann f7da4d9bbf Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-25 14:38:23 +02:00
jsteemann 4020d8f2e9 finalize classes 2016-08-25 14:25:17 +02:00
jsteemann 257aefc5c5 fix agency shutdown 2016-08-25 14:06:08 +02:00
jsteemann c6efe26198 cppcheck 2016-08-25 14:04:23 +02:00
jsteemann 667dc8af49 fix agency shutdown 2016-08-25 14:04:11 +02:00
Jan Steemann 3600ed40f8 more diagnostic output 2016-08-25 14:02:47 +02:00
Jan Steemann 34a31f2b97 issue #2006: added more diagnostic output for some replication errors 2016-08-25 14:02:35 +02:00
Jan Christoph Uhde 2ba4901b86 fist changes to get request agents working 2016-08-25 13:28:19 +02:00
jsteemann 6af38d3c80 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 12:50:19 +02:00
jsteemann 396ab41736 allow dropping system collections in some rare cases 2016-08-25 12:47:06 +02:00
Jan Steemann 4769501804 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-25 12:41:35 +02:00