Jan Christoph Uhde
3d26df27a0
prepare the fixing of resthandlers
2016-08-27 00:27:07 +02:00
Kaveh Vahedipour
b94f17fb21
minor timing
2016-08-26 15:30:26 +00:00
Kaveh Vahedipour
d7334c5616
minor timing
2016-08-26 15:29:41 +00:00
jsteemann
37258adb57
Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types
2016-08-26 16:37:25 +02:00
jsteemann
f5972cc701
moved _keyGenerator
2016-08-26 16:34:21 +02:00
Kaveh Vahedipour
fb6e651525
Adding Foxx access to agency
2016-08-26 16:28:42 +02:00
Kaveh Vahedipour
0b8b56a54a
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-08-26 16:25:17 +02:00
Kaveh Vahedipour
e07543c2e2
Adding Foxx access to agency
2016-08-26 16:25:03 +02:00
jsteemann
cd666c303f
Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types
2016-08-26 16:22:53 +02:00
Jan Christoph Uhde
8e56b1df7d
improve logging
2016-08-26 16:22:49 +02:00
jsteemann
2ea5794a18
moved _datafileStatistics into engine
2016-08-26 16:22:41 +02:00
Michael Hackstein
f473badc24
Fixed a bug where reloading a collection created an addition primary index.
2016-08-26 15:52:38 +02:00
Michael Hackstein
b040edd9b4
Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types
2016-08-26 15:35:56 +02:00
Michael Hackstein
1082963da0
Logical collection does not throw V8 exception any more.
2016-08-26 15:35:53 +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
jsteemann
40a07c1e4d
assert that there are no indexes when primary and edge index are added
2016-08-26 15:27:13 +02:00
Jan Christoph Uhde
d635b720b0
try to add statistics to VppCommTask
2016-08-26 15:15:33 +02:00
jsteemann
0f31e4ec5a
do not set errno on fatal error
2016-08-26 15:04:08 +02:00
Michael Hackstein
4349c62773
Fixed index creation if an index id is given.
2016-08-26 14:58:14 +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
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