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

1666 Commits

Author SHA1 Message Date
Wilfried Goesgens abd83047fe implement use-local-time for slow queries as sugested in #2051 2016-09-14 13:01:30 +02:00
Michael Hackstein 8dd3105762 Added a smartSearch route for Traversal Engines. In Community edition this will throw ONLY_ENTERPRISE. It should never be called by our code however. 2016-09-12 13:42:08 +02:00
Max Neunhoeffer d7ab888046 Cleanup hash function for attributes. Prepare enterprise. 2016-09-09 16:49:02 +02:00
Frank Celler eed90fc588 fixed cppcheck warnings 2016-09-09 15:08:48 +02:00
jsteemann eea35223de move json-utilities to the place where it is solely used 2016-09-08 09:51:15 +02:00
jsteemann 34f7e27d6c Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-08 09:27:53 +02:00
Frank Celler 6abe3d9487 give more debug info 2016-09-08 08:40:29 +02:00
jsteemann 5807d121e6 added comments 2016-09-07 15:00:15 +02:00
jsteemann f5a595f464 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-07 08:52:07 +02:00
Frank Celler 650b325529 shutdown thread that is not started directly 2016-09-06 23:20:23 +02:00
Kaveh Vahedipour 2840d4a002 try to fix the shutdown in thread 2016-09-06 18:32:46 +02:00
jsteemann 5e9cb5c852 removed unused error codes 2016-09-02 15:36:59 +02:00
jsteemann a7cee1490a fix some shutdown issues 2016-09-01 17:43:32 +02:00
jsteemann 69bfca08ca Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 15:39:11 +02:00
jsteemann 6b376fe3e1 a bit less locking 2016-09-01 15:25:19 +02:00
jsteemann 68ae8d2945 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 12:02:50 +02:00
Jan Steemann d57c3ef792 removed unused method 2016-09-01 12:02:24 +02:00
Jan Steemann a2f0b0a49f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-09-01 11:20:15 +02:00
Jan Steemann e03d550985 removed unused methods 2016-09-01 11:19:55 +02:00
jsteemann be820ac927 fix freeing of nullptr 2016-09-01 08:42:17 +02:00
jsteemann 149ef4ab8b fix freeing of nullptr 2016-09-01 08:39:44 +02:00
jsteemann 2d1e0bd3ae fixed some leaks 2016-08-31 15:30:47 +02:00
jsteemann a04934ce50 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 09:25:09 +02:00
Jan Christoph Uhde ed111a39a1 Merge branch 'devel' into obi-velocystream-try-merge-devel 
* devel: (24 commits)
  minor fixes
  fix effect that on second install we will complain about mismatching passwords
  only test for cleaning up 3rdparty if we're parametrized to do so.
  fix CMake so it finds the PythonInterpreter even with oder versions
  hexify corrupted markers
  Fix comments
  fixed cluster start
  issue #2022: double max allowed request body size, cap --batch-size value in arangoimp
  fixed issue #2023: added replicationFactor to docs
  improve the perf script
  fix perfsetupscript
  clean up perf script
  add SYSTEM flag to boost includes to avoid warnings
  Adding Foxx access to agency
  Adding Foxx access to agency
  fix compile warning
  Add missing windows library.
  fix windows compile problems.
  Fix syntax error in windows client installer.
  If we have relative paths that are working, make them absolute so they still work after CWD's of arangod
  ...

Conflicts:
	arangod/Agency/AgentConfiguration.cpp
	arangod/GeneralServer/HttpCommTask.cpp
	arangod/RestServer/DatabaseFeature.cpp
	arangod/VocBase/datafile.cpp
 2016-08-30 22:04:31 +02:00
jsteemann 9b94287fb7 unify id handling? 2016-08-30 16:07:35 +02:00
jsteemann 9e708112a6 privatize some TRI_datafile_t internals 2016-08-29 15:43:03 +02:00
Jan Christoph Uhde 3d26df27a0 prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
jsteemann 50d4d5493c Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 15:32:24 +02:00
jsteemann 4f994f70b5 fix compile warning 2016-08-26 15:31:57 +02:00
jsteemann 598990eb5c Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 15:27:37 +02:00
Wilfried Goesgens 1a4675865e Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-26 14:55:48 +02:00
jsteemann 0fe0e89a89 invalidate bucket data 2016-08-26 14:53:37 +02:00
jsteemann 4727c833c8 fixed some leaks 2016-08-26 14:29:31 +02:00
Wilfried Goesgens 1de83c020d fix windows compile problems. 2016-08-26 14:17:28 +02:00
jsteemann a31fe62c34 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 14:02:27 +02:00
jsteemann 22b1b7b7e7 added unload() functionality for indexes (untested) 2016-08-26 14:00:03 +02:00
Michael Hackstein 0985e7fc88 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 12:52:41 +02:00
Wilfried Goesgens 3d6810ecfe If we have relative paths that are working, make them absolute so they still work after CWD's of arangod 2016-08-26 12:50: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
Michael Hackstein 1c883a811c Potential fix for unload->load. Needs to be validated. 2016-08-26 12:35:33 +02:00
jsteemann 08f1fa3a22 added assertions to prevent buffer overruns 2016-08-26 12:04:28 +02:00
jsteemann 9ae2cb36e9 fix dumping of VPackSlices without CustomTypeHandler 2016-08-26 10:51:54 +02:00
Wilfried Goesgens d37c9a751f fix syntax :-( 2016-08-25 17:50:08 +02:00
Wilfried Goesgens f39ec1c591 Windows install: no backslash strings in cmake. 2016-08-25 17:35:29 +02:00
Michael Hackstein 7d6402b15c Fixed soem crashes and undefined behaviuor. Server does not crash during tests, however a lot of them are still red 2016-08-25 14:51:03 +02:00
Michael Hackstein e1ac5175b1 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-25 11:09:11 +02:00
Michael Hackstein 1f3dabc8e1 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-25 11:08:39 +02:00
jsteemann f4aa60ed0d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 10:38:26 +02:00
Wilfried Goesgens 4939e02fb2 Make the existance of the database directory non-mandatory again. 2016-08-25 10:07:37 +02:00
Michael Hackstein 2af30f056d Moved index creation to use LogicalCollection instead of TRI_collection_t. Involved changes of the constructor, all can now be created using iid and Slice. Removed specialized functions to create/find indixes in v8-voc index. Also the iteration is modified. This commit compiles but tests will fail. Merge commit. 2016-08-25 09:57:36 +02:00
jsteemann 1dab450622 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:35:10 +02:00
jsteemann 07055384b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:34:59 +02:00
jsteemann 04f5fbbdb2 fixed issue #2018 2016-08-24 17:33:49 +02:00
Jan Christoph Uhde f9feb14a6e Revert "Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream" 
This reverts commit 76679e1636, reversing
changes made to 5be5030983.

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-24 15:26:49 +02:00
Wilfried Goesgens 1688655509 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-24 14:46:48 +02:00
Wilfried Goesgens 1f162ac882 Implement scheme to more clever pass the directories from the build process to the run-time 
We will now try to evaluate the toplevel install directory from the configured binary dir.
We will use this toplever directory when searching for other directories.
 2016-08-24 14:45:08 +02:00
Jan Christoph Uhde 76679e1636 Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream 
* obi-velocystream-attribute-translator:
  add options to Slice::get and use them for VPackHeader
  add translator to VelocyPackHelper and headerOption to Vpp Protocol

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
	lib/Rest/CommonDefines.h
 2016-08-24 09:18:35 +02:00
Jan Christoph Uhde 8f5e6f65d6 add translator to VelocyPackHelper and headerOption to Vpp Protocol 2016-08-23 13:05:50 +02:00
jsteemann 5f06a5c025 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-23 12:13:08 +02:00
Jan Steemann 5dd8c8feee throw exception in StringBuffer ctor when no memory is available 2016-08-22 17:36:12 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +02:00
Jan Christoph Uhde e1e7e2da0b Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge 
* origin/engine-vs-velocystream: (91 commits)
  removed useless include
  removed JsonParser
  removed JsonHelper
  Fixed another failed nullptr handling in LogicalCollection cluster case.
  Fixed undefined behaviour in rest error creation
  Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode
  agency startup changed to bootstrapping
  Mention howto control core files on linux.
  shutdown fixed
  Removed create / drop system collection from Cluster test. This is forbidden now
  The logical colleciton now knows it's journalSize
  Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again.
  pushing corrected unittest script and cluster startup scripts
  adjusting startup scripts
  missing source file added
  we have a bootstrapping agency
  votes are processed correctly again
  Add module.context.createDocumentationRouter
  Don't implicitely build the windows packages.
  remove debug print
  ...

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	arangod/GeneralServer/VppCommTask.h
	arangod/RestHandler/RestBaseHandler.cpp
	lib/Rest/VppRequest.h
 2016-08-19 14:35:05 +02:00
jsteemann f6ca78f9e7 removed JsonParser 2016-08-19 12:39:26 +02:00
Frank Celler d17f42379b fix errors during shutdown 2016-08-19 12:27:01 +02:00
jsteemann e9866698aa removed JsonHelper 2016-08-19 12:24:12 +02:00
jsteemann c5f151da5c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 11:01:15 +02:00
Jan Christoph Uhde 3a9867f86d merge with frank 2016-08-19 10:00:43 +02:00
Jan Christoph Uhde 61cb8f561f Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream 
* origin/obi-velocystream-frank:
  fixed ownership of handler

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-19 09:58:27 +02:00
Kaveh Vahedipour d8cb8a33ac pushing corrected unittest script and cluster startup scripts 2016-08-19 09:49:44 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
Wilfried Goesgens dadd9833d1 Implement detection whether we are in a git repo and use the toplevel source dir. 2016-08-18 17:53:47 +02:00
jsteemann d7b2141da0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 16:22:00 +02:00
Wilfried Goesgens 7250db8830 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-18 15:59:12 +02:00
Wilfried Goesgens 976b25b745 We nowadays install to /usr/share/arangodb3/ 2016-08-18 15:57:33 +02:00
jsteemann 0ec5ae6c59 signal under the lock 2016-08-17 17:06:51 +02:00
jsteemann 1b5ff51d05 potentially fix thread pool shutdown issues 2016-08-17 11:30:27 +02:00
jsteemann 84656f776b move CleanupThread into engine 2016-08-17 10:48:17 +02:00
jsteemann 2ab782aeb2 removed obsolete defines 2016-08-16 17:51:33 +02:00
jsteemann d5af72f47f fix typo in method name 2016-08-16 13:11:39 +02:00
Jan Christoph Uhde 1d1e19678d failed try to resolve externals 2016-08-15 22:58:21 +02:00
Jan Christoph Uhde df3d83ae9e add sanitizeExternalsChecked function 2016-08-15 22:21:02 +02:00
Michael Hackstein 7b328d39e9 Merge branch 'devel' of github.com:arangodb/arangodb into engine-vs-velocystream 2016-08-11 12:41:08 +02:00
servusoft 3b5c9a73d5 Update build-repository.h.in 2016-08-09 13:39:46 +02:00
servusoft 48da84a323 Create build-repository.h.in 
Adjustment for Repository Version
 2016-08-09 13:23:59 +02:00
Wilfried Goesgens 2f3c03f126 Simplify 2016-08-08 10:16:34 +02:00
servusoft 4a1eb6c8da Global definition heap memory (TRI_V8_MAXHEAP) and adoptation for ARM 2016-08-05 18:50:53 +02:00
jsteemann 95ac01313b privatization 2016-08-04 17:06:51 +02:00
jsteemann f44effd225 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-02 12:59:06 +02:00
Jan Steemann 8e591c16c2 fixed random number generator initialization 2016-08-02 12:25:46 +02:00
jsteemann 5cdbfc423d Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-02 11:57:37 +02:00
Jan Steemann 2870a9f10f visual studio 2016-08-02 11:46:44 +02:00
jsteemann 788922f55a some fixes 2016-08-01 17:16:23 +02:00
Frank Celler 4d81c4c733 just in case someone changes the epoch 2016-08-01 13:43:30 +02:00
Frank Celler af6cbe272a fixed epoch computation 2016-08-01 13:43:30 +02:00
jsteemann 71bd7deace Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-01 09:04:17 +02:00
Frank Celler a078a4fd70 just in case someone changes the epoch 2016-07-31 18:56:14 +02:00
Frank Celler 792f42d5af fixed epoch computation 2016-07-31 11:27:59 +02:00
jsteemann ebaabdb076 Merge branch 'obi-velocystream-4' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-07-28 16:11:26 +02:00
jsteemann cc5eaea09c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-28 09:10:17 +02:00
Frank Celler 24db83573a added thread affinity for MacOSX 2016-07-27 22:29:59 +02:00