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

37283 Commits

Author SHA1 Message Date
Jan Christoph Uhde f3a1f128ee remove isFullyCollected from LogicalCollection 2017-02-20 10:28:28 +01:00
jsteemann 8ce7f6558d simplifications 2017-02-20 09:51:40 +01:00
Jan Christoph Uhde 40a1345f76 Merge branch 'engine-api' of github.com:arangodb/arangodb into obi-engine-api 
* 'engine-api' of github.com:arangodb/arangodb:
  Moved logic for drop index into MMFilesCollection
 2017-02-20 09:50:17 +01:00
Michael Hackstein fea2dbad79 Fixed compiler warning in Query.cpp 2017-02-20 09:21:54 +01:00
Michael Hackstein 17effdc065 Moved logic for drop index into MMFilesCollection 2017-02-20 09:06:41 +01:00
jsteemann fd47ba6e99 remove unused linenoise from client tools except arangosh 2017-02-20 08:45:08 +01:00
Simon Grätzer ea905816bd Some reshuffling 2017-02-19 13:50:43 +01:00
Jan Christoph Uhde 21cb8e3217 Merge branch 'engine-api' of github.com:arangodb/arangodb into obi-engine-api 
* 'engine-api' of github.com:arangodb/arangodb:
  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...
  Moved pre-commit document modifications out of logical-collection into the physical collection. They are only relevant when actually writing to disc.
  Moved useSecondaryIndexes check from Logical to MMFiles collection
  Some cleanup in Logical collection imports
  Moved index filling into the MMFiles collection
  changelog
  grunt build
  css
  ui: queries now using cursors api - issue #2065
  remove crosscompile hack - it doesn't work anymore
  updated CHANGELOG
  add changlog entry for stacktrace log messages
  clean up write lockers a bit
  fix too early closing of sockets
  Moved restoreIndex to Physical collection.
  Fix a shell script used during build.
  Lower log level to debug in shutdown message.
  fix spelling
  Moved saveIndex logic into the physical collection
  fix potential deadlock

Conflicts:
	arangod/MMFiles/MMFilesCollection.cpp
	arangod/MMFiles/MMFilesCollection.h
	arangod/VocBase/LogicalCollection.cpp
 2017-02-18 19:10:45 +01:00
Simon Grätzer f9eb868f1a Fixed SCC 2017-02-18 18:14:29 +01:00
jsteemann be8d6b0a9e simplifications 2017-02-17 20:55:52 +01:00
Simon Grätzer e2de2c4354 GRR 2017-02-17 20:24:04 +01:00
Simon Grätzer 8aa2465483 Fix compiler errors 2017-02-17 20:22:52 +01:00
Jan Christoph Uhde 2d5e74f7f6 move journaize() to PhysicalCollection 
MMFilesCollection ctor might be buggy
 2017-02-17 20:06:47 +01:00
Jan Christoph Uhde 5d37c6f8c2 add documentation to CMakeLists.txt 2017-02-17 19:01:46 +01:00
Michael Hackstein 92f52b13d3 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-17 17:29:53 +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
jsteemann ea87cc52b7 simplifications 2017-02-17 17:10:13 +01:00
jsteemann 88db5c4a15 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-17 16:40:19 +01:00
Wilfried Goesgens f38de86b29 remove debug message 2017-02-17 16:16:34 +01:00
Michael Hackstein b84b05244f Moved pre-commit document modifications out of logical-collection into the physical collection. They are only relevant when actually writing to disc. 2017-02-17 16:07:02 +01:00
jsteemann 535eca3ae0 make ctor explicit 2017-02-17 15:56:55 +01:00
jsteemann 10ddb52964 remove unused property 2017-02-17 15:41:45 +01:00
Simon Grätzer ecf8a0559d Fixed HLL counter 2017-02-17 14:47:50 +01:00
jsteemann c652a313da Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-17 14:03:59 +01:00
Michael Hackstein 5366f09ec8 Moved useSecondaryIndexes check from Logical to MMFiles collection 2017-02-17 13:33:00 +01:00
Michael Hackstein a7c8d7644f Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-17 13:16:27 +01:00
Michael Hackstein e396446a17 Some cleanup in Logical collection imports 2017-02-17 13:16:22 +01:00
Michael Hackstein c543dd06a4 Moved index filling into the MMFiles collection 2017-02-17 12:56:54 +01:00
jsteemann 7753adc8b4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-17 12:25:47 +01:00
hkernbach ccece3e518 changelog 2017-02-17 11:27:12 +01:00
hkernbach 0074e8e39b grunt build 2017-02-17 11:24:29 +01:00
hkernbach 399cf4d9c3 css 2017-02-17 11:14:28 +01:00
hkernbach a50f81b1ac ui: queries now using cursors api - issue #2065 2017-02-17 11:14:16 +01:00
Simon Grätzer 18fb10e2f7 Added Effective Closeness 2017-02-17 03:41:51 +01:00
jsteemann 9f4cf4c3f0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-16 21:40:36 +01:00
Wilfried Goesgens d3291a1137 remove crosscompile hack - it doesn't work anymore 2017-02-16 18:13:43 +01:00
Simon Grätzer ddee4c3619 Fixing async mode and LineRank 2017-02-16 16:52:58 +01:00
jsteemann 55c48016e2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-16 16:04:03 +01:00
jsteemann 37721198e7 updated CHANGELOG 2017-02-16 16:03:56 +01:00
Andreas Streichardt d6c45d2961 add changlog entry for stacktrace log messages 2017-02-16 16:03:39 +01:00
jsteemann 3e7432ccd6 clean up write lockers a bit 2017-02-16 15:44:45 +01:00
jsteemann af17235242 fix too early closing of sockets 2017-02-16 15:42:13 +01:00
Michael Hackstein f0fbe78b2d Moved restoreIndex to Physical collection. 2017-02-16 15:01:00 +01:00
Simon Grätzer d263c51f59 Started with DMID 2017-02-16 14:38:04 +01:00
Max Neunhoeffer c37dcd5c5e Fix a shell script used during build. 2017-02-16 13:54:35 +01:00
Max Neunhoeffer e00cf05e08 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-02-16 13:43:14 +01:00
Max Neunhoeffer 38812fa9d2 Lower log level to debug in shutdown message. 2017-02-16 13:40:45 +01:00
Jan Christoph Uhde 6ac5aa9691 fix spelling 2017-02-16 13:39:15 +01:00
Jan Christoph Uhde b34d4356bc remove dead code 2017-02-16 13:14:27 +01:00
Michael Hackstein a3aae2e43b Moved saveIndex logic into the physical collection 2017-02-16 12:53:05 +01:00