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

561 Commits

Author SHA1 Message Date
Jan Christoph Uhde c64ebd6660 fix missing return in control path 2016-08-25 10:36:12 +02:00
Jan Christoph Uhde c67f45a9ce fix adding to array (without keys:) 2016-08-24 16:31:08 +02:00
Jan Christoph Uhde ca433a92fd VPP Header is now and Array instead of Object 2016-08-24 15:51:44 +02:00
Jan Christoph Uhde f9feb14a6e Revert "Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream" 
This reverts commit 76679e1636, reversing
changes made to 5be5030983.

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-24 15:26:49 +02:00
Jan Christoph Uhde e0d914fcc1 Revert "add options to Slice::get and use them for VPackHeader" 
This reverts commit b2f99adaaa.
 2016-08-24 15:11:22 +02:00
Jan Christoph Uhde 76679e1636 Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream 
* obi-velocystream-attribute-translator:
  add options to Slice::get and use them for VPackHeader
  add translator to VelocyPackHelper and headerOption to Vpp Protocol

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
	lib/Rest/CommonDefines.h
 2016-08-24 09:18:35 +02:00
Jan Christoph Uhde 0184399ba7 clean up - remove enumToEnum magic 2016-08-23 15:58:50 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde a6f5fc97de finish ProtocolVersion, ProtocolType and ConnectionType 2016-08-23 15:36:36 +02:00
Jan Christoph Uhde 4873a9be71 finish ContentType enum 2016-08-23 15:02:55 +02:00
Jan Christoph Uhde 140b8dc802 preapre move of ContentTypes 2016-08-23 14:55:34 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
Jan Christoph Uhde ed60eca896 prepare replacement of request types 2016-08-23 14:31:22 +02:00
Jan Christoph Uhde b2f99adaaa add options to Slice::get and use them for VPackHeader 2016-08-23 13:44:10 +02:00
Jan Christoph Uhde 8f5e6f65d6 add translator to VelocyPackHelper and headerOption to Vpp Protocol 2016-08-23 13:05:50 +02:00
Jan Christoph Uhde 86f887db92 even more error messages 2016-08-23 09:33:03 +02:00
Jan Christoph Uhde e2d41278af slightly better error messages 2016-08-22 09:18:35 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +02:00
Jan Christoph Uhde e1e7e2da0b Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge 
* origin/engine-vs-velocystream: (91 commits)
  removed useless include
  removed JsonParser
  removed JsonHelper
  Fixed another failed nullptr handling in LogicalCollection cluster case.
  Fixed undefined behaviour in rest error creation
  Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode
  agency startup changed to bootstrapping
  Mention howto control core files on linux.
  shutdown fixed
  Removed create / drop system collection from Cluster test. This is forbidden now
  The logical colleciton now knows it's journalSize
  Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again.
  pushing corrected unittest script and cluster startup scripts
  adjusting startup scripts
  missing source file added
  we have a bootstrapping agency
  votes are processed correctly again
  Add module.context.createDocumentationRouter
  Don't implicitely build the windows packages.
  remove debug print
  ...

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	arangod/GeneralServer/VppCommTask.h
	arangod/RestHandler/RestBaseHandler.cpp
	lib/Rest/VppRequest.h
 2016-08-19 14:35:05 +02:00
Jan Christoph Uhde 5a236bbade fix number of payloads 2016-08-19 13:52:46 +02:00
Michael Hackstein 96f11c7e9f Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-19 12:26:07 +02:00
jsteemann 6580131731 Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-19 12:19:05 +02:00
jsteemann c5f151da5c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 11:01:15 +02:00
Jan Christoph Uhde 61cb8f561f Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream 
* origin/obi-velocystream-frank:
  fixed ownership of handler

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-19 09:58:27 +02:00
Jan Christoph Uhde 9ba13e757c prepare response for multiple velocypacks 2016-08-19 09:38:35 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
Wilfried Goesgens dadd9833d1 Implement detection whether we are in a git repo and use the toplevel source dir. 2016-08-18 17:53:47 +02:00
Michael Hackstein 54fa504cc2 Fixed compile warning 2016-08-18 12:38:58 +02:00
Jan Christoph Uhde 4d80deebbf Merge remote-tracking branch 'origin/obi-velocystream' into obi-velocystream-test 
* origin/obi-velocystream:
  must lower case header keys
 2016-08-18 11:45:04 +02:00
Jan Christoph Uhde e5794ac583 enable handling of multiple vpacks in a message 2016-08-18 11:44:03 +02:00
jsteemann ca60690b66 must lower case header keys 2016-08-18 09:01:16 +02:00
Jan Christoph Uhde 3fb68c632d handleSimpleError now respects messageId 2016-08-17 13:22:31 +02:00
Jan Christoph Uhde 21a9f64538 remove: _request from CommTask and contentType from setPayload() 2016-08-17 09:29:23 +02:00
Jan Christoph Uhde dfb9e3ae0c Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream 
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (71 commits)
  jslint
  finally fixed some nasty bugs after refactoring
  jslint
  Update README.md
  execute ternary operator in C++ as well
  added libs
  added libs
  added build
  upgraded to boost 1.61.0
  Tweak Aardvark's SUPPORT > Documentation tab
  Docs: Data model -> Data models, note that NOT_NULL() is equal to SQL's COALESCE()
  Correct HTTP docs about user parameters
  generated files
  Fix testing
  Proper roles of servers
  Streamline agency testing
  Fix if
  Fix testing
  Improve clusterawareness in foxx and foxx queues
  Add test because of keysorting bugfix
  ...
 2016-08-15 15:18:54 +02:00
Jan Christoph Uhde 21144a37c4 try to fix simple route 2016-08-15 12:51:28 +02:00
Jan Christoph Uhde 61e384e8f2 Merge remote-tracking branch 'origin/engine-vs-velocystream' into merge_jans 
* origin/engine-vs-velocystream: (54 commits)
  Fix testing
  Proper roles of servers
  Streamline agency testing
  Fix if
  Fix testing
  Improve clusterawareness in foxx and foxx queues
  Add test because of keysorting bugfix
  Couldn't query two different keys beginning with the same string in one level
  Add download and slack buttons to documentation header
  gv
  Adjustment for Repository Version
  Adjustment for Repository Version
  Adjustment for Repository Version
  Update build-repository.h.in
  improved gv
  Create build-repository.h.in
  queryView bugfix
  grunt build
  improved gv, added limit
  improved gv
  ...
 2016-08-15 08:51:38 +02:00
Jan Christoph Uhde e62b4f69d6 add better logging and clean up code 2016-08-12 15:05:03 +02:00
Jan Christoph Uhde 3d4e1f6922 clean up code 2016-08-11 16:44:12 +02:00
Jan Christoph Uhde a1d6909f88 make use of generateBody in payload and fix some bugs in VppCommTask 2016-08-11 13:20:58 +02:00
Michael Hackstein 7b328d39e9 Merge branch 'devel' of github.com:arangodb/arangodb into engine-vs-velocystream 2016-08-11 12:41:08 +02:00
Jan Christoph Uhde b3fab8c618 fix header 2016-08-11 09:03:34 +02:00
Jan Christoph Uhde da0c40cff7 server should now reply 2016-08-10 11:11:26 +02:00
Jan Christoph Uhde 8f6ff64d00 fix errors in vpp protocol 2016-08-09 19:09:24 +02:00
servusoft 7315777bc2 Adjustment for Repository Version 2016-08-09 14:05:34 +02:00
servusoft 1a13206b65 Adjustment for Repository Version 2016-08-09 14:00:03 +02:00
Jan Christoph Uhde 0e5b455159 setPayload of response now takes contType instead of request 2016-08-08 14:48:56 +02:00
Jan Christoph Uhde 655e45a19a rename functions to be compliant with coding conventions 2016-08-05 18:20:10 +02:00
Jan Christoph Uhde ed0fc2e83d do not overwrite CUSTOM ContentType 2016-08-05 12:32:45 +02:00
Jan Christoph Uhde 65e5d4e6ac fix handling of content type 2016-08-05 12:25:29 +02:00
Jan Christoph Uhde 50fe64d6ca convert contentTypes 2016-08-04 16:42:30 +02:00