jsteemann
|
1823cff3a9
|
removed TRI_collection_t
|
2016-09-02 14:54:13 +02:00 |
jsteemann
|
4839d65b36
|
moved things out of TRI_collection_t
|
2016-09-02 11:56:48 +02:00 |
jsteemann
|
002f503dac
|
don't use c_str()
|
2016-09-02 09:14:34 +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 |
jsteemann
|
b2eadbd179
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types
|
2016-08-30 16:07:50 +02:00 |
Jan Steemann
|
b7be5d5cfb
|
fixed issue #2026
|
2016-08-30 15:14:16 +02:00 |
jsteemann
|
2134afaa83
|
renamed method
|
2016-08-30 10:36:34 +02:00 |
jsteemann
|
b9f8709104
|
renamed GeoIndex2 to GeoIndex
|
2016-08-29 13:02:07 +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 |
jsteemann
|
8a6d054642
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream
|
2016-08-26 12:37:07 +02:00 |
Jan Steemann
|
0392ba9b1a
|
throw OOM error in case no buffer can be allocated
|
2016-08-26 11:00:05 +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 |
jsteemann
|
c6efe26198
|
cppcheck
|
2016-08-25 14:04:23 +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 |
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
|
04f5fbbdb2
|
fixed issue #2018
|
2016-08-24 17:33:49 +02:00 |
jsteemann
|
f92815b09b
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream
|
2016-08-24 09:38:06 +02:00 |
Wilfried Goesgens
|
6934baa6a4
|
Attempt not to bypass error handling so we hopefully get some more information on issue #2011
|
2016-08-23 17:02:28 +02:00 |
Jan Christoph Uhde
|
5be5030983
|
Merge branch 'obi-velocystream-enums' into engine-vs-velocystream
* obi-velocystream-enums:
clean up - remove enumToEnum magic
finish ResponseCode enum
finish ProtocolVersion, ProtocolType and ConnectionType
finish ContentType enum
preapre move of ContentTypes
finish RequestType enum
prepare replacement of request types
even more error messages
slightly better error messages
better exceptions form event loop
mark len constexpr
Conflicts:
arangod/Agency/Inception.cpp
|
2016-08-23 16:01:58 +02:00 |
Jan Christoph Uhde
|
1febeadfd7
|
finish ResponseCode enum
|
2016-08-23 15:46:42 +02:00 |
Jan Christoph Uhde
|
d3654d99d8
|
finish RequestType enum
|
2016-08-23 14:49:29 +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
|
57fa55921c
|
fix execution of AQL traversal expressions when there are multiple conditions that refer to variables set outside the traversal
|
2016-08-23 10:48:08 +02:00 |
Jan Steemann
|
b296468a18
|
more optimizations
|
2016-08-22 17:36:04 +02:00 |
Michael Hackstein
|
635641d4e5
|
Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into engine-vs-velocystream
|
2016-08-19 13:15:48 +02:00 |
jsteemann
|
c5e578917c
|
removed useless include
|
2016-08-19 12:42:45 +02:00 |
Michael Hackstein
|
96f11c7e9f
|
Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types
|
2016-08-19 12:26:07 +02:00 |
jsteemann
|
e9866698aa
|
removed JsonHelper
|
2016-08-19 12:24:12 +02:00 |
jsteemann
|
1b11096060
|
remove Json/JsonHelper/TRI_json_t
|
2016-08-18 17:28:43 +02:00 |
jsteemann
|
21dd73074a
|
cppcheck
|
2016-08-18 16:57:55 +02:00 |
jsteemann
|
1cfee8059a
|
remove TRI_json_t remainders
|
2016-08-18 16:13:52 +02:00 |
Michael Hackstein
|
d3ba488271
|
Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types
|
2016-08-18 12:38:07 +02:00 |
jsteemann
|
370093d37f
|
removed unused method
|
2016-08-18 11:47:27 +02:00 |
jsteemann
|
a2085066e0
|
use VPack
|
2016-08-18 10:36:52 +02:00 |
Michael Hackstein
|
21335bb398
|
Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types
|
2016-08-17 11:23:04 +02:00 |
Michael Hackstein
|
17a6da8afb
|
Removed all references on TRI_vocbase_col_t and replaced them by LogicalCollection class. Not everything is properly moved and implemetned yet. This commit causes crashes.
|
2016-08-17 11:10:39 +02:00 |
Michael Hackstein
|
14e0411a87
|
Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types
|
2016-08-16 10:29:26 +02:00 |
jsteemann
|
c00c4cd2bc
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
|
2016-08-15 18:58:43 +02:00 |
jsteemann
|
d4df305573
|
slightly improve query performance
|
2016-08-15 18:57:37 +02:00 |
jsteemann
|
000fd9cbdc
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
|
2016-08-15 18:35:43 +02:00 |
jsteemann
|
d2c1d75705
|
make unary minus and plus being executed in native C++
|
2016-08-15 18:07:28 +02:00 |
jsteemann
|
1ec14d0bba
|
privatize attributes
|
2016-08-15 15:47:39 +02:00 |
jsteemann
|
209c108c59
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
|
2016-08-15 14:34:01 +02:00 |
jsteemann
|
ed1e29bf57
|
execute ternary operator in C++ as well
|
2016-08-15 11:07:12 +02:00 |
Michael Hackstein
|
94ca36fdb2
|
Removed cluster-wide CollectionInfo and replaced it with a logical collection. The Logical collection shall be always available, in cluster and single server.
|
2016-08-15 09:08:24 +02:00 |
jsteemann
|
bc6633e4c0
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
|
2016-08-04 13:33:10 +02:00 |
jsteemann
|
8a200f754c
|
WG beautification
|
2016-08-04 12:36:14 +02:00 |
jsteemann
|
8baa7ec955
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
|
2016-08-03 13:39:00 +02:00 |