1
0
Fork 0
Commit Graph

6178 Commits

Author SHA1 Message Date
Michael Hackstein 85c5885c76 Merge branch 'array_indexing' of github.com:arangodb/arangodb into array_indexing 2015-08-21 16:21:38 +02:00
Max Neunhoeffer f7126d4974 Fix a typo. 2015-08-21 16:21:18 +02:00
Max Neunhoeffer 1dce162b4b Merge branch 'array_indexing' of ssh://github.com/ArangoDB/ArangoDB into array_indexing
Conflicts:
	arangod/Indexes/HashIndex.cpp
2015-08-21 16:11:28 +02:00
Max Neunhoeffer 479f81f760 Buckets for hash-array, also C++-ize it. 2015-08-21 16:05:17 +02:00
Michael Hackstein b708a7ae68 Merge remote-tracking branch 'origin/devel' into array_indexing 2015-08-21 15:34:49 +02:00
Michael Hackstein 85b58a6d8d Fixed sparse indexes 2015-08-21 14:07:32 +02:00
Michael Hackstein 9bb7c0dec6 The skiplist index is now able to index arrays as well 2015-08-21 11:04:04 +02:00
Jan Steemann 8ee12f7a27 binary-safe back-references 2015-08-20 21:01:43 +02:00
Jan Steemann ffde050e0d check for empty collections list 2015-08-20 20:25:01 +02:00
Michael Hackstein 8491d84c96 Added forgotten header file for last commit 2015-08-20 15:27:49 +02:00
Michael Hackstein 838a91b125 Fixed rollback for insertion of multiple elements. Is now able to define a unique constrain on array entries 2015-08-20 15:13:56 +02:00
Michael Hackstein cd5fe6aceb Removed debug output 2015-08-20 15:11:18 +02:00
Michael Hackstein 4bb8508d82 Implemented a new improved version of the Array index insertion function. 2015-08-20 14:03:17 +02:00
Willi Goesgens 7b41912489 Merge pull request #1448 from CoDEmanX/devel
Fixes for Windows (.sh line endings, ignored files, remove bad file)
2015-08-20 09:37:31 +02:00
CoDEmanX f35bd8728f Fix target path for js files
Folder must be omitted from destination path, or a another folder will be created as parent and break file structure.
2015-08-20 03:23:14 +02:00
Jan Steemann 97d67e4399 use binary-safe string representations 2015-08-20 01:46:20 +02:00
Jan Steemann 1be3733a64 moved some handlers around
fix disappeared handlers
2015-08-20 01:26:52 +02:00
Jan Steemann ea382e1f4c removed triagens::rest::Handler 2015-08-20 01:26:50 +02:00
Jan Steemann c5f36e6cd5 fixed forward declaration 2015-08-19 17:54:06 +02:00
Jan Steemann 4e595fda13 simplifications 2015-08-19 17:18:05 +02:00
Jan Steemann f587b2ca6a replication refactoring 2015-08-19 16:13:53 +02:00
Jan Steemann 878641f674 some replication refactoring 2015-08-19 15:32:24 +02:00
Max Neunhoeffer 844e028389 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-08-19 14:46:28 +02:00
Max Neunhoeffer ff135a10ad Add some overrides to silence a clang compiler warning. 2015-08-19 14:46:06 +02:00
Jan Steemann 90dafd61c0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-19 13:11:52 +02:00
Jan Steemann 56966f7081 fix warning 2015-08-19 13:07:04 +02:00
Jan Steemann 6268a20124 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-19 12:56:51 +02:00
Jan Steemann e01e874073 don't use void* 2015-08-19 12:56:32 +02:00
Michael Hackstein 241905c42c Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-19 12:51:53 +02:00
Jan Steemann 63f9782fc3 removed unused arango_fe 2015-08-19 12:51:38 +02:00
Michael Hackstein 1a4d59d954 Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-19 11:57:12 +02:00
Jan Steemann 6680f3bb5a fix Mac build 2015-08-19 11:56:41 +02:00
Michael Hackstein 59e8ea3fad Merge branch 'devel' of github.com:arangodb/arangodb into array_indexing 2015-08-19 11:56:34 +02:00
Jan Steemann 6076bc632e fixed Makefile 2015-08-19 11:37:51 +02:00
Jan Steemann 2c640965b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-19 11:19:46 +02:00
Jan Steemann 9f0384284f moved files 2015-08-19 11:19:37 +02:00
Willi Goesgens 01a1273a87 Merge pull request #1444 from aurelijusb/documentation
Small documentation improvements
2015-08-19 10:23:36 +02:00
Michael Hackstein 5c0ec7d318 Indexed my first array and was able to get it out again \o/. Unique constraint is not yet working though 2015-08-19 09:55:46 +02:00
Jan Steemann bc7e0f7bbd issue #1445: Object literal simplificatin does not support pseudo-variables NEW and OLD 2015-08-19 09:25:46 +02:00
Jan Steemann 8677da48b1 replication API enhancements, not yet ready 2015-08-18 18:08:20 +02:00
Jan Steemann 7a366c605d small refactoring 2015-08-18 14:24:19 +02:00
Jan Steemann 05c9005fcc small refactoring for replication applier functions 2015-08-18 14:13:26 +02:00
Jan Steemann 3c14a44c1b simpler parsing of replication input 2015-08-18 13:33:51 +02:00
Michael Hackstein 481a106a7d Implemented a helper function to extract all values in an array to be inserted 2015-08-18 11:37:09 +02:00
Michael Hackstein 2bcef2e03b Added a function that recursivly allocates and fills index_elements if one or more paths have to be expanded. 2015-08-18 09:09:36 +02:00
Jan Steemann 338dd7e100 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-17 18:41:13 +02:00
Jan Steemann 4e771b2728 replication improvements 2015-08-17 18:41:05 +02:00
Jan Steemann ffe4fb556b pacify VS 2015-08-17 17:05:52 +02:00
Michael Hackstein b0df08822f Removed obsolete function for HashIndex insertion 2015-08-17 16:10:43 +02:00
Michael Hackstein 33c3c0474e Removed obsolte header file in old hashindex 2015-08-17 16:04:18 +02:00