jsteemann
c652a313da
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-17 14:03:59 +01:00
Michael Hackstein
c543dd06a4
Moved index filling into the MMFiles collection
2017-02-17 12:56:54 +01:00
jsteemann
3e7432ccd6
clean up write lockers a bit
2017-02-16 15:44:45 +01:00
Michael Hackstein
f0fbe78b2d
Moved restoreIndex to Physical collection.
2017-02-16 15:01:00 +01:00
Michael Hackstein
a3aae2e43b
Moved saveIndex logic into the physical collection
2017-02-16 12:53:05 +01:00
Michael Hackstein
94fbfaa453
Moved the entire logic of open() to the Physical collection. It is different for each StorageEngine.
2017-02-15 16:26:55 +01:00
Michael Hackstein
c3ff82f4e1
Moved version management to MMFiles collection. Logical does not need to know it. Removed PhysicalCollection inclode from logicical collection. Now we should rebuild less code whan changing sth in storage engine.
2017-02-15 15:48:33 +01:00
jsteemann
7ff2e19abb
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-15 12:46:06 +01:00
Michael Hackstein
cc999641a5
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-02-15 12:36:53 +01:00
Jan Christoph Uhde
be89cac445
move path from logical to physical
2017-02-15 11:43:38 +01:00
Michael Hackstein
d49cbffc46
Moved revision handling from Logical to MMFiles collection. That is only relevant for MMFiles.
2017-02-15 11:26:58 +01:00
jsteemann
ffa5e2aa54
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
2017-02-15 10:26:11 +01:00
jsteemann
df3a3eff9f
refactoring
2017-02-15 10:26:05 +01:00
Michael Hackstein
9e41a7a6bb
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-02-15 10:09:55 +01:00
Michael Hackstein
089816a353
Moved Rollback Operation and InsertIntoIndexes from Logical to MMFilesCollection. This is marker/index specific code.
2017-02-15 10:09:51 +01:00
jsteemann
328ff8a09e
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-15 00:09:42 +01:00
Jan Christoph Uhde
ce3b1ff9b5
Merge branch 'obi-storage' into devel
...
* obi-storage:
move compation locking / figures out of logical collection
Conflicts:
arangod/MMFiles/MMFilesCollection.h
arangod/VocBase/LogicalCollection.h
2017-02-14 16:14:25 +01:00
Michael Hackstein
50368b9985
Moved CollectionRead/WriteLocker to MMFiles. Also moved cleanupIndexes to MMFilesCollection
2017-02-14 15:12:36 +01:00
Michael Hackstein
dffd9fc807
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-02-14 14:08:56 +01:00
Michael Hackstein
d5e14a95f4
Moved truncate logic from Transaction::Methods to MMFilesCollection. It can do optimizations if close to the DB layer
2017-02-14 13:50:29 +01:00
jsteemann
0909ffe69b
moved helper functions into their own file
2017-02-14 13:44:54 +01:00
jsteemann
8a2e353f3d
move encoding functions into their own file
2017-02-14 12:57:15 +01:00
Michael Hackstein
c6830fb999
Moved more internal logic from Logical to Physical collection
2017-02-14 12:38:09 +01:00
jsteemann
80be198a39
moved helper classes into their own file
2017-02-14 12:35:34 +01:00
Jan Christoph Uhde
071d147c5f
move compation locking / figures out of logical collection
2017-02-14 12:34:46 +01:00
Michael Hackstein
6605a01410
Moved lookupDocument form LogicalCollection into MMFilesCollection. It is SE specific.
2017-02-14 11:37:45 +01:00
Michael Hackstein
32bd15d098
Renamed collection->update() to update the properties of a collection to collection->updateProperties(). There is another update() which is used for the stored Documents.
2017-02-14 10:32:24 +01:00
Michael Hackstein
c8757efc8e
Moved engine specific logic of Document Remove from Logical To Physical Collection
2017-02-14 10:20:32 +01:00
Michael Hackstein
2824c349bb
Moved EngineSpecific logic of update() from LogicalCollection to MMFilesCollection.
2017-02-13 17:45:33 +01:00
Michael Hackstein
c42b358987
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-02-13 16:27:41 +01:00
Michael Hackstein
91a0d30122
Moved the engine specific parts of remove from LogicalCollection to Physical Collection.
2017-02-13 16:17:26 +01:00
jsteemann
0e5cd5ea1d
fix compile errors
2017-02-13 15:42:35 +01:00
jsteemann
383b534f5d
fix compile errors
2017-02-13 15:42:02 +01:00
jsteemann
1ce4d4a97e
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-13 15:29:59 +01:00
jsteemann
92f61416ca
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
2017-02-13 15:25:17 +01:00
jsteemann
7e690a0c61
renaming
2017-02-13 15:18:40 +01:00
Michael Hackstein
e0bdc5c122
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-02-13 14:58:54 +01:00
Michael Hackstein
0c30c290c6
Moved parts of LogicalCollection->insert() into the PhysicalCollectioN
2017-02-13 14:38:22 +01:00
jsteemann
eb73dbf960
renaming
2017-02-13 13:30:57 +01:00
Jan Christoph Uhde
27309d1de0
Merge branch 'devel' of github.com:arangodb/arangodb into devel
...
* 'devel' of github.com:arangodb/arangodb: (47 commits)
arangoexport: continue documentation
arangoexport: documentation continued
arangoexport: config for client package
arangoexport: refix xml attribute escaping
arangoexport: Documentation
README_maintainers: mention pythons webserver to view generated documentation
arangoexport: Documentation
arangoexport: start documentation
arangoexport: switch to LOG_TOPIC
arangoexport: xgmml encode attribute values
arangoexport: remove unnecessary xmlns declaration
arangoexport: added stats http, written size
arangoexport: take --xgmml-label-attribute into account
arangoexport: xgmml set label attribute
arangoexport: error msgs improvements, dont create file if collection or graph are 404
added arangoexport to Documentation/CMakeLists
updated ReleaseNotes and added NewFeatures32
arangoexport: added manpage
arangoexport: mention in CHANGELOG
arangoexport: inital work on test
...
2017-02-13 12:59:58 +01:00
jsteemann
f09ec85127
renaming
2017-02-13 12:27:26 +01:00
Jan Christoph Uhde
163b3d45bf
remove fullyCollected and friends from LogicalCollection
2017-02-13 11:47:22 +01:00
jsteemann
8b273b5eaf
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-13 08:37:41 +01:00
Jan Christoph Uhde
929390cee1
move index marker creation to storage engine
...
remove MMFilesLogfileManager from LogicalCollection
fix marker type
2017-02-10 15:14:34 +01:00
jsteemann
103ceec2f5
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-02-10 09:43:23 +01:00
jsteemann
d024a6d00a
remove logging for non-topics
2017-02-10 09:32:50 +01:00
jsteemann
ab21b0b1ff
move functionality into engine
2017-02-09 14:50:41 +01:00
Michael Hackstein
5dfd652d64
Merge branch 'devel' of github.com:arangodb/arangodb into engine-api
2017-02-08 15:57:30 +01:00
Max Neunhoeffer
bde48d524d
Change undocumented behaviour in case of invalid rev in JS document ops.
...
An invalid rev should lead to a 1200 ("conflict") error rather than a
1239 ("illegal document revision") error. This is more intuitive and
in line with the corresponding change in the HTTP API. No tests needed
adjustment.
2017-02-08 10:59:04 +01:00
jsteemann
5bc2a3680c
move some MMFiles-specific things into MMFiles directory
2017-02-07 16:38:04 +01:00