Simon Grätzer
27c617fe10
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
# Conflicts:
# 3rdParty/V8/v8
# arangod/Transaction/Methods.h
# arangod/Utils/UserTransaction.h
# arangod/V8Server/v8-collection.cpp
2017-03-01 14:52:35 +01:00
jsteemann
666b2f8da9
renaming
2017-02-27 14:38:27 +01:00
jsteemann
90f32ed525
renamed classes
2017-02-27 11:40:15 +01:00
jsteemann
94ce6a65f8
renamed methods
2017-02-27 11:22:44 +01:00
jsteemann
d0df1952e8
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-24 17:51:59 +01:00
jsteemann
dc72ec3ee7
fixed a race when dropping databases
2017-02-23 15:22:50 +01:00
Michael Hackstein
aa442fc4ac
Removed a velocypack-aliases include from voc-type.h
2017-02-23 13:07:32 +01:00
Michael Hackstein
5d452edec6
Moved ditches into MMFiles.
2017-02-23 09:02:34 +01:00
Michael Hackstein
b857717ff0
Removed unused included.
2017-02-22 10:47:20 +01:00
Jan Christoph Uhde
d73d25a310
remove some includes
2017-02-21 14:43:21 +01:00
jsteemann
f5c8932744
initial version of query execution plan cache, still very rough
2017-02-21 11:58:38 +01:00
Jan Christoph Uhde
6e1f77be24
remove ditches from interface. the ditches concept needs fixing!!
2017-02-21 10:53:51 +01:00
Jan Christoph Uhde
f3a1f128ee
remove isFullyCollected from LogicalCollection
2017-02-20 10:28:28 +01:00
Michael Hackstein
91f303e963
Removed readRevision from LogicalCollection. You only get readDocument with a token. Moved it's logic into MMFilesCollection. removed the ignoreWal parameter from readDocumentConditional. It was always true anyways...
2017-02-17 17:29:49 +01:00
Michael Hackstein
e396446a17
Some cleanup in Logical collection imports
2017-02-17 13:16:22 +01:00
jsteemann
97728e51c1
simplifications
2017-02-15 15:19:40 +01:00
jsteemann
09da6bea7f
simplify internal APIs
2017-02-15 12:57:43 +01:00
jsteemann
d49c5c3fc0
simplified internal APIs a bit
2017-02-15 12:42:07 +01:00
jsteemann
b4027dc02c
make property protected
2017-02-15 10:41:34 +01:00
jsteemann
df3a3eff9f
refactoring
2017-02-15 10:26:05 +01:00
jsteemann
01bf68549d
simplifications
2017-02-14 22:48:51 +01:00
jsteemann
12b973dc4b
fix my compile errors
2017-02-14 16:41:31 +01:00
Michael Hackstein
50368b9985
Moved CollectionRead/WriteLocker to MMFiles. Also moved cleanupIndexes to MMFilesCollection
2017-02-14 15:12:36 +01:00
jsteemann
0909ffe69b
moved helper functions into their own file
2017-02-14 13:44:54 +01:00
jsteemann
7e690a0c61
renaming
2017-02-13 15:18:40 +01:00
jsteemann
16189aa969
moved TransactionHints.h
2017-02-13 14:36:27 +01:00
jsteemann
eb73dbf960
renaming
2017-02-13 13:30:57 +01:00
jsteemann
f09ec85127
renaming
2017-02-13 12:27:26 +01:00
jsteemann
f5d83935f0
renamed class
2017-02-13 10:12:36 +01:00
Michael Hackstein
48166a294c
TraversalNode now does not know anything about EdgeIndexes any more. Removed isMMFilesEdgeIndex from Transaction, no obsolete
2017-02-10 18:18:23 +01:00
Michael Hackstein
07154391a2
Removed iteratorForSlice on Indexes and adapted index scan on transaction, because it can now only be used for ANY or ALL scans.
2017-02-10 15:47:24 +01:00
Simon Grätzer
edab268572
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
# Conflicts:
# arangod/Aql/FunctionDefinitions.cpp
# arangod/Aql/Functions.h
# arangod/Utils/ExplicitTransaction.h
2017-02-10 15:21:24 +01:00
jsteemann
d024a6d00a
remove logging for non-topics
2017-02-10 09:32:50 +01:00
Frank Celler
cab6ac044d
fixed compile warning
2017-02-08 12:05:32 +01:00
jsteemann
01d3ad67b1
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-08 00:59:16 +01:00
Max Neunhoeffer
883c11ea45
Handle the case that ClusterComm is already shut down gracefully.
...
This touches every single place where ClusterComm is being used.
2017-02-07 15:31:40 +01:00
jsteemann
2c9e220f03
refactoring
2017-02-07 14:36:03 +01:00
jsteemann
d468fffdcb
fix problems with rollback
2017-02-07 13:04:27 +01:00
jsteemann
600af50bb1
added convenience method collectionName
2017-02-07 12:05:36 +01:00
jsteemann
4fccb56f93
make TransactionState a class and privatize some of its internals
2017-02-07 11:58:34 +01:00
jsteemann
4a7c3734e0
remove friend class declaration
2017-02-07 11:45:50 +01:00
jsteemann
3b1e3fac52
make TransactionCollection more engine-specific
2017-02-07 11:24:58 +01:00
jsteemann
cbea3080c1
privatize TransactionCollection internals
2017-02-07 09:19:06 +01:00
jsteemann
37df6b069e
make most variables of TransactionCollection private
2017-02-07 09:09:25 +01:00
jsteemann
27113d2b8c
moved function into class
2017-02-07 08:55:20 +01:00
jsteemann
ab11410911
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-06 13:05:11 +01:00
Max Neunhoeffer
62521ee617
Fix synchronous replication.
...
It was possible that a follower got into sync after the list of
followers was retrieved, but before a single document was written.
This dropped this document for the new follower because the leader
forgot to replicate it. This lead to document loss in case of a
failover or planned leader change.
2017-02-03 16:51:51 +01:00
Michael Hackstein
7083671116
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-02-03 13:22:43 +01:00
Michael Hackstein
5e4b9e42b3
Fixed minor bugs in usage of callback-based index-api. Remove unused old next and nextBabies index iterator functions.
2017-02-03 13:22:06 +01:00
Michael Hackstein
703199bc32
Fixed compiler error from previous commit.
2017-02-02 15:42:35 +01:00