1
0
Fork 0
Commit Graph

89 Commits

Author SHA1 Message Date
jsteemann a04934ce50 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 09:25:09 +02:00
jsteemann 9b94287fb7 unify id handling? 2016-08-30 16:07:35 +02:00
Jan Christoph Uhde 3d26df27a0 prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
jsteemann 9ae2cb36e9 fix dumping of VPackSlices without CustomTypeHandler 2016-08-26 10:51:54 +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 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 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 Steemann 5dd8c8feee throw exception in StringBuffer ctor when no memory is available 2016-08-22 17:36:12 +02:00
jsteemann e9866698aa removed JsonHelper 2016-08-19 12:24:12 +02:00
jsteemann d5af72f47f fix typo in method name 2016-08-16 13:11:39 +02:00
Jan Christoph Uhde df3d83ae9e add sanitizeExternalsChecked function 2016-08-15 22:21:02 +02:00
jsteemann 26ce0c6936 some collection handling refactoring 2016-07-27 13:12:26 +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
jsteemann 14c3946303 simplified compare function 2016-05-24 17:56:06 +02:00
jsteemann 0ce8599598 fixes for MSVC 2016-05-10 19:01:21 +02:00
Wilfried Goesgens 14fe556031 Merge branch 'devel' of github.com:arangodb/ArangoDB into dox-cox-pix-ex-rox-box 2016-05-04 17:27:39 +02:00
Michael Hackstein dc49aed09c The Equal function used in Sets and Maps now can optionally be instantiated with Velocypack options. This is required if we want to put complete documents into the container. 2016-05-04 15:40:37 +02:00
jsteemann 495b266c8a initial commit 2016-05-03 15:42:24 +02:00
jsteemann d3604238e4 optimizations 2016-05-02 23:06:04 +02:00
jsteemann fefdd33574 use xxHash for hashing id strings 2016-05-02 15:46:04 +02:00
jsteemann 575e6e38d7 use constant 2016-05-01 23:43:01 +02:00
jsteemann e478c1ae11 faster lookup for _key attribute 2016-04-30 13:25:06 +02:00
Michael Hackstein c58b78062b Added a sanitize externals function that expands externals on demand. It is now used whenever a query is stored in the query cache as the data it is pointing to might be moved. Has to be used as well when sending VPack to client. 2016-04-29 15:21:48 +02:00
Michael Hackstein 536603f66f Velocypack helper now has a specialized hash and compare function for VPackStrings. It is more efficient as it uses shortcuts for bytesize. Will fail for non string case, use with caution 2016-04-29 13:53:41 +02:00
jsteemann b9ef307bf1 micro optimizations 2016-04-28 12:04:14 +02:00
Frank Celler d6e8046992 updated cleanupCFiles 2016-04-23 16:34:57 -07:00
Jan Steemann 48d0a1cbb5 micro optimizations 2016-04-21 12:46:53 +02:00
jsteemann 316a1bd190 starting support for Externals 2016-04-19 22:31:40 +02:00
Jan Steemann 917a1744c9 updated vpack library 2016-04-18 15:30:26 +02:00
Michael Hackstein d67b203382 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-08 13:15:16 +02:00
Michael Hackstein 12d973504c Fixed babies creation in cluster with undefined keys. 2016-04-08 10:53:11 +02:00
Jan Steemann e4b1dd8f5f fixed tests for TRI_HashJsonByAttributes() 2016-04-07 19:55:42 +02:00
Kaveh Vahedipour bb4d520467 VelocyPackHelper buildEmptyObject was buggy 2016-04-06 16:33:56 +00:00
Michael Hackstein 3ad837f17c Added a function to hash specific attributes of a velocypack Object 2016-04-06 16:43:59 +02:00
Michael Hackstein a5d20b0041 Activated Externals in OperationCursor. This commit might break tests again. 2016-03-29 11:08:31 +02:00
Michael Hackstein ed7fd3c495 Added VPack MinKey as Illegal Index Element. Is used to distinguish NON existance in Array indexes 2016-03-24 13:40:16 +01:00
Jan Steemann 809c32c63d fixed typeweights 2016-03-24 12:52:08 +01:00
Michael Hackstein af14e598d1 Fixed Array Indexing. All tests are green again 2016-03-24 11:22:01 +01:00
Jan Steemann d5d943b4a5 adapt to branch 2016-03-23 17:09:29 +01:00
Jan Steemann c8c9288400 harmonize value comparisons for hash indexes 2016-03-23 16:36:00 +01:00
jsteemann 62058d4900 allow turning off SSE4_2 variants 2016-03-18 19:39:53 +01:00
jsteemann 5ded90ed1c fixed compare function for Custom attributes 2016-03-18 13:55:36 +01:00
jsteemann b04ec219d9 changed functions signature 2016-03-15 00:01:54 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann e946729306 aqlvalue$ 2016-03-08 18:52:34 +01:00
Jan Steemann 0496f99b21 expression now using VelocyPack 2016-03-08 13:03:03 +01:00
Jan Steemann 16588e33d3 less json 2016-03-03 17:30:15 +01:00