1
0
Fork 0
Commit Graph

4417 Commits

Author SHA1 Message Date
Wilfried Goesgens 1de83c020d fix windows compile problems. 2016-08-26 14:17:28 +02:00
Jan Christoph Uhde b30c3f8e85 Merge branch 'obi-velocystream' into obi-velocystream-agent
* obi-velocystream:
  fix CMake so it finds the PythonInterpreter even with oder versions
  added unload() functionality for indexes (untested)
  Adding Foxx access to agenc
2016-08-26 14:09:38 +02:00
jsteemann a31fe62c34 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 14:02:27 +02:00
jsteemann 22b1b7b7e7 added unload() functionality for indexes (untested) 2016-08-26 14:00:03 +02:00
jsteemann 4b53310189 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 13:42:40 +02:00
Kaveh Vahedipour b409a1ff25 Adding Foxx access to agenc 2016-08-26 13:35:39 +02:00
Jan Christoph Uhde c2e2ff6744 Merge branch 'obi-velocystream' into obi-velocystream-agent
* obi-velocystream:
  undo simrans change - building on linux works again
  added assertions to prevent buffer overruns
  moved _compactionLock out of TRI_collection_t
  cmake: don't allow Python 3 interpreter (gyp only works with Python 2)
  updated CHANGELOG
  throw OOM error in case no buffer can be allocated
  add note about potential performance issues
2016-08-26 13:16:14 +02:00
Michael Hackstein 0985e7fc88 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 12:52:41 +02:00
Wilfried Goesgens 3d6810ecfe If we have relative paths that are working, make them absolute so they still work after CWD's of arangod 2016-08-26 12:50:48 +02:00
jsteemann 8a6d054642 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 12:37:07 +02:00
Michael Hackstein 1c883a811c Potential fix for unload->load. Needs to be validated. 2016-08-26 12:35:33 +02:00
jsteemann 08f1fa3a22 added assertions to prevent buffer overruns 2016-08-26 12:04:28 +02:00
Jan Christoph Uhde 221b35267c Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-agent
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (29 commits)
  removed define that was used only once
  fix dumping of VPackSlices without CustomTypeHandler
  remove includes
  add no-throttling hint for compactor, too
  remove function pointers from TRI_datafile_t, added constructor and destructor
  moved functionality into engine
  fixed tests
  finalize classes
  fix agency shutdown
  cppcheck
  cppcheck
  fix agency shutdown
  removed unused file
  more diagnostic output
  issue #2006: added more diagnostic output for some replication errors
  allow dropping system collections in some rare cases
  updated CHANGELOG
  fixed issue #2012
  explain why we fail to fetch the git revision.
  Cleanup cmake process so it doesn't barf on problems to detect the git version.
  ...
2016-08-26 11:47:23 +02:00
jsteemann 9ae2cb36e9 fix dumping of VPackSlices without CustomTypeHandler 2016-08-26 10:51:54 +02:00
Michael Hackstein b01a7ac0d5 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 08:02:54 +02:00
Wilfried Goesgens d37c9a751f fix syntax :-( 2016-08-25 17:50:08 +02:00
Wilfried Goesgens f39ec1c591 Windows install: no backslash strings in cmake. 2016-08-25 17:35:29 +02:00
Michael Hackstein 7d6402b15c Fixed soem crashes and undefined behaviuor. Server does not crash during tests, however a lot of them are still red 2016-08-25 14:51:03 +02:00
jsteemann 4020d8f2e9 finalize classes 2016-08-25 14:25:17 +02:00
jsteemann 85db0a062a removed unused file 2016-08-25 14:03:54 +02:00
Jan Christoph Uhde 2ba4901b86 fist changes to get request agents working 2016-08-25 13:28:19 +02:00
Michael Hackstein e1ac5175b1 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-25 11:09:11 +02:00
Michael Hackstein 1f3dabc8e1 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-25 11:08:39 +02:00
jsteemann 22d3a1eb9a Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 10:41:09 +02:00
jsteemann f4aa60ed0d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 10:38:26 +02:00
Jan Christoph Uhde c64ebd6660 fix missing return in control path 2016-08-25 10:36:12 +02:00
Wilfried Goesgens 4939e02fb2 Make the existance of the database directory non-mandatory again. 2016-08-25 10:07:37 +02:00
Michael Hackstein 2af30f056d Moved index creation to use LogicalCollection instead of TRI_collection_t. Involved changes of the constructor, all can now be created using iid and Slice. Removed specialized functions to create/find indixes in v8-voc index. Also the iteration is modified. This commit compiles but tests will fail. Merge commit. 2016-08-25 09:57:36 +02:00
Jan Christoph Uhde dbe3caa46f Merge branch 'obi-velocystream' into engine-vs-velocystream
* obi-velocystream:
  fix adding to array (without keys:)
  fix header access
  VPP Header is now and Array instead of Object
2016-08-25 08:51:44 +02:00
jsteemann 1dab450622 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:35:10 +02:00
jsteemann 07055384b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:34:59 +02:00
jsteemann 04f5fbbdb2 fixed issue #2018 2016-08-24 17:33:49 +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
Wilfried Goesgens 1688655509 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-24 14:46:48 +02:00
Wilfried Goesgens 1f162ac882 Implement scheme to more clever pass the directories from the build process to the run-time
We will now try to evaluate the toplevel install directory from the configured binary dir.
We will use this toplever directory when searching for other directories.
2016-08-24 14:45:08 +02:00
Jan Christoph Uhde df0d080512 Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream
* origin/engine-vs-velocystream:
  fix compile errors after merge
  fix collector inactivity in shutdown
  grunt
  Attempt not to bypass error handling so we hopefully get some more information on issue #2011
  updated agency pool
  fixed wrong default values for _sslOptions
  validate default value for DiscreteValuesParameter
  Coorect agency path (no more / duplicates)
  Better shutdown handling
  change build output name once more.
  I love you too, Richard.
  Add uname -o to the filename to make shure build pipelines pick the right ones.
  weekend edition
  gv improvements
2016-08-24 14:18:10 +02:00
jsteemann f92815b09b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-24 09:38:06 +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 5be5030983 Merge branch 'obi-velocystream-enums' into engine-vs-velocystream
* obi-velocystream-enums:
  clean up - remove enumToEnum magic
  finish ResponseCode enum
  finish  ProtocolVersion, ProtocolType and ConnectionType
  finish ContentType enum
  preapre move of ContentTypes
  finish RequestType enum
  prepare replacement of request types
  even more error messages
  slightly better error messages
  better exceptions form event loop
  mark len constexpr

Conflicts:
	arangod/Agency/Inception.cpp
2016-08-23 16:01:58 +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
jsteemann 85cb227a4f fixed wrong default values for _sslOptions 2016-08-23 14:34:05 +02:00
jsteemann 50ced553b8 validate default value for DiscreteValuesParameter 2016-08-23 14:33:48 +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
jsteemann 5f06a5c025 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-23 12:13:08 +02:00
Jan Christoph Uhde 86f887db92 even more error messages 2016-08-23 09:33:03 +02:00
Jan Steemann 5dd8c8feee throw exception in StringBuffer ctor when no memory is available 2016-08-22 17:36:12 +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 635641d4e5 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into engine-vs-velocystream 2016-08-19 13:15:48 +02:00
jsteemann f6ca78f9e7 removed JsonParser 2016-08-19 12:39:26 +02:00
Frank Celler d17f42379b fix errors during shutdown 2016-08-19 12:27:01 +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 e9866698aa removed JsonHelper 2016-08-19 12:24:12 +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 3a9867f86d merge with frank 2016-08-19 10:00:43 +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
Kaveh Vahedipour d8cb8a33ac pushing corrected unittest script and cluster startup scripts 2016-08-19 09:49:44 +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
jsteemann d7b2141da0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 16:22:00 +02:00
Wilfried Goesgens 7250db8830 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-18 15:59:12 +02:00
Wilfried Goesgens 976b25b745 We nowadays install to /usr/share/arangodb3/ 2016-08-18 15:57:33 +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 2c47d442df Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-18 11:31:06 +02:00
jsteemann b2cb551685 moved functionality from vocbase into DatabaseFeature 2016-08-18 09:24:26 +02:00
jsteemann ca60690b66 must lower case header keys 2016-08-18 09:01:16 +02:00
jsteemann 0ec5ae6c59 signal under the lock 2016-08-17 17:06:51 +02:00
Jan Christoph Uhde 34c0aa3540 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-test
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (30 commits)
  potentially fix thread pool shutdown issues
  Remove the boost documentation. The wintendo can't stand long filenames in 2016
  move CleanupThread into engine
  Revert "Disable testcases for now, it triggers the crash on windows."
  slightly improve execution logic
  grunt build
  improved gv
  removed obsolete defines
  assert a certain size
  removed unused version attribute
  removed unused method
  removed unused attributes
  removed unused enum
  privatized
  Revert "Remove iconv-lite"
  privatize some compaction infos
  changed index detection
  removed unused files
  privatize method
  privatized method
  ...
2016-08-17 13:25:37 +02:00
Jan Christoph Uhde 3fb68c632d handleSimpleError now respects messageId 2016-08-17 13:22:31 +02:00
jsteemann 1b5ff51d05 potentially fix thread pool shutdown issues 2016-08-17 11:30:27 +02:00
jsteemann 84656f776b move CleanupThread into engine 2016-08-17 10:48:17 +02:00
Jan Christoph Uhde 21a9f64538 remove: _request from CommTask and contentType from setPayload() 2016-08-17 09:29:23 +02:00
jsteemann 2ab782aeb2 removed obsolete defines 2016-08-16 17:51:33 +02:00
jsteemann d5af72f47f fix typo in method name 2016-08-16 13:11:39 +02:00
Jan Christoph Uhde d8d6fb1ed0 Merge branch 'obi-velocystream' into engine-vs-velocystream
* obi-velocystream:
  fix buffer clean up
  avoid bug that occurred during buffer resize by allocating up front
  i fix type of execepton so it gets caught
  avoid dumper exception
  failed try to resolve externals
  add sanitizeExternalsChecked function
  added handleSimpleError for database not found
  fix build issue
  silence complier warnings
  fix: now returns object instead of string
  try to fix simple route
2016-08-16 11:12:23 +02:00
Jan Christoph Uhde 1d1e19678d failed try to resolve externals 2016-08-15 22:58:21 +02:00
Jan Christoph Uhde df3d83ae9e add sanitizeExternalsChecked function 2016-08-15 22:21:02 +02:00
jsteemann 1ec14d0bba privatize attributes 2016-08-15 15:47:39 +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
jsteemann e9cabbecb7 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache 2016-08-15 14:26:50 +02:00
jsteemann ae40ea5450 finally fixed some nasty bugs after refactoring 2016-08-15 14:26:09 +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
servusoft 3b5c9a73d5 Update build-repository.h.in 2016-08-09 13:39:46 +02:00
servusoft 48da84a323 Create build-repository.h.in
Adjustment for Repository Version
2016-08-09 13:23:59 +02:00
Jan Christoph Uhde 0e5b455159 setPayload of response now takes contType instead of request 2016-08-08 14:48:56 +02:00
Wilfried Goesgens 2f3c03f126 Simplify 2016-08-08 10:16:34 +02:00
Wilfried Goesgens cfcacc2b06 Merge pull request #1984 from servusoft/patch-8
Adaptation heap memory for ARM architecture (over global TRI_V8_MAXHEAP)
2016-08-08 10:15:44 +02:00
servusoft cfe65305ad Adaptation minimum memory for ARM architecture (over global TRI_V8_MAXHEAP) 2016-08-05 18:54:34 +02:00
servusoft 4a1eb6c8da Global definition heap memory (TRI_V8_MAXHEAP) and adoptation for ARM 2016-08-05 18:50:53 +02:00
Jan Christoph Uhde 655e45a19a rename functions to be compliant with coding conventions 2016-08-05 18:20:10 +02:00
jsteemann 0ceccf6370 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-05 16:23:30 +02:00
Jan Steemann 0de5561659 moved mostly unused functions 2016-08-05 16:14:39 +02:00
Jan Steemann e69e49f145 fix Buffer array access 2016-08-05 14:50:06 +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 f96a478878 adds enum_to_enum conversion 2016-08-05 12:24:29 +02:00
Jan Christoph Uhde 0bcbe92433 Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream
* origin/engine-vs-velocystream: (95 commits)
  move it a class method
  speed up compaction and cleanup a bit
  privatization
  added functions V8_TO_VPACK and VPACK_TO_V8
  fixed compaction bug
  fixed compaction bug
  raft testing revealed performance optimisation in receiver and of appendentries
  more streamlining, links to the UDF documentation.
  refactoring
  By simran: review UDF documentation.
  Explain clustering impacts in the optimizer chapter.
  fixed tests
  WG beautification
  Remove iconv-lite
  Add iconv-lite and timezone
  Add missing package description file.
  compaction bug in agency
  compaction bug in agency
  compaction bug in agency
  fixed compaction bug
  ...
2016-08-04 18:48:51 +02:00
jsteemann 1139505641 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-04 17:19:05 +02:00
jsteemann 95ac01313b privatization 2016-08-04 17:06:51 +02:00
Jan Christoph Uhde 50fe64d6ca convert contentTypes 2016-08-04 16:42:30 +02:00
jsteemann 752015ddb2 added functions V8_TO_VPACK and VPACK_TO_V8 2016-08-04 16:02:46 +02:00
Jan Christoph Uhde 3c4db6783c update test 2016-08-04 15:02:04 +02:00
Jan Christoph Uhde 01c1c09d5a add first vpack test -- content type has to be fixed first 2016-08-04 13:32:25 +02:00
Jan Christoph Uhde 54eda61754 connect response to CommTask WriteBuffers 2016-08-03 16:08:04 +02:00
Jan Christoph Uhde cb275e239f add: clean buffer for VppCommTask 2016-08-03 09:20:22 +02:00
jsteemann f219a5605b Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-02 15:00:57 +02:00
Jan Christoph Uhde 53b08d018b Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (34 commits)
  some fixes
  integrated agency bugfix from 3.0
  integrated agency bugfix from 3.0
  Add tokens so we can enable the uid during the build.
  Add missing body parameter descriptin. Thanks to @janavolkova9 for pointing this out.
  Fix the representation of the post bodys; thanks to @janavolkova9 for pointing out.
  just in case someone changes the epoch
  added a panic interrupt of memory gets low
  fixed epoch computation
  Fix switch warning
  entirely removed TRI_document_collection_t
  Fix a bug in <coll>.replace() with isRestore and _rev.
  refactoring
  Style cleanup for the docker mesos cluster.
  BOLD
  Polish docs
  Fix foxx issues in cluster
  Add technical details about UDFs in clusters
  moved functionality into TRI_collection_t
  Fix bug in synchronous replication.
  ...
2016-08-02 13:50:44 +02:00
Jan Christoph Uhde 05b8995bbf update VppRequest 2016-08-02 13:45:49 +02:00
jsteemann f44effd225 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-02 12:59:06 +02:00
Jan Steemann 8e591c16c2 fixed random number generator initialization 2016-08-02 12:25:46 +02:00
jsteemann 5cdbfc423d Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-02 11:57:37 +02:00
Jan Steemann 2870a9f10f visual studio 2016-08-02 11:46:44 +02:00
Jan Christoph Uhde 25226b1459 add: header() / headers() implemented for VppRequest 2016-08-02 11:36:06 +02:00
jsteemann 99aaf7de9b Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-02 08:43:34 +02:00
jsteemann 788922f55a some fixes 2016-08-01 17:16:23 +02:00
jsteemann 3c8f644c2d fix cluster communication 2016-08-01 17:13:00 +02:00
Jan Christoph Uhde c59a553723 fix some errors -- http tests failing in cluster 2016-08-01 15:19:11 +02:00
Frank Celler 4d81c4c733 just in case someone changes the epoch 2016-08-01 13:43:30 +02:00
Frank Celler da85dc2adc added a panic interrupt of memory gets low 2016-08-01 13:43:30 +02:00
Frank Celler af6cbe272a fixed epoch computation 2016-08-01 13:43:30 +02:00
Jan Christoph Uhde 29a87ef109 fix move 2016-08-01 12:37:01 +02:00
Jan Christoph Uhde ef12d8dc2c struggle with ctor 2016-08-01 11:48:30 +02:00
jsteemann 71bd7deace Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-01 09:04:17 +02:00
Frank Celler a078a4fd70 just in case someone changes the epoch 2016-07-31 18:56:14 +02:00
Frank Celler 51683dbda0 added a panic interrupt of memory gets low 2016-07-31 12:58:27 +02:00
Frank Celler 792f42d5af fixed epoch computation 2016-07-31 11:27:59 +02:00
jsteemann ebaabdb076 Merge branch 'obi-velocystream-4' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-07-28 16:11:26 +02:00
jsteemann cc5eaea09c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-28 09:10:17 +02:00
Frank Celler 24db83573a added thread affinity for MacOSX 2016-07-27 22:29:59 +02:00
jsteemann 55eda66d4a Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-27 15:57:56 +02:00
jsteemann 10a60b5458 refactoring 2016-07-27 15:40:25 +02:00
Jan Christoph Uhde 36167b8e17 Merge remote-tracking branch 'origin/devel' into obi-velocystream-4
* origin/devel: (23 commits)
  Fix trusted origin tests
  Fix CORS with credentials
  New version of script.
  updated CHANGELOG
  grunt build [ci skip]
  improved gv
  added expand function to gv
  enable: compile_commands.json
  semistandard fix
  improved gv
  gv bugfix
  updated license
  improved gv
  Adapting to 64 bit ARM architecture (aarch64) at the exceptions for TRI_PADDING_32
  improved gv performance
  fix handling of empty query strings
  fixed query editor issues
  Modularize perf script.
  Add one more event.
  Add a first perf probe monitoring script.
  ...

Conflicts:
	arangod/GeneralServer/HttpCommTask.cpp
2016-07-27 13:25:34 +02:00
jsteemann 26ce0c6936 some collection handling refactoring 2016-07-27 13:12:26 +02:00
Jan Christoph Uhde 732c182388 fix building 2016-07-27 12:08:07 +02:00
Jan Christoph Uhde 9965ca9c6a Merge branch 'obi-velocystream-2' into obi-velocystream-3
* obi-velocystream-2: (21 commits)
  enable VPACK
  add some documentation
  add some documenation
  get rid fo cookies in non-http requests
  Documentation improvements
  Docs: Fix locking and isolation code examples (require db object and use AQL traversal)
  fix recovery edge case
  grunt build [ci skip]
  added edge hover event
  redirect to new gv
  ui added query execution of selected text
  gv improvements
  removed unused code path
  added convenience method getRegister()
  remove body() method from GeneralRequest
  Removing unnecessary library "z" by cross-compiling
  Adaptation of V8 architecture "arm64" with "aarch64" processor.
  Complete to __aarch64__ achritectur
  add: VppResponse
  cppcheck
  ...

Conflicts:
	arangod/GeneralServer/GeneralCommTask.cpp
	arangod/GeneralServer/GeneralCommTask.h
	arangod/GeneralServer/HttpCommTask.h
2016-07-27 10:11:50 +02:00
Jan Christoph Uhde 59ec4bf83b enable VPACK 2016-07-27 09:12:28 +02:00
Frank Celler e008a3b306 moved accessControlAllowOrigins to GeneralServerFeature 2016-07-27 09:09:07 +02:00
servusoft 44c9fb824e Adapting to 64 bit ARM architecture (aarch64) at the exceptions for TRI_PADDING_32 2016-07-26 18:56:53 +02:00
Frank Celler 078457c302 cleanup of calls 2016-07-26 17:20:14 +02:00
Jan Christoph Uhde 4c37db381a get rid fo cookies in non-http requests 2016-07-26 10:38:34 +02:00
jsteemann b54f0a15d8 removed last occurrence of TRI_vector_t in arangod 2016-07-26 08:04:30 +02:00
Jan Christoph Uhde 61323d4ddc Merge branch 'devel' of github.com:arangodb/arangodb into obi-velocystream-2
* 'devel' of github.com:arangodb/arangodb:
  Complete to __aarch64__ achritectur
  cppcheck
  gv improvement + bugfix
  initialize all instance variables
  updated CHANGELOG
  issue #1962
  issue #1959
  fixed exporting documents webui
  set GYP_CROSSCOMPILE by  CROSS_COMPILING
2016-07-25 16:47:50 +02:00
Jan Christoph Uhde da81c32539 remove body() method from GeneralRequest 2016-07-25 16:46:53 +02:00
Jan Christoph Uhde ef6643e8b4 add: VppResponse 2016-07-25 16:06:33 +02:00
jsteemann a0f0055b6f moved all database management functions into DatabaseFeature 2016-07-25 15:48:37 +02:00
Jan Christoph Uhde 0e25dca075 add: VppRequest 2016-07-25 14:22:25 +02:00
jsteemann 934194fb44 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 11:58:22 +02:00
Jan Steemann ee8a8e2504 issue #1962 2016-07-25 11:37:29 +02:00
jsteemann 431262cc19 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-21 16:42:47 +02:00
Jan Christoph Uhde 5edaf0043a preparations for velocystream completed 2016-07-21 09:32:00 +02:00
Max Neunhoeffer 6f4b48cfcf Try to fix performance issue with single documents in cluster.
This creates a fast path in performRequests for the case that only
one request is given. We use syncRequest instead of asyncRequest
to save a network roundtrip. Furthermore, all queues and locks
in ClusterComm are circumvented.
2016-07-20 15:15:41 -07:00
jsteemann 2b4c3707e3 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-20 13:22:29 +02:00
Jan Christoph Uhde 6f39b389c3 fix: initialize variables in Base class 2016-07-20 09:10:16 +00:00
Jan Christoph Uhde 1804fa63fc Merge branch 'devel' into obi-rest-changes
* devel:
  remove unused JsonHelper includes
  Swagger: change the way attribute types are written into the docs
  Docs: formatting
  Docs: AQL query cursors
  New example files for array indexes
  Documentation improvements
  Enhance description of bind parameters
  How to use log topics in config file and minor reformatting
  Improve indexing docs
  Match inline docublocks non-greedy and prevent name collisions by expecting a whitespace character after block name
  always flush log in case of exception
  New example file.
  by @servusoft : fix rocksdb cmake compile on ARM by removing unsupported compiler flag.
  by @servusoft : use signed char if we want to operate with `-1`
  issue #1944: nicer error logging in console.log()
  remove unused script
  eshint
  added test for V8 segfault
  fixed segfault in V8, by backporting https://bugs.chromium.org/p/v8/issues/detail?id=5033
2016-07-19 10:27:53 +02:00
Jan Christoph Uhde 06bd01695a removed: body() from GeneralRequest 2016-07-19 09:16:07 +02:00
jsteemann 5ee344b685 added greetings feature 2016-07-18 18:32:27 +02:00
jsteemann 7653b922b3 moved TRI_MSync out of server.h 2016-07-18 17:58:28 +02:00
jsteemann 14d6ba7c73 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-18 14:37:33 +02:00
jsteemann 807f287868 moved server id detection and pagesize detection into their own features 2016-07-18 14:37:12 +02:00
Jan Steemann a0ff5e9dc3 remove unused JsonHelper includes 2016-07-18 13:52:08 +02:00
Jan Christoph Uhde 002a1e55cb add: payload/addPayload methods 2016-07-18 13:16:08 +02:00
Wilfried Goesgens 15f1990b57 by @servusoft : use signed char if we want to operate with `-1` 2016-07-18 11:19:43 +02:00
Jan Christoph Uhde 36736e3694 Merge remote-tracking branch 'origin/devel' into obi-rest-changes-next
* origin/devel: (47 commits)
  grunt build [ci skip]
  gv settings [ci skip]
  attempt to fix issue #1943
  Add missing documentation of the users database list and the hint that this should be used instead of the database api.
  added dev button to graphs view [ci skip]
  grunt build [ci skip]
  Remove jshint
  Mention updating license info
  Prevent World War 3
  Always use --global-style when installing npm deps
  gv - editable & createable nodes, edges [ci skip]
  Rebuild aardvark
  Make sure Show Interface check asks for HTML
  oops, @not supported here.
  Fix phrase explaining when the collections are dropped alongside the graph definition.
  fixed issue #1941
  gv [ci skip]
  added test for "fake" _key values
  fixed issue #1942
  In Farbe und in STEREREOOOUU!
  ...
2016-07-17 00:14:07 +02:00
Jan Christoph Uhde beae8a8f74 first changes for set/get payload methods ->
toVelocyPack now returns slices
2016-07-15 16:38:13 +02:00
Jan Christoph Uhde 6e9304cdc4 Merge remote-tracking branch 'origin/devel' into obi-rest-changes
* origin/devel: (43 commits)
  added dev button to graphs view [ci skip]
  grunt build [ci skip]
  Remove jshint
  Mention updating license info
  Prevent World War 3
  Always use --global-style when installing npm deps
  gv - editable & createable nodes, edges [ci skip]
  Rebuild aardvark
  Make sure Show Interface check asks for HTML
  oops, @not supported here.
  Fix phrase explaining when the collections are dropped alongside the graph definition.
  fixed issue #1941
  gv [ci skip]
  added test for "fake" _key values
  fixed issue #1942
  In Farbe und in STEREREOOOUU!
  grunt [ci skip]
  gv [ci skip]
  Fix documentation.
  Fix fix.
  ...
2016-07-15 09:20:04 +00:00
Jan Christoph Uhde 682cf7a2f1 virtualize functions of request/response 2016-07-14 08:40:05 +02:00
Max Neunhoeffer a78fd42b67 Merge branch 'HLC' into devel 2016-07-13 12:52:33 +02:00
Max Neunhoeffer 4202b817ed Fix fix. 2016-07-13 12:22:00 +02:00
Max Neunhoeffer 3df0d2dc32 Fix bug in HybridLogicalClock. 2016-07-13 12:21:17 +02:00
Jan Christoph Uhde 03e89265fd Merge branch 'devel' of github.com:arangodb/arangodb into obi-merge-restserver
* 'devel' of github.com:arangodb/arangodb:
  updated CHANGELOG
  fixed array index batch insertion issue
  Fix syntax errors in  user auth documentation
  fix grammer.
  prevent compile warning
2016-07-13 11:35:16 +02:00
Jan Steemann 6b7defc737 fixed array index batch insertion issue 2016-07-13 11:32:39 +02:00
Jan Christoph Uhde ff49d7b0b4 Merge remote-tracking branch 'origin/devel' into obi-merge-restserver-next
* origin/devel: (105 commits)
  Fixed failure tests in SkiplistIndex
  Fixed a bug with reset of new skiplist index iterator
  whitespace removal
  micro optimization for key generator key tracking
  GraphQL! Hype! 🎉
  explicit
  remove unused variable
  explicit
  Fix VS complaints
  complaints
  complaints
  updated CHANGELOG
  fixed issue #1937
  Modified the SkiplistIndex lookup s.t. it does not build one large VPackBuilder containing all combinations of search values, but instead has an option to rewrite it in-place and just has to maintain the intervals.
  ignore revision ids
  fix destructuring of Externals in MERGE
  make it code.
  ignore primary and edge indexes during cluster restore
  grunt build [ci skip]
  semist.
  ...
2016-07-13 07:33:13 +00:00
Max Neunhoeffer 4649036943 Add and read out HLC time stamps in HTTP headers. 2016-07-12 23:36:14 +02:00
Max Neunhoeffer 27fcfecee3 Handle overflow of counter in HLC better. 2016-07-12 23:00:23 +02:00
Max Neunhoeffer 18925faf8f Merge branch 'devel' into HLC 2016-07-12 22:51:40 +02:00
jsteemann 6713ec39dc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 16:49:36 +02:00
Jan Steemann 7a445934b7 Fix VS complaints 2016-07-12 15:39:09 +01:00
jsteemann dcfaee33e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-12 15:57:40 +02:00
Max Neunhoeffer 846e6b6127 Merge remote-tracking branch 'origin/devel' into HLC 2016-07-12 15:10:24 +02:00
Michael Hackstein daeef23761 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-12 14:46:35 +02:00
Michael Hackstein d9e1f41871 Modified the SkiplistIndex lookup s.t. it does not build one large VPackBuilder containing all combinations of search values, but instead has an option to rewrite it in-place and just has to maintain the intervals. 2016-07-12 14:46:24 +02:00
Max Neunhoeffer 17e4c05de5 Change encoding of HLC time stamps, tolerate old ticks in _rev. 2016-07-12 14:01:33 +02:00
jsteemann e03cf68861 ignore revision ids 2016-07-12 13:54:41 +02:00
Wilfried Goesgens 1f356900c3 Fix missing include; thanks to @servusoft for pointing this out. 2016-07-11 15:39:10 +02:00
Jan Steemann 40fd951234 issue #1936 2016-07-11 09:57:30 +02:00
Frank Celler 36a9b7852e Merge branch 'devel' into HLC 2016-07-11 07:03:49 +00:00
Max Neunhoeffer 464d885f65 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-07-08 23:58:21 +02:00
Max Neunhoeffer 2fcbf1e488 Fix a bug in the VPack->V8 conversion.
Happened when a special attribute _key etc. did not contain a string
value, which is allowed below the top level of a document in a
collection.
2016-07-08 23:57:05 +02:00
Jan Steemann 69e037341b fixed my "optimization" 2016-07-08 15:42:27 +02:00
Jan Steemann 1e21fcfdf5 use compare() instead of find() 2016-07-08 12:09:44 +02:00
Max Neunhoeffer a98916d755 Merge branch 'devel' into HLC 2016-07-07 15:23:24 +02:00
Jan Steemann ac567074f3 fixed ifdef 2016-07-07 11:41:45 +02:00
Jan Steemann 44ca89362e fixed issue #1930 2016-07-07 11:14:23 +02:00
jsteemann a7c59c60f3 don't log client tool errors to Windows event log 2016-07-06 12:30:02 +02:00
Max Neunhoeffer 1a04b0112f Fix lastRevision in collection to use revision. 2016-07-06 09:38:20 +02:00
Max Neunhoeffer 3e789c0519 Improve checking of valid revision timestamps. 2016-07-05 22:53:06 +02:00
Max Neunhoeffer bf3a6de760 Fix extractRevision for new revision format. 2016-07-05 21:55:42 +02:00
Max Neunhoeffer 7fe9fcc00e Use hybrid logical clock for _rev entries. 2016-07-05 21:15:32 +02:00
Jan Christoph Uhde 4aa7222d98 Merge remote-tracking branch 'origin/devel' into FHM
* origin/devel:
  Start adding a hybrid logical clock.
  Handle replicationFactor and numberOfShards in arangorestore.
  upgrade script for homebrew
  Fix namespace stuff for VC++
  Use standard GNU install dirs
2016-07-05 08:09:08 +02:00
Max Neunhoeffer bc82322353 Start adding a hybrid logical clock. 2016-07-05 00:28:04 +02:00
Frank Celler a8e29450f4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:13:38 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Michael Hackstein c19df03649 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-04 16:26:08 +02:00
Michael Hackstein d273b387f8 Improved Traversal internal API. It now does less copying and creates less objects. Also it is way simpler to understand. 2016-07-04 16:16:58 +02:00
jsteemann 9593ac122d dont include unused StringBuffer 2016-07-04 15:00:08 +02:00
jsteemann a9c34259cf micro optimizations 2016-06-30 14:54:51 +02:00
Andreas Streichardt e6e7363901 Remove lockfile if we are the same (now stale) pid
fixes docker setups (our pid will always be 1)
2016-06-30 12:14:56 +02:00
jsteemann 4a5b75b485 escape Unicode characters in JSON dumps 2016-06-29 12:53:08 +02:00
jsteemann cc3365f830 add optional Unicode character escaping when dumping VPack to JSON 2016-06-29 01:01:24 +02:00
Jan Steemann 8002607b67 prevent VS warnings 2016-06-28 17:16:48 +02:00
Michael Hackstein 808cb97707 Fixed a bug in SHORTEST_PATH using a distance attribute. In some cases the computed path was not correct. 2016-06-27 16:57:47 +02:00
jsteemann e340b2d710 more index optimizations 2016-06-25 19:34:18 +02:00
jsteemann 8f0991e18e potential performance optimizations
simplifications

small optimizations
2016-06-23 14:47:44 +02:00
Jan Steemann 2525816892 fixed function signature in error reporting 2016-06-22 14:30:33 +02:00
Frank Celler 6b25a02cad fixed typo 2016-06-21 15:50:20 +02:00
Frank Celler 08799da4d0 child should not remove the pid-file 2016-06-21 15:48:00 +02:00
Jan Steemann 8f16458d8a fixed crash in nonce handling 2016-06-21 11:35:34 +02:00
jsteemann 55fce39574 optimizations for neighbors queries 2016-06-20 18:37:46 +02:00
jsteemann a9242cf131 don't ignore function return value 2016-06-20 09:55:44 +02:00
Alan Plum 8a640eb1b5
ERROR_APPLICATION_* -> ERROR_SERVICE_* 2016-06-17 20:02:25 +02:00
Alan Plum 9375d49c8c
Nicer error docs 2016-06-17 20:02:24 +02:00
jsteemann 43574e509e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-17 16:28:04 +02:00
jsteemann 6a8a95252e StringRef extensions 2016-06-17 16:26:46 +02:00
Frank Celler 8635ddad43 do NOT follow symlinks on recursive delete 2016-06-17 10:51:35 +02:00