1
0
Fork 0
Commit Graph

5365 Commits

Author SHA1 Message Date
Jan Steemann 4173e5a8b5 removed temp file 2013-03-19 10:36:35 +01:00
Jan Steemann 44ba5f5533 new web interface 2013-03-19 10:36:00 +01:00
Jan Steemann 8f8598ed1e new web interface 2013-03-19 10:35:20 +01:00
Jan Steemann 97fdf1f8a3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-19 10:33:35 +01:00
Jan Steemann 8155718a4c new web interface 2013-03-19 10:33:23 +01:00
Michael Hackstein bbe1235a4a Interface check is now added to correct position, JSONAdapter applies to interface 2013-03-19 10:10:29 +01:00
Michael Hackstein 57d00beb68 Moved specs for adapters from own folder to general adapterSpec folder 2013-03-19 09:56:25 +01:00
Michael Hackstein 76a73b166f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-19 09:54:45 +01:00
Michael Hackstein 346fa5e2d7 Added an interface spec for Adapters (check if an adapter complies to an interface 2013-03-19 09:54:25 +01:00
Jan Steemann b3a47c0524 removed senseless files 2013-03-18 20:20:46 +01:00
Jan Steemann 0b8c2ac23d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-18 20:18:08 +01:00
Jan Steemann d17a034d59 moved crc calculation into datafile 2013-03-18 20:17:31 +01:00
Jan Steemann 95d78faa3c fixed doxygen errors 2013-03-18 20:07:31 +01:00
Jan Steemann 61cb229ca8 simplified writing of markers into datafiles 2013-03-18 20:04:31 +01:00
Heiko Kernbach 15399b0840 fixed lostfocus bug 2013-03-18 19:12:18 +01:00
Heiko Kernbach 7f43cf4095 added count of totaldocuments 2013-03-18 17:49:21 +01:00
Jan Steemann 3e84d365db Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-18 17:34:36 +01:00
Jan Steemann e8a6c9ee6e cleaned up doc operation context 2013-03-18 17:34:17 +01:00
Heiko Kernbach a147025155 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-18 17:13:21 +01:00
Heiko Kernbach 08bc3fc2be css & view fixes 2013-03-18 17:13:12 +01:00
Jan Steemann 6f2bf0b139 removed unused property 2013-03-18 16:41:48 +01:00
Michael Hackstein f2233b6256 ArangoAdapter is now able to create/patch/delete edges and documents inkl. spec 2013-03-18 16:17:25 +01:00
Michael Hackstein 3023d76850 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-18 13:41:29 +01:00
Michael Hackstein 266d17ba96 Started implementation of creation/deletion in collections 2013-03-18 13:41:09 +01:00
Heiko Kernbach 3704f0f731 test 2013-03-18 13:40:21 +01:00
Heiko Kernbach ff67146c1b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-18 13:26:39 +01:00
Heiko Kernbach 71d7d030db symbolic links 2013-03-18 13:25:30 +01:00
Jan Steemann fe8dd6d6fc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-18 13:05:45 +01:00
Jan Steemann 99522ccb84 switch order of insertion into indexes & datafile for updates
updates are now done in the indexes first, then written to the datafile
2013-03-18 13:03:05 +01:00
Oreste Panaia 4a346d1c23 CAS modifications 2013-03-18 19:53:18 +08:00
Oreste Panaia 081ad862a6 CAS modifications 2013-03-18 19:52:53 +08:00
Oreste Panaia 8333858eac CAS modifications 2013-03-18 19:11:18 +08:00
Jan Steemann 0ef011d408 changed function signature 2013-03-18 09:17:49 +01:00
Jan Steemann 741dec2f7a changed function signature 2013-03-18 09:17:32 +01:00
Jan Steemann 9a4a0e5dfb fixed memory zone mismatches 2013-03-18 09:13:32 +01:00
Michael Hackstein 6d943a54bb Improved AQL of arangoAdapter, it is now more generic and returns nodes completely 2013-03-15 19:23:19 +01:00
Jan Steemann d1cde4457a wrapped some assertions into TRI_ASSERT_DEBUG 2013-03-15 19:00:59 +01:00
Jan Steemann b5895daabe fixed some printf format specifiers 2013-03-15 18:42:30 +01:00
Jan Steemann 51d8638164 typos 2013-03-15 18:16:47 +01:00
Jan Steemann b6f680cd46 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/VocBase/document-collection.c
2013-03-15 18:16:36 +01:00
Jan Steemann ab83c3ea29 some cleanup 2013-03-15 18:07:22 +01:00
Jan Steemann 312b5fda64 some refactoring of document CRUD operations 2013-03-15 17:58:56 +01:00
Michael Hackstein cdc53a5599 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-15 16:46:30 +01:00
Michael Hackstein 654cccc8a2 Adapted spec for graphViewer to ne test_data 2013-03-15 16:45:21 +01:00
Frank Celler 71fbdf87cd Mac fixes 2013-03-15 15:46:17 +01:00
Frank Celler 0325173da6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-15 15:46:00 +01:00
Frank Celler 7908f2b26d cleanup of indexes, fix for compaction (hash, cap, geo, skiplist, pq, bit-array)
Conflicts:
	arangod/Ahuacatl/ahuacatl-tokens.c
	arangod/BitIndexes/bitarray.c
	arangod/BitIndexes/bitarray.h
	arangod/BitIndexes/bitarrayIndex.c
	arangod/BitIndexes/bitarrayIndex.h
	arangod/BitIndexes/masterblocktable.h
	arangod/GeoIndex/geo-index.c
	arangod/HashIndex/hash-index.c
	arangod/PriorityQueue/pqueueindex.c
	arangod/PriorityQueue/pqueueindex.h
	arangod/PriorityQueue/priorityqueue.c
	arangod/PriorityQueue/priorityqueue.h
	arangod/SkipLists/compare.h
	arangod/SkipLists/skiplist.c
	arangod/SkipLists/skiplist.h
	arangod/SkipLists/skiplistIndex.c
	arangod/SkipLists/skiplistIndex.h
	arangod/V8Server/v8-query.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	arangod/VocBase/index.c
	arangod/VocBase/index.h
	arangod/VocBase/synchroniser.c
	arangod/VocBase/voc-shaper.c
	arangod/VocBase/vocbase.c
	lib/BasicsC/hashes.h
	lib/BasicsC/memory.c
	lib/ShapedJson/json-shaper.h
	lib/ShapedJson/shaped-json.h
	utils/cleanupCFiles
2013-03-15 15:45:39 +01:00
Michael Hackstein c1dcb08bbd Defined spec to test graphViewer initialisation and test for thrown errors 2013-03-15 15:24:28 +01:00
Michael Hackstein 7c38894cee Added check for thrown errors on setup for ExpandEvent to spec 2013-03-15 14:51:30 +01:00
Michael Hackstein 8d291b29c1 Fixed Node shaper, if no shape is given nodes are not shaped, if an unknown shape is given an error is thrown 2013-03-15 14:34:33 +01:00