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

12824 Commits

Author SHA1 Message Date
jsteemann 328ff8a09e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 00:09:42 +01:00
jsteemann 01bf68549d simplifications 2017-02-14 22:48:51 +01:00
Jan Christoph Uhde 586443ca7b Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  updated CHANGELOG
  JWT uses seconds
  Linting
  Clarify session TTL vs cookie TTL
  More cookie options
  fixed missing semicolon
  optimized graph management view
  REALLY fix routing tests
  Really fix routing
  Fix routing
  allow to specify the directory for the windows client build
  Fix Foxx routing
  Define Foxx's expected routing behaviour
  Spring cleaning
  potential fixes for MSVC
 2017-02-14 22:02:20 +01:00
jsteemann bc080ae58f removed unused node type 2017-02-14 16:52:30 +01:00
jsteemann 12b973dc4b fix my compile errors 2017-02-14 16:41:31 +01:00
jsteemann 60e0b03b06 remove unused method 2017-02-14 16:23:07 +01:00
jsteemann 3ba6f1a1f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-14 16:16:01 +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
jsteemann 8c9dd79aeb potential fixes for MSVC 2017-02-14 16:11:18 +01:00
jsteemann 1b5445731b potential fixes for MSVC 2017-02-14 16:01:00 +01:00
Kaveh Vahedipour 37472ddcdc revisited the appendEntries API 2017-02-14 15:18:07 +01:00
Michael Hackstein 50368b9985 Moved CollectionRead/WriteLocker to MMFiles. Also moved cleanupIndexes to MMFilesCollection 2017-02-14 15:12:36 +01:00
Kaveh Vahedipour b6756bad65 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-14 15:08:03 +01:00
Kaveh Vahedipour 05250b6c7b back port of bug fixes in 3.1 2017-02-14 15:07:51 +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
jsteemann be77decb2d remove an unused include 2017-02-14 12:39:50 +01:00
Michael Hackstein c6830fb999 Moved more internal logic from Logical to Physical collection 2017-02-14 12:38:09 +01:00
jsteemann cbe8ee1172 renamed feature 2017-02-14 12:35:54 +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
jsteemann 8e912ef4dc Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-14 12:08:16 +01:00
Michael Hackstein 6605a01410 Moved lookupDocument form LogicalCollection into MMFilesCollection. It is SE specific. 2017-02-14 11:37:45 +01:00
jsteemann 9ede671aa3 pre-reserve array 2017-02-14 11:34:34 +01:00
jsteemann ff956f1696 expose rawSuffix 2017-02-14 11:25:12 +01:00
jsteemann 202bfe1963 Merge branch 'suffix-decoding' of https://github.com/arangodb/arangodb into devel 2017-02-14 11:00:24 +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
jsteemann b666254d4b make constructor explicit 2017-02-14 08:59:05 +01:00
Michael Hackstein 03e77aee4a Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 17:58:56 +01:00
Michael Hackstein 2824c349bb Moved EngineSpecific logic of update() from LogicalCollection to MMFilesCollection. 2017-02-13 17:45:33 +01:00
jsteemann 9efc1c7b61 moved transaction status into its own file 2017-02-13 17:28:02 +01:00
jsteemann 72fa7ac85d move _hasOperations flag into engine 2017-02-13 17:07:49 +01:00
jsteemann 2532627a80 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 16:54:13 +01:00
jsteemann a184697072 move RocksDB-specific transactions into engine 2017-02-13 16:53:58 +01:00
Michael Hackstein ae12fc0133 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 16:37:48 +01:00
jsteemann 5ebeb5f144 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 16:29:40 +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
Kaveh Vahedipour a49fe5ad21 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-13 16:00:43 +01:00
Kaveh Vahedipour 6a5d61c2f1 avoidServers correctly in again 2017-02-13 16:00:30 +01:00
Andreas Streichardt bbd3728b08 Log action errors to the outside only when in MAINTAINER_MODE 
but do always log to the logfile
 2017-02-13 15:53:09 +01:00
Andreas Streichardt bc1c2127e0 No need for forward declaration as include is there anyway (and 
required)
 2017-02-13 15:53:08 +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
Jan Christoph Uhde 0f3e42cf26 Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  Fix unused variables
  don't allow to run against pre-running server - it may fail
  arangoexport: continue documentation
 2017-02-13 15:23:18 +01:00