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

33269 Commits

Author SHA1 Message Date
jsteemann c44649da00 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 14:29:45 +02:00
jsteemann afac92bc60 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 14:29:38 +02:00
jsteemann 4727c833c8 fixed some leaks 2016-08-26 14:29:31 +02:00
Wilfried Goesgens 63dd09ef76 Add missing windows library. 2016-08-26 14:23:17 +02:00
Wilfried Goesgens 1de83c020d fix windows compile problems. 2016-08-26 14:17:28 +02:00
Michael Hackstein 957f20c4b5 Indexes should now be unloaded on onload instead of deleted. 2016-08-26 14:15:09 +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
Wilfried Goesgens 9afbc817a3 Fix syntax error in windows client installer. 2016-08-26 14:06:59 +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 a31fe62c34 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 14:02:27 +02:00
Jan Christoph Uhde 21554e6805 fix CMake so it finds the PythonInterpreter even with oder versions 2016-08-26 14:01:53 +02:00
Michael Hackstein d546d2acf0 Fixed index mathces definition, special cases. 2016-08-26 14:00:37 +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
Jan Christoph Uhde b81556bc64 undo simrans change - building on linux works again 2016-08-26 13:09:16 +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 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
Michael Hackstein 6a04156dc3 Fixed undefined behaviour in OpenIteratorState. The TRI_collection_t* could be a nullptr 2016-08-26 11:15:06 +02:00
jsteemann 8025ec0266 removed define that was used only once 2016-08-26 11:07:50 +02:00
Simran Brucherseifer b6b14dffd5 Merge branch 'devel' of git://github.com/arangodb/arangodb into devel 2016-08-26 11:02:43 +02:00
Simran Brucherseifer f8902b578f cmake: don't allow Python 3 interpreter (gyp only works with Python 2) 2016-08-26 11:01:55 +02:00
Jan Steemann 4bad1d2f96 updated CHANGELOG 2016-08-26 11:00:37 +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
Michael Hackstein b31cf711b9 Now properly fill the indexes when creating a new one. Also slight modifiaction of drop 2016-08-26 10:11:29 +02:00
Michael Hackstein 3c8b8933ed More verbose index error output. 2016-08-26 10:10:46 +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
Michael Hackstein b01a7ac0d5 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 08:02:54 +02:00
Michael Hackstein e75567dae5 Further fixes for tests: Fixed unitialized count. Fixed some false CORRUPTED_COLLECTION states. 2016-08-26 08:02:34 +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
Wilfried Goesgens efc949426f Fix install permissions of binaries. 2016-08-25 17:23:54 +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