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

2581 Commits

Author SHA1 Message Date
jsteemann cf5d20ddee Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-28 17:02:42 +01:00
jsteemann b6a265068a fix velocypack-over-HTTP responses 2017-02-28 17:01:59 +01:00
jsteemann fd516e1e1b give up waiting for V8 context after some time 2017-02-27 23:08:49 +01:00
jsteemann e37e94adbe Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 14:38:35 +01:00
jsteemann 666b2f8da9 renaming 2017-02-27 14:38:27 +01:00
Michael Hackstein ae14ae99a5 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-27 13:01:12 +01:00
Michael Hackstein a884ee2bfb Intermediate commit. Moved many toVPack functions of LogicalCollection to a unified vpack + ignore-keys alternative. This commit is used to run all tests everywhere. May be red 2017-02-27 13:01:07 +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
Michael Hackstein c8f03d16e3 updateProperties now returns an CollectionResult container with errorMessage and code. Moved error reporting logic for cluster-case into this function. 2017-02-24 17:00:41 +01:00
Michael Hackstein b6943d233b Fixed v8-collection properties cluster-variant. In some cases it did not contain correct information 2017-02-23 16:46:21 +01:00
Michael Hackstein 076198106d Now also the cluster variant of collection properties uses the shared toVPackVariant 2017-02-23 16:40:33 +01:00
Michael Hackstein cc78b0131f v8-collection-properties now reuses propertiesVPack on logical collection (SingleServerCase) 2017-02-23 15:31:13 +01:00
jsteemann dc72ec3ee7 fixed a race when dropping databases 2017-02-23 15:22:50 +01:00
Michael Hackstein de31c68539 Moved isVolatile into MMfiles collection. 2017-02-23 14:56:54 +01:00
Michael Hackstein 853394da79 Moved keyGenerator into physicalCollection. Only used when actually storing data. 2017-02-23 11:10:58 +01:00
jsteemann 70c55f1edf naming conventions 2017-02-23 10:15:18 +01:00
Michael Hackstein df59411710 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-22 14:43:10 +01:00
Jan Christoph Uhde 3a201b4362 add persistProperties() to PysicalCollection 2017-02-22 12:47:03 +01:00
Michael Hackstein a359424af0 Moved logic of write Marker out of the dropIndex API from Logical collection. Can be derived from the engine internally. 2017-02-22 12:32:54 +01:00
Jan Christoph Uhde e9555e4b10 remove rotateJournals from LogicalCollection 2017-02-21 11:06:53 +01:00
Jan Christoph Uhde 071137adf6 move doCompact into PhysicalColletion 2017-02-20 10:53:11 +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
Jan Christoph Uhde 2d5e74f7f6 move journaize() to PhysicalCollection 
MMFilesCollection ctor might be buggy
 2017-02-17 20:06:47 +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 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
jsteemann d49c5c3fc0 simplified internal APIs a bit 2017-02-15 12:42:07 +01:00
Jan Christoph Uhde be89cac445 move path from logical to physical 2017-02-15 11:43:38 +01:00
jsteemann 0909ffe69b moved helper functions into their own file 2017-02-14 13:44:54 +01:00
jsteemann 80be198a39 moved helper classes into their own file 2017-02-14 12:35:34 +01:00
jsteemann 8e912ef4dc Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-14 12:08:16 +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
jsteemann 5ebeb5f144 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 16:29:40 +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
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 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
jsteemann 16bd3b0356 fix V8 job dispatching in case another job is cancelled 2017-02-10 14:23:34 +01:00
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +01:00
Michael Hackstein 5dfd652d64 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-08 15:57:30 +01:00
Michael Hackstein 7cec7a4628 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-08 12:54:26 +01:00
Michael Hackstein d47298d518 Removed JS_NEAR, JS_FULLTEXT, JS_WITHIN entirely. They have been replaced by simple queries 2017-02-08 12:54:10 +01:00
jsteemann 87d775f41f decode suffixes! 2017-02-08 12:27:45 +01:00