1
0
Fork 0
Commit Graph

210 Commits

Author SHA1 Message Date
Michael Hackstein 7a36bbb43f Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-18 13:58:47 +01:00
Jan Steemann 6f262b6083 added DocumentAccessor 2015-11-18 13:58:14 +01:00
Michael Hackstein f880592025 Used the TraverserExpression in Local case for Edges. Right now it fails hardcoded. 2015-11-18 11:26:55 +01:00
Wilfried Goesgens 7a54982eb4 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-06 13:53:21 +01:00
Jan Steemann cb60466228 removed useless RestAdminBaseHandler layer 2015-11-06 12:42:02 +01:00
Wilfried Goesgens 951165ab1e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH
Conflicts:
	arangod/Aql/grammar.cpp
	arangod/Aql/grammar.h
	js/common/modules/org/arangodb/graph-examples/example-graph.js
2015-10-28 11:08:18 +01:00
Jan Steemann 03da10bb51 attempt to fix failing Windows build 2015-10-22 18:03:07 +02:00
Frank Celler b7de227138 removed readline 2015-10-22 15:41:33 +02:00
Wilfried Goesgens dae95de667 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-21 14:54:01 +02:00
Jan Steemann 81cd1e9f62 fixed Windows compile issues 2015-10-19 12:43:11 +02:00
Jan Steemann 068d85b562 less header dependencies 2015-10-13 17:00:59 +02:00
Jan Steemann 7d11a07a5a removed RangeInfo.h 2015-10-13 15:15:48 +02:00
Jan Steemann 197be68f7d removed IndexRange* 2015-10-13 15:12:32 +02:00
jsteemann 29b3741156 reworked cost calculations 2015-10-12 22:23:03 +02:00
Jan Steemann f0edd198bc added specializeOne() and specializeAll() 2015-10-12 13:02:52 +02:00
Jan Steemann 8c6d284cc3 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-09 16:17:18 +02:00
Jan Steemann 14a2df7684 simplified startup phase w/ options parsing and feature initialization 2015-10-09 15:25:26 +02:00
Jan Steemann 8ee068ba40 refactoring 2015-10-06 13:31:56 +02:00
Jan Steemann 91e8884518 added AggregateNode.* 2015-09-30 15:55:38 +02:00
Jan Steemann 50fa5a2138 added SortNode file 2015-09-30 15:42:48 +02:00
Jan Steemann 9041b7b2c9 file split 2015-09-30 15:29:32 +02:00
Jan Steemann d99f7a498d moved index nodes to their own files 2015-09-30 15:13:49 +02:00
Jan Steemann b5cf8ce942 moved cluster nodes out of ExecutionNode.* 2015-09-30 14:51:11 +02:00
Michael Hackstein c0a88a1371 Merge branch 'aql-jmmh-conditions' of github.com:arangodb/arangodb into aql-jmmh-conditions 2015-09-29 10:04:15 +02:00
Michael Hackstein 1e9c6f110b Started implementing the IndexBlock. Right now it expects an iterator for each used index that is created by an evaluated expression from the Block. Then it will go through all iterators in every get/skip some step 2015-09-28 19:30:10 +02:00
Jan Steemann 84f59d112e unified index use checks 2015-09-28 18:13:04 +02:00
Michael Hackstein 1a7f414c16 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-09-18 12:21:39 +02:00
Frank Celler c4d1fff729 new traversal 2015-09-18 10:40:28 +02:00
Jan Steemann b0798bbb19 first commit, broken 2015-09-16 17:22:09 +02:00
Jan Steemann bead727a32 initial work for better incremental synchronization 2015-09-10 18:17:58 +02:00
Jan Steemann 0735277830 removed IndexWatermarks again... not needed 2015-09-09 14:22:58 +02:00
Jan Steemann b9c8972477 index watermarks preparations 2015-09-04 18:14:39 +02:00
CoDEmanX 3a9648d78a More Americanization 2015-09-03 22:25:43 +02:00
Michael Hackstein 027445697d Renamed SkiplistIndex2 to SkiplistIndex ;) 2015-09-01 15:05:49 +02:00
Michael Hackstein 786126f307 Removed obsolete file 2015-09-01 15:05:49 +02:00
Jan Steemann afb342eefd split big ExecutionBlock file into smaller files 2015-08-27 00:28:20 +02:00
Jan Steemann cbd43b3839 renamed files 2015-08-26 21:49:15 +02:00
Jan Steemann 09928c71c1 added common base class for hash and skiplist index 2015-08-26 18:14:24 +02:00
Michael Hackstein c308065eec Removed obsolete hash index implementation 2015-08-26 09:46:49 +02:00
Michael Hackstein b708a7ae68 Merge remote-tracking branch 'origin/devel' into array_indexing 2015-08-21 15:34:49 +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 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
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 9f0384284f moved files 2015-08-19 11:19:37 +02:00
Max Neunhoeffer 7217111192 First step for hashindex, this revision is broken.
Changes are only done half-way.
2015-08-17 12:57:52 +02:00
Jan Steemann 6d7ccd7699 move shaper to cxx 2015-07-28 17:38:31 +02:00
Frank Celler 35a3c6421c moved dispatcher to atomic 2015-07-23 15:40:34 +02:00