Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,897 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

743 Commits

Author SHA1 Message Date
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Jan Steemann 836963ae00 less compaction 2013-03-12 18:17:27 +01:00
Jan Steemann 3527a77f18 remove temporary files when opening a collection 2013-03-12 14:52:25 +01:00
Jan Steemann 91c38f8425 delete temporary files on startup 2013-03-12 14:45:42 +01:00
Frank Celler c501d2e0b4 fixed rollback 2013-03-12 14:26:16 +01:00
Jan Steemann 80f01892b7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-12 12:56:03 +01:00
Jan Steemann 71b2587d96 added assertions for debugging 2013-03-12 12:55:52 +01:00
Frank Celler 1803f409b2 fixed skip list index 
Conflicts:
	arangod/SkipLists/skiplistIndex.c
 2013-03-12 11:13:22 +01:00
Jan Steemann 8888fe4cc5 dont truncate collection id in error message 2013-03-12 10:31:54 +01:00
Jan Steemann 9b688907f0 handle out of memory properly when open-iterating a collection 2013-03-12 10:26:35 +01:00
Jan Steemann 082244cbeb handle out of memory in voc-shaper 2013-03-12 09:20:56 +01:00
Frank Celler 8787bb7f00 replaced index update by remove/insert 
Conflicts:
	arangod/HashIndex/hash-index.c
	arangod/VocBase/index.c
 2013-03-11 14:23:23 +01:00
Jan Steemann 206681159f fixed memory zone mismatches 2013-03-11 11:10:08 +01:00
Jan Steemann 799d7f02ee fixed memory zones 2013-03-11 10:59:16 +01:00
Jan Steemann 6a4245b5c8 fixed deadlock 2013-03-11 10:37:17 +01:00
Jan Steemann d5855c0c1f fixed some memory zone mismatches 2013-03-11 10:25:09 +01:00
Frank Celler b8ef779aa7 fixed merge errors 2013-03-11 09:54:56 +01:00
Frank Celler c915bfa5ff cleanup of indexes, fix for compaction (hash, cap, geo) 
Conflicts:
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
 2013-03-11 09:49:58 +01:00
Jan Steemann cd753182f1 fixed doxygen errors 2013-03-08 16:56:52 +01:00
Jan Steemann 99630450c2 removed checks for TRI_HAVE_ICU because ICU is a prerequisite for using ArangoDB 2013-03-08 16:03:54 +01:00
Jan Steemann 0a883f4076 merged some changes from trx branch into devel 2013-03-08 14:22:25 +01:00
Jan Steemann 8a6bac82ad removed headers->verify() because it was a non-op 2013-03-08 13:36:48 +01:00
Jan Steemann 5631314bc7 issue #212: added auto-increment support for collections 
the feature can be used by creating a collection with the extra `keyOptions`
attribute as follows:

    db._create("mycollection", { keyOptions: { type: "autoincrement", offset: 1, increment: 10, allowUserKeys: true } });

The `type` attribute will make sure the keys will be auto-generated if no `_key` attribute is specified for a document.
The `allowUserKeys` attribute determines whether users might still supply own `_key` values with documents or if this
is considered an error.
The `increment` value determines the actual increment value, whereas the `offset` value can be used to seed to value
sequence with a specific starting value. This will be useful later in a multi-master setup, when multiple servers can use
different auto-increment seed values and thus generate non-conflicting auto-increment values.

The default values currently are:

- `allowUserKeys`: `true`
- `offset`: `0`
- `increment`: `1`

The only other available key generator type currently is `traditional`. The `traditional` key generator
will auto-generate keys in a fashion as ArangoDB always did (some increasing integer value, with a more or less unpredictable
increment value).

Note that for the `traditional` key generator there is no the option to disallow user-supplied keys and give the
server the sole responsibility for key generation.
 2013-03-08 11:54:03 +01:00
Jan Steemann b307e4cd6d completed auto-increment key generator 2013-03-08 10:51:50 +01:00
Jan Steemann 5732ab8378 reduce the size for each collection struct 
"path" attribute now has a max length of 512 bytes instead of 4K
 2013-03-07 18:17:52 +01:00
Jan Steemann 0879cf8d15 added auto-increment key generator (not yet ready) 2013-03-07 18:17:35 +01:00
Jan Steemann fbceb95f97 fixes 2013-03-06 17:38:31 +01:00
Jan Steemann 2a6180b5fe fixes 2013-03-06 17:10:52 +01:00
Jan Steemann bdf906ef89 fixed a memleak for barriers 2013-03-06 14:33:23 +01:00
Jan Steemann 5098792b4f fixed invalid pointers when compacting deletion markers 
fixed invalid pointers for updates
 2013-03-06 14:02:32 +01:00
Jan Steemann 01bf386e08 added test cases, fixed edge index key insertion 2013-03-06 09:38:59 +01:00
Jan Steemann 2734060026 when compacting old markers, also adjust _key 2013-03-04 12:05:14 +01:00
Jan Steemann 486c2120bf fixed key URLs in arangob CRUD test case 2013-03-01 17:54:13 +01:00
Jan Steemann f613c3c4d9 fixed race conditions when reading/deleting documents 2013-03-01 16:44:40 +01:00
Jan Steemann bacdbed093 more throughput with parallel deletes/inserts 2013-03-01 10:35:39 +01:00
Jan Steemann 8d496dd701 fixed memleaks in cause of collection loading errors 2013-03-01 10:10:41 +01:00
Oreste Panaia fc5e1ba623 merge conflicts with devel 2013-02-28 19:42:58 +08:00
Oreste Panaia a48696ec28 network modifications required for windows 2013-02-28 17:43:39 +08:00
Jan Steemann be9fefa9d0 fix warning in conditional compilation (--disable-logger) 2013-02-22 14:20:26 +01:00
Jan Steemann 216f04927b potential fix for issue #411 2013-02-18 10:35:32 +01:00
Frank Celler ced7b05cca added fix for TRI_ENABLE_LOGGING from Jan 2013-02-16 14:03:35 +01:00
Frank Celler 45c815b7eb fixed issue #403: Usage of exit() etc. 2013-02-15 12:19:09 +01:00
Jan Steemann d321f32523 moved some const value out of loop 2013-02-15 11:35:48 +01:00
Jan Steemann 0a00760907 performance patch, improving parallelity for concurrent document creation 2013-02-14 17:18:28 +01:00
Frank Celler dd1657a1f8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-14 16:47:45 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Jan Steemann 72fea38943 fix compile warnings 2013-02-13 22:20:04 +01:00
Jan Steemann 8b79f6e2b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-02-13 18:05:44 +01:00
Jan Steemann 5c922cca02 fixed compile warnings with conditional compilation 2013-02-13 18:00:35 +01:00
Frank Celler 83ef8421c0 fixed padding for 32bit systems 2013-02-13 15:33:20 +01:00
Jan Steemann 8365c4294c small mods 2013-02-12 18:16:23 +01:00
Jan Steemann 861a2e6b25 issue #395 2013-02-12 11:46:55 +01:00
Jan Steemann ca81913abb added AQL function EDGES() 2013-02-07 22:53:50 +01:00
Jan Steemann 7273af5c53 fixed arango-dfdb to not segfault that often when reading corrupt datafile 2013-02-06 14:26:18 +01:00
Jan Steemann dbcc86171f added more crash-protection when reading corrupted collection files at startup 2013-02-06 12:34:53 +01:00
Jan Steemann f17629817a make getindexes and count nestable 2013-02-05 11:36:16 +01:00
Jan Steemann e06329db48 fix cross-collection queries in AQL 2013-02-05 10:56:28 +01:00
Jan Steemann 44f2d05b4c added explicit locking 2013-02-04 15:35:26 +01:00
Jan Steemann 8a6225865f removed lock classes 2013-02-04 14:40:14 +01:00
Jan Steemann de0b290bcd moved AQL to use AhuacatlTransaction 2013-02-04 11:25:03 +01:00
Jan Steemann 6c64dbd105 some more cleanup 2013-02-01 15:29:37 +01:00
Jan Steemann 9a1bac1d69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-02-01 13:43:48 +01:00
Jan Steemann ca8935ae2a fix collection name handling in the face of parallel renames 2013-02-01 13:43:14 +01:00
Oreste Panaia 3c8093849a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 00:07:19 +08:00
Oreste Panaia e0b7fbbf8d windows icu 2013-01-31 00:04:20 +08:00
Jan Steemann 0a2fe0e9a0 fix reload of duplicate key markers 2013-01-29 15:46:45 +01:00
Jan Steemann e8b0a548d6 removed tabs 2013-01-28 13:48:20 +01:00
Jan Steemann 17530a5e45 added number of shapes in return value of figures() 2013-01-25 10:19:02 +01:00
Jan Steemann 92abde4932 more tests for indexes to overcome getIndexes() mysteries (related to issue #366) 2013-01-23 10:43:20 +01:00
Jan Steemann 346e364767 issue #366 2013-01-23 10:28:00 +01:00
Jan Steemann 5d093576e2 fix a few -pedantic errors 2013-01-23 08:58:54 +01:00
Frank Celler f4814571ef Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 2013-01-22 16:07:32 +01:00
Frank Celler cc6644df6d added : to allowed characters in keys 2013-01-22 16:07:10 +01:00
Jan Steemann 376c264281 take precautions to prevent issue #365 2013-01-22 11:58:08 +01:00
Jan Steemann 8238a40de1 do not clip collection identifier 2013-01-21 16:58:51 +01:00
Jan Steemann 0f569ab303 make collections accessible by stringified id, too 2013-01-21 16:54:47 +01:00
Jan Steemann 65d637e488 removed some stuff for 1.2 2013-01-21 12:53:18 +01:00
Jan Steemann ba44906c24 fixed insertion into primary index when there were deleted documents 2013-01-21 12:05:03 +01:00
Jan Steemann 452a266475 fixed memory error 2013-01-18 17:56:38 +01:00
Jan Steemann 9a003247d0 removed the _bidirectional attribute for edges 
This will be reimplemented later on collection, and not on individual edges level.
Lucas & the others were sure directed & undirected edges should not be mixed in the same collection
 2013-01-18 17:02:30 +01:00
Jan Steemann 50a01424d6 fixed duplicate key insertion 2013-01-18 12:15:48 +01:00
Jan Steemann e509f92c5e added test cases for duplicate _key insertion 2013-01-18 11:11:22 +01:00
Jan Steemann bbade8c0b8 removed the non-working indexSubstrings property for fulltext indexing 2013-01-17 15:58:28 +01:00
Jan Steemann 945a437807 move creation of parameters file until after all datafiles have been created 
this mitigates problems when datafile creation fails and there are dangling parameter.json files around
 2013-01-16 16:40:10 +01:00
Jan Steemann f1fbb4796e fixed anonymous mmap for MacOS 2013-01-16 12:32:28 +01:00
Jan Steemann 7a6db16241 added db._version() 2013-01-15 16:44:48 +01:00
Jan Steemann 2e5f65a2ad speed up insertion into edges index 2013-01-15 15:13:34 +01:00
Jan Steemann 4818f22b21 fixes 2013-01-14 02:58:19 +01:00
Jan Steemann 5f2a6c803b do not show irrelevant warning 2013-01-13 13:18:57 +01:00
Jan Steemann 35a58d4a69 fixed db.collection.document(collection / key) 2013-01-13 12:38:12 +01:00
Jan Steemann 08a696a1a7 removed useless parameter 2013-01-12 01:26:52 +01:00
Jan Steemann 485d10ad51 added collection.revision() method 2013-01-10 02:02:32 +01:00
Jan Steemann 187d8ecc69 some transaction rework 2013-01-08 17:26:16 +01:00
Jan Steemann 69eb391e59 issue #346 2013-01-07 13:46:55 +01:00
Jan Steemann b310b832fd comments 2013-01-07 13:01:26 +01:00
Jan Steemann d76920443d added tests and documentation for volatile collections 2013-01-07 10:55:25 +01:00
Jan Steemann 36a3ebe2ae added comment about wait() 2013-01-07 09:44:54 +01:00
Jan Steemann 962f8ab6c9 reduced variable scope 2013-01-07 08:48:47 +01:00
Jan Steemann 51305de692 in-memory collections, seem to work now 
documentation and some helper functions are still missing
 2013-01-04 17:04:15 +01:00
Jan Steemann 0471ee8a0d memory collections, intermediate commit 2013-01-04 15:50:29 +01:00
Jan Steemann 8128a6377d memory-collections, intermediate commit 2013-01-04 12:12:46 +01:00
Jan Steemann e2efd9d35e remove memory usage for small collections 2013-01-03 10:54:44 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Frank Celler f188357f83 added padding for 32bit 2013-01-02 17:07:44 +01:00
Frank Celler 9917ece449 added missing padding for 32bit 2013-01-02 16:17:38 +01:00
Jan Steemann 459f935d00 intptr_t to uintptr_t conversion 2013-01-02 15:00:59 +01:00
Frank Celler 1357ab6c54 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2013-01-02 14:53:13 +01:00
Frank Celler dadcef3de3 renamed execute/load to executelocal and executeglobal 2013-01-02 14:52:55 +01:00
Jan Steemann 74f9ced94e issue #335 2013-01-02 14:37:46 +01:00
Jan Steemann ea48388726 issue #335 2013-01-02 14:12:44 +01:00
Jan Steemann 0f887a39fa issue #332 2012-12-22 02:45:29 +01:00
Frank Celler d5f24ce13c Merge remote-tracking branch 'origin/windows' into HEAD 
Conflicts:
	CHANGELOG
	Documentation/InstallationManual/Installing.md
	Documentation/Makefile.files
	Documentation/Scripts/generateTOC.py
	Documentation/header.html
	Installation/OBS/clean-repo.sh
	Installation/OBS/create-repo.sh
	Installation/OBS/create-ymp.sh
	Installation/OBS/index.html
	Installation/OBS/load-repo.sh
	Makefile.in
	VERSION
	aclocal.m4
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/Documentation/user-manual.dox
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/collection.c
	arangod/VocBase/datafile.c
	arangosh/V8Client/arangosh.cpp
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/install-sh
	config/missing
	configure
	configure.ac
	js/server/arango-upgrade.js
	js/server/modules/org/arangodb/actions.js
	lib/BasicsC/logging.c
	lib/Utilities/ScriptLoader.cpp
 2012-12-20 11:11:47 +01:00
Frank Celler b09260a06f removed debug output 2012-12-20 10:43:47 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Jan Steemann 33ea87fccb cppcheck 2012-12-19 09:20:29 +01:00
Jan Steemann 669fe4275a cppcheck 2012-12-18 16:44:06 +01:00
Jan Steemann 6c0b840db0 clang fixes 2012-12-18 15:28:28 +01:00
Jan Steemann 6e781f9e1c cppcheck 2012-12-18 15:24:20 +01:00
Jan Steemann 96637435ab fulltext: more query operators, more tests, more controlled memory usage and statistics 2012-12-18 14:56:06 +01:00
Jan Steemann 0374ed417e fixed & reactivated compaction 2012-12-15 02:17:37 +01:00
Jan Steemann b8ca0b2d4d fulltext index massive rewrite 2012-12-15 01:01:25 +01:00
Jan Steemann b5d0457f3a fixed some issues reported by cppcheck 2012-12-12 18:42:11 +01:00
Jan Steemann 459b1ba886 fixed wrong return value in index creation functions 2012-12-11 18:58:05 +01:00
Jan Steemann 691ec4d536 more verbosity on failed fulltext insertion 2012-12-10 15:50:49 +01:00
Jan Steemann fb4afd0353 fulltext index 2012-12-10 12:16:48 +01:00
Jan Steemann 7c5d36bf0f adjusted default sizes 2012-12-07 18:04:29 +01:00
Jan Steemann cbaa57a1bd cleanup of fulltext indexes, resizing etc. 2012-12-07 18:00:01 +01:00
Jan Steemann 7261465139 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-12-07 13:51:31 +01:00
Jan Steemann c49ce0a52f fulltext resizing, still incomplete 2012-12-07 13:51:19 +01:00
Jan Steemann 63b4c94b0f fulltext resizing, halfway 2012-12-07 13:50:29 +01:00
a-brandt c4cc85ab9f memory bugfix 2012-12-07 13:47:02 +01:00
a-brandt 1794ea49fa added new function for getting words 2012-12-07 13:09:16 +01:00
Jan Steemann f89475df47 some cleanup 2012-12-07 09:53:00 +01:00
Jan Steemann 0b001b7a87 fixed memory leaks, added newest code by Richard 2012-12-06 16:43:33 +01:00
Jan Steemann 38809d4612 added callbacks for index cleanup 2012-12-06 15:46:11 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Jan Steemann 242a16d6f5 proper naming of ICU functions 2012-12-06 12:27:22 +01:00
Jan Steemann 69986a5de0 fixed a segfault when searching for empty words in fulltext 2012-12-06 09:28:02 +01:00
Jan Steemann 21fa3ed616 small stuff, oom handling etc. 2012-12-04 21:21:26 +01:00
Jan Steemann 1811ce9186 fixed some issues found by cppcheck 2012-12-04 18:21:29 +01:00
Jan Steemann 5742ab6fba fixed unicode lowercasing 2012-12-04 11:12:38 +01:00
Jan Steemann 1e1f7da7f9 renamed files 2012-12-04 09:07:02 +01:00
Jan Steemann fcc880e021 use TRI_Allocate 2012-12-03 17:54:55 +01:00
Jan Steemann d8506d7a13 implemented updating of documents 2012-12-03 17:32:04 +01:00
Jan Steemann 1130df4330 utf8 lower-casing and normalisation for fulltext strings 2012-12-03 17:14:54 +01:00
Jan Steemann cdbb96788f issue #313 2012-12-03 15:30:01 +01:00
Jan Steemann 9b44e4aa45 added very limited & alpha fulltext query capability 
db.collection.FULLTEXT() allows to issue queries using a fulltext index.
Needs to be passed a comma-separated query string with the search words.
Search words can be prefixed with either:
* prefix: does a prefix search
* complete: does a complete-match search
* substring: does a substring search

This is still very very alpha. It crashes and produces wrong results in some cases.
 2012-12-02 03:24:20 +01:00
Jan Steemann d2aef2dcdc add words to fulltext index 
this parses the fulltext-indexed attributes of documents when there's a fulltext index, and adds the individual words to the index.
As the fulltext index is case-sensitive, all words are added to the index in lower case.
The text tokenisation implementation is still very naive and currently works properly only for character ranges [a-z] and [A-Z].
Unicode words are also supported, but they are not normalised nor lower-cased yet. Additionally, unicode punctuation characters are not excluded and will also be added to the index.
Updating documents that are fulltext-indexed currently does not work.
 2012-12-02 00:55:59 +01:00
Jan Steemann f517aa0059 ensureFulltextIndex 2012-11-30 17:53:02 +01:00
Jan Steemann 19fb9d0aea added stub functions for fulltext indexes 2012-11-30 14:50:02 +01:00
Jan Steemann f634b1aff0 code unification 2012-11-29 22:34:49 +01:00
Jan Steemann d8a06fe136 removed unused flags from doc_operation_context 2012-11-29 13:44:36 +01:00
Jan Steemann 42df64d7c0 added tests for key pattern 2012-11-29 12:37:30 +01:00
Jan Steemann 77f3115ac7 updated documentation for document ids and keys 2012-11-29 10:20:10 +01:00
Jan Steemann 8d2db81042 document key handling 2012-11-29 09:49:11 +01:00
Jan Steemann cbad6b526a make collections accesible via name instead of id. 
this allows using the collection name instead of ids in _from, _to, _id etc.
 2012-11-28 13:16:15 +01:00
Jan Steemann f84207e368 removed redundant declaration of edges index. edges index is now a regular index 2012-11-27 14:14:31 +01:00
Frank Celler 6e94eeb36f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-11-27 12:35:12 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
 2012-11-27 12:34:58 +01:00
a-brandt 9458fa1ce5 fix 2012-11-26 17:28:58 +01:00
a-brandt 1c7b0a6387 fix 2012-11-26 17:28:51 +01:00
Jan Steemann 4ecb3b09f5 fix compiler warning 2012-11-26 10:07:57 +01:00
Jan Steemann c751611ee8 fixed logic error 2012-11-24 17:12:52 +01:00
Jan Steemann eac11fb793 issue #293 2012-11-24 03:16:23 +01:00
Jan Steemann 8ac81dbc85 shut up the compiler 2012-11-23 20:37:03 +01:00
Jan Steemann f812408a7e documentation for collection names / keys 2012-11-23 19:41:14 +01:00
Jan Steemann bc94851026 fixed compile warnings 2012-11-23 13:18:00 +01:00
Jan Steemann e7f8543d81 moved documentation changes from 1.1 to devel 2012-11-23 10:18:47 +01:00
Jan Steemann 10bfbb90e5 fixed type errors 2012-11-23 09:04:37 +01:00
Jan Steemann 687eac97b5 fix type errors 2012-11-23 09:00:11 +01:00
Jan Steemann b2faa016a6 fixed gcc compile warnings 2012-11-22 21:34:41 +01:00
Jan Steemann aaf34f44f4 fixed lots of compile warnings 2012-11-22 21:20:22 +01:00
Frank Celler cccb3511c5 fixed documentation again 2012-11-21 17:42:13 +01:00
Jan Steemann 69c9a9716c prevent compile warning 2012-11-19 13:59:06 +01:00
Jan Steemann e69145e391 fix memleak 2012-11-19 13:28:22 +01:00
Jan Steemann 662112bad3 changed call to figures to lock inside primary-collection.c instead of v8-vocbase.cpp 2012-11-19 11:47:52 +01:00
Jan Steemann 541066cdc1 free global instances of collections at shutdown 2012-11-16 15:43:48 +01:00
Jan Steemann 38025fbc31 documents and edges are now created using transaction contexts 2012-11-16 15:36:44 +01:00
Jan Steemann de9b2c71c1 fixed some transaction stuff 2012-11-15 18:39:48 +01:00
Jan Steemann fe7e061a27 transaction nesting 2012-11-15 18:14:20 +01:00
Jan Steemann fddcea9d4e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Utils/Collection.h
 2012-11-15 13:59:54 +01:00
Jan Steemann 1ff2430e39 transaction refactoring 2012-11-15 13:53:11 +01:00
a-brandt 407ac48821 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-15 11:25:22 +01:00
a-brandt 71d3d54de1 collection info struct changed 2012-11-15 11:24:35 +01:00
Jan Steemann 00c9955ed2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-14 17:14:11 +01:00
Jan Steemann 9e40045025 changed document CRUD API signatures 2012-11-14 17:11:16 +01:00
a-brandt 3e302a5aea changed function TRI_IsAllowedCollectionName 2012-11-14 14:09:00 +01:00
Jan Steemann 897a086649 renamed parameters 2012-11-14 13:28:04 +01:00
Jan Steemann 30ba8771a7 pluggable key generators 2012-11-14 12:44:56 +01:00
Jan Steemann cdd163cc8a added TRANSACTION() JS function 2012-11-13 18:45:27 +01:00
Jan Steemann b8655965f4 some transaction changes 2012-11-13 17:36:24 +01:00
Jan Steemann d7aa6d7d0a more cleanup 2012-11-09 18:42:07 +01:00
Jan Steemann be39dbd419 some cleanup 2012-11-09 17:50:07 +01:00
Jan Steemann 728dfa3d9e fixed a few out of memory situations 2012-11-09 17:30:28 +01:00
Jan Steemann 419456c1a8 some refactoring 2012-11-09 15:06:28 +01:00
Jan Steemann b9019329c8 fail gracefully on invalid marker types 2012-11-09 11:05:06 +01:00
Jan Steemann 65db6eee8b some simplification 2012-11-09 11:03:42 +01:00
Jan Steemann 7dfab2d6dc introduced validFrom, still does nothing 2012-11-09 10:42:06 +01:00
Jan Steemann 149c6c1fc1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-08 17:47:53 +01:00
Jan Steemann 64c6bc5cb0 renamed marker member _deletion to _validTo, some cleanup 2012-11-08 17:47:18 +01:00
Jan Steemann 5b4f8431b4 removed unused _eid from master pointer 2012-11-08 16:36:08 +01:00
a-brandt 8532aecd73 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-08 16:24:43 +01:00
a-brandt cc919edc69 bug fix negative _key 2012-11-08 16:23:09 +01:00
Jan Steemann 30e29ee0b1 removed unnecessary function parameters 2012-11-08 16:14:34 +01:00
Jan Steemann 6b9e43d4f5 removed unused function 2012-11-08 15:23:03 +01:00
Jan Steemann dacd2fb70c some cleanup 2012-11-06 19:24:27 +01:00
Jan Steemann 59791248bf some refactoring of v8-vocbase, trx integration 2012-11-06 19:02:09 +01:00
Jan Steemann 0ed1f985fe create private copies of other write transactions 2012-11-06 12:56:51 +01:00
Jan Steemann aee9599baa introduced write-locks 2012-11-05 18:22:24 +01:00
Jan Steemann 4276215251 some cleanup 2012-10-31 18:20:22 +01:00
Jan Steemann d9f34fd88e refactored and simplified document CRUD methods 2012-10-31 18:04:12 +01:00
Jan Steemann 6e22aef697 parameter reduction 2012-10-31 15:06:58 +01:00
Jan Steemann d1bc1513aa moved creation of primary index into index.c 2012-10-31 13:55:57 +01:00
Jan Steemann 42206c990c moved functions from primary to document collection 2012-10-31 13:29:07 +01:00
Jan Steemann 8cb8f2ce0e removed unused collection functions 2012-10-31 13:18:57 +01:00
Jan Steemann 07a9f35572 pass vocbase to trx 2012-10-31 13:18:36 +01:00
Jan Steemann d9f8219bd6 added --enable-trx option 2012-10-31 11:21:06 +01:00
a-brandt 759f00e3d7 Bugfix wrong key length check 2012-10-30 14:44:52 +01:00
a-brandt 3fb488c3a3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-10-30 12:31:50 +01:00
a-brandt 5b77d5c3ad added key length check 2012-10-30 12:31:27 +01:00
Jan Steemann a585b64f79 implementation of global transaction lists 2012-10-30 11:17:54 +01:00
Jan Steemann 665a6d4b7a transaction functionality, very early, not at all working 2012-10-29 18:14:42 +01:00
Jan Steemann b9008cbdd5 removed TRI_voc_did_t, removed some deprecated typedefs 2012-10-29 15:45:52 +01:00
Jan Steemann 21735bb267 minor changes 2012-10-29 15:34:28 +01:00
a-brandt 7af1337607 bugfix wrong error message with exit() 2012-10-26 12:59:20 +02:00
a-brandt 7daa018969 removed "reuseID" 2012-10-26 12:36:13 +02:00
a-brandt 58926a145a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-10-26 12:28:42 +02:00
a-brandt aa265caee2 update 2012-10-26 12:28:22 +02:00
Jan Steemann 4bbdb5a912 fix gcc warning 2012-10-26 08:32:01 +02:00
Jan Steemann 296ad4f5e7 reduce index bloat for edges 2012-10-25 22:02:31 +02:00
Jan Steemann cb6c8c8e7e added bidirectional edges, fixup edges index 2012-10-25 17:18:54 +02:00
Jan Steemann d5223968e4 removed some non-used code 2012-10-24 18:39:11 +02:00
a-brandt e66daf3f43 bugfix unit tests 2012-10-24 12:36:11 +02:00
a-brandt c2d0749178 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/RestHandler/RestImportHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
	arangod/VocBase/primary-collection.c
	arangod/VocBase/primary-collection.h
 2012-10-24 10:46:38 +02:00
a-brandt 9a599e468a added "_key" attribute 2012-10-23 15:58:09 +02:00
Oreste Panaia 4d8d78e880 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	VisualStudio/Arango Front End Library/Arango Front End Library.vcxproj
	arangod/Actions/RestActionHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	lib/ApplicationServer/ApplicationServer.cpp
 2012-10-22 21:04:12 +08:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08:00
Jan Steemann 8684b2630d fixed a crash with --database.force-sync-shapes = false 2012-10-17 18:46:46 +02:00
Frank Celler 3aebed3020 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	Documentation/Makefile.files
 2012-10-17 18:03:46 +02:00
Frank Celler 1efad1d9c7 fixed file permissions 2012-10-17 18:01:57 +02:00
Jan Steemann d58c48bdd8 fix rollback of edge update 
The rollback of edge marker modification used a wrong marker size and thus uninitialised memory.
Achim found this
 2012-10-17 17:25:12 +02:00
Jan Steemann be54759314 issue #245 2012-10-17 14:24:31 +02:00
Jan Steemann c5996869b6 hash index fixes 2012-10-16 17:43:22 +02:00
Jan Steemann 94057c0d0a sizeof(hash element) /= 2 2012-10-16 13:48:03 +02:00
Jan Steemann 8cad4ff0a8 suppress excessive log spam 2012-10-16 10:27:59 +02:00
Jan Steemann 95006138ed put parameters on individual lines 2012-10-15 11:31:00 +02:00
Jan Steemann eba0456c05 added some memory checks 2012-10-11 15:49:20 +02:00
Jan Steemann de853fda66 fixed error message 2012-10-11 14:56:34 +02:00
Jan Steemann a4b979222f fixed memory zone issues, memleaks 2012-10-10 19:05:16 +02:00
Jan Steemann 31ce03b31d fixed some memory zone issues 2012-10-10 15:17:46 +02:00
Jan Steemann a08b5ac230 remove configure option --enable-lock-check. has done its purpose already 2012-10-10 14:21:25 +02:00
Jan Steemann 22c1252a4f moved some edge collection stuff to edge-collection.* 2012-10-10 14:05:06 +02:00
Jan Steemann 95ff3178a6 remove useless includes 2012-10-10 12:39:10 +02:00
Jan Steemann dca19fcd32 move edge-related functionality to file of its own 2012-10-10 11:42:52 +02:00
Jan Steemann 6847caac80 changed misleading member name (secondaryIndexes => allIndexes) 2012-10-10 11:24:36 +02:00
Jan Steemann 29b1877abd removed createHeader and updateHeader dynamic functions 
Those are only necessary in the document collection and the document collection can safely call its own static functions. no need for function pointers
 2012-10-09 16:59:02 +02:00
Frank Celler f7c990ce1a Merge pull request #216 from jsteemann/issue213 
possible implementation for issue #213
 2012-10-09 07:51:15 -07:00
Oreste Panaia fbd74b3569 windows 2012-10-08 23:30:30 +08:00
Oreste Panaia ab15e33b89 memory mapped files extensions for windows 2012-10-08 17:17:03 +08:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Jan Steemann e51656767e possible implementation for issue #213 2012-10-04 15:04:20 +02:00
Jan Steemann 017965365a put arguments onto individual lines 2012-10-04 13:17:58 +02:00
Jan Steemann 134449d872 make the compiler happy when compiling with --disable-logger 2012-09-28 15:10:59 +02:00
Oreste Panaia 2a71a3c371 minor changes for windows compatability 2012-09-28 17:34:22 +08:00
a-brandt fe7f2f8079 ICU changes 2012-09-24 11:40:06 +02:00
Frank Celler e9b1e1c58f Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	3rdParty/mruby/include/mrbconf.h
	3rdParty/mruby/include/mruby.h
	3rdParty/mruby/include/mruby/array.h
	3rdParty/mruby/include/mruby/khash.h
	3rdParty/mruby/include/mruby/object.h
	3rdParty/mruby/include/mruby/variable.h
	3rdParty/mruby/mrblib/error.rb
	3rdParty/mruby/mrblib/print.rb
	3rdParty/mruby/src/array.c
	3rdParty/mruby/src/cdump.c
	3rdParty/mruby/src/class.c
	3rdParty/mruby/src/codegen.c
	3rdParty/mruby/src/error.c
	3rdParty/mruby/src/gc.c
	3rdParty/mruby/src/init.c
	3rdParty/mruby/src/kernel.c
	3rdParty/mruby/src/math.c
	3rdParty/mruby/src/numeric.c
	3rdParty/mruby/src/object.c
	3rdParty/mruby/src/parse.y
	3rdParty/mruby/src/pool.c
	3rdParty/mruby/src/proc.c
	3rdParty/mruby/src/range.c
	3rdParty/mruby/src/sprintf.c
	3rdParty/mruby/src/state.c
	3rdParty/mruby/src/string.c
	3rdParty/mruby/src/struct.c
	3rdParty/mruby/src/symbol.c
	3rdParty/mruby/src/time.c
	3rdParty/mruby/src/variable.c
	3rdParty/mruby/src/vm.c
	3rdParty/mruby/src/y.tab.c
	3rdParty/mruby/test/assert.rb
	3rdParty/mruby/test/t/array.rb
	3rdParty/mruby/test/t/exception.rb
	3rdParty/mruby/test/t/kernel.rb
	3rdParty/mruby/test/t/math.rb
	3rdParty/mruby/test/t/module.rb
	3rdParty/mruby/test/t/string.rb
	3rdParty/mruby/test/t/struct.rb
	3rdParty/mruby/test/t/time.rb
	3rdParty/mruby/tools/mirb/mirb.c
	3rdParty/mruby/tools/mruby/mruby.c
	Doxygen/arango-html.doxy
	Doxygen/arango.template
	Makefile.am
	Makefile.in
	UnitTests/HttpInterface/api-http-spec.rb
	aclocal.m4
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-query.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/V8Server/v8-vocbase.h
	arangod/VocBase/compactor.c
	arangod/VocBase/compactor.h
	arangod/VocBase/shadow-data.c
	arangod/VocBase/simple-collection.c
	arangod/VocBase/simple-collection.h
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
	arangoirb/MRClient/arangoirb.cpp
	config/compile
	config/depcomp
	config/install-sh
	config/missing
	configure
	js/actions/demo/geo.js
	js/actions/demo/hallo-world.js
	js/actions/system/api-collection.js
	js/actions/system/api-edges.js
	js/actions/system/api-system.js
	js/actions/system/documents.js
	lib/BasicsC/locks-posix.c
	lib/BasicsC/operating-system.h
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpCommTask.h
	lib/MRuby/MRLineEditor.cpp
	lib/MRuby/mr-utils.c
	m4/Makefile.doxygen
	m4/all-in-one.mruby
 2012-09-20 16:39:59 +02:00
Oreste Panaia bd8bebed86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 15:21:26 +08:00
Oreste Panaia 43ee2e1a58 unittests 2012-09-19 15:19:39 +08:00
a-brandt 3019983dc7 ICU changes 2012-09-18 10:41:37 +02:00
Oreste Panaia f5316acb9d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
 2012-09-17 22:40:12 +08:00
Oreste Panaia c7e5eae52d Added additional error numbers for bitarray index creation 2012-09-17 19:57:10 +08:00
Jan Steemann b8cc79296b some simplification 2012-09-17 12:15:01 +02:00
Jan Steemann 3d6dfb6042 indentation 2012-09-17 11:54:52 +02:00
Jan Steemann 76674bad52 moved primaryIndex and lock from document-collection to primary-collection 2012-09-17 11:43:48 +02:00
Jan Steemann 1ef037ce8c renamed indexes to secondaryIndexes 2012-09-17 09:54:12 +02:00
Jan Steemann 7c4b13f19d slightly simplified locking 2012-09-17 09:05:13 +02:00
Jan Steemann f7e98df4a3 removed unused error codes 2012-09-14 15:18:28 +02:00
Jan Steemann 07ccc2083b further renamings 2012-09-14 14:57:26 +02:00
Jan Steemann 1b1d7ba877 renamed simple_collection to document_collection 2012-09-14 14:46:37 +02:00
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
Frank Celler 49b19e4657 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	lib/BasicsC/terminal-utils-posix.c
	lib/BasicsC/terminal-utils.c
	lib/SimpleHttpClient/SimpleHttpResult.cpp
 2012-09-12 23:49:14 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Jan Steemann 1906f9c36b don't fail in case of EAGAIN rwlock acquisition, fixed locks error logging 2012-09-12 13:56:30 +02:00
Jan Steemann daa43b467a fixed dead-locking 2012-09-12 13:40:10 +02:00
Jan Steemann d670fbca5b issue #150, issue #188 2012-09-12 09:32:25 +02:00
Jan Steemann 9a58ffbb2d avoid deadlocking between synchroniser, compactor and data modification threads (e.g. POST /_api/document) 2012-09-12 09:07:51 +02:00
Jan Steemann 3ae11903e8 fixed a deadlock between compactor, synchroniser, and data modification threads (e.g. POST /_api/document) 2012-09-12 00:57:12 +02:00
Jan Steemann d4d2656364 no complaining about "lock" file 2012-09-11 18:11:27 +02:00
Jan Steemann b24ee5aab4 issue #194: potential race condition between creating and dropping collections 2012-09-11 17:15:46 +02:00
Jan Steemann b6c46979f5 downgraded write-lock to a read-lock 2012-09-11 16:31:13 +02:00
Jan Steemann 31676da1ff made deletion of cursors an atomic operation 2012-09-11 16:30:23 +02:00
Jan Steemann cfe44acda4 moved variable to top-level scope. otherwise bad(TM) things may happen 2012-09-11 10:45:47 +02:00
Jan Steemann 65fb4fa84f less long locking 2012-09-11 09:45:58 +02:00
Jan Steemann 41bdeeecdd minor message change 2012-09-11 08:54:52 +02:00
Jan Steemann 4587d5db3c added configure option --enable-lock-check 2012-09-10 18:17:57 +02:00
Jan Steemann 336195dff5 more verbosity in trace mode 2012-09-10 18:15:16 +02:00
Oreste Panaia f93eef34d7 git 
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	lib/ShapedJson/json-shaper.c
 2012-09-10 20:53:41 +08:00
Jan Steemann c0268ce475 try to avoid duplicate read-locking from AQL queries 2012-09-10 14:44:29 +02:00
Oreste Panaia 6134497b5d Merge https://github.com/triAGENS/ArangoDB into devel 2012-09-10 20:42:48 +08:00
Oreste Panaia 8847d87580 added limited AQL support for bit indexes 2012-09-10 20:42:14 +08:00
Jan Steemann fde8af7b2f do not ignore out of memory 2012-09-07 17:46:32 +02:00
Jan Steemann 6a17f7c1e8 do not ignore out-of-memory 2012-09-07 17:44:19 +02:00
Jan Steemann 559b0f9767 do not ignore oom cases 2012-09-07 17:43:00 +02:00
Jan Steemann 451487fd68 fixed locking issues 2012-09-07 17:24:47 +02:00
Jan Steemann 112019c7e2 fixed some locking issues 2012-09-07 17:18:16 +02:00
Jan Steemann 7626972890 issue #155 2012-09-06 17:48:06 +02:00
Jan Steemann 2072bb6fb8 improved debug logging and early deletion of cursor 2012-09-06 17:46:15 +02:00
Jan Steemann 743efe30a7 some minor cleanups 2012-09-06 14:03:07 +02:00
Jan Steemann 7a20b188ba issue #188 2012-09-06 13:35:01 +02:00
Jan Steemann 37914fcf34 issue #188, issue #150: introduce periodic garbage collection for V8 contexts, fix issue with server-side cursor refcounts 2012-09-06 11:37:01 +02:00
Jan Steemann 22f860d9db some obvious cleanups 2012-09-06 10:03:11 +02:00
Jan Steemann c973adc724 reduce log file spamming in case when running out of file descriptors 2012-09-05 16:56:07 +02:00
Jan Steemann 6a4c9c1c07 fixed potential crash when parameter file cannot be created 2012-09-05 11:43:57 +02:00
Jan Steemann 55907a5548 fixed potential crash when parameter file cannot be created 2012-09-05 11:42:23 +02:00
Jan Steemann 0712114f27 fixed potential crash in case parameter file cannot be created 2012-09-05 11:41:34 +02:00
Jan Steemann febd5bfa8e removed member TRI_doc_mptr_t->_document 2012-09-04 13:20:01 +02:00
Jan Steemann 95db9cf429 removed some dead code 2012-09-04 10:05:36 +02:00
Jan Steemann c1ebdabcf3 renamed blob_collection to shape_collection 2012-09-04 09:32:18 +02:00
Jan Steemann 9ff624c2d2 had to change collection version from 1 to 2 because the "status" attribute now may have a different meaning than before 2012-09-03 17:09:25 +02:00
Jan Steemann 64cb6d63e0 removed attachment collection type 2012-09-03 16:56:13 +02:00
Jan Steemann e40b84d33e fixed typos in documentation 2012-09-03 16:37:44 +02:00
Jan Steemann 67dd26fcef removed previous implementation of attachments 2012-09-03 16:21:47 +02:00
Oreste Panaia d632fb820b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-03 17:09:00 +08:00
Oreste Panaia b7d239f629 draft index interface 2012-09-03 17:05:39 +08:00
Frank Celler 8b34bbb9de fixed permission 2012-08-31 08:59:59 +02:00
Jan Steemann ed395ab8ce issue #153 2012-08-28 13:06:04 +02:00
Jan Steemann b8e7d5634d issue #153: edge collection should be a flag for a collection 2012-08-28 10:48:24 +02:00
Jan Steemann 36add37fae added markers for attachments, but they are still unused 2012-08-27 14:12:14 +02:00
Jan Steemann 2e32fe9c2f added comments 2012-08-27 13:53:38 +02:00
Jan Steemann 04cacc4e32 fixed a typo in a comment 2012-08-27 13:51:39 +02:00
Jan Steemann d55807aa83 fixed an out of memory case 2012-08-21 16:59:52 +02:00
Jan Steemann 1126c8fa06 issue #163 2012-08-21 14:19:45 +02:00
Jan Steemann ff973f399c issue #163 2012-08-21 13:04:39 +02:00
Jan Steemann 2c50c51e12 issue #163: remove dangling temp file so collections can be created 2012-08-21 13:02:22 +02:00
Jan Steemann 291d3fbc64 issue #108: speed up truncate operation 2012-08-20 11:13:01 +02:00
Jan Steemann ea863bdf70 issue #152: fix memleak for barriers 2012-08-14 16:03:12 +02:00
Jan Steemann 8a1e88c3c1 issue #152: fixed memleak for barriers 2012-08-14 15:14:18 +02:00
Jan Steemann ea186b8671 issue #151: fixed memleak 2012-08-14 14:21:03 +02:00
Jan Steemann ee63680c57 issue #151: memleak when compactifying collections 2012-08-14 10:34:05 +02:00
Jan Steemann 96bec65c36 avoid additional sync() calls when writing partial shape data (attribute data) to disk. sync() can still be called when the shape marker is written to disk (will come after all attributes are written). 2012-08-10 12:10:53 +02:00
Jan Steemann 43b7ea951a issue #147: added --database.force-sync-shapes option 2012-08-09 19:25:39 +02:00
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
 2012-08-09 15:25:29 +02:00
Frank Celler 5e84fb02e8 added reference to caller 2012-08-08 15:32:54 +02:00
Jan Steemann 982781ec3e reduced sleep intervals 2012-08-08 14:51:00 +02:00
Jan Steemann 2ac79d2298 added TODO marker 2012-08-08 09:55:18 +02:00
Jan Steemann c5addc1020 added TODO markers for OOM cases 2012-08-08 09:48:03 +02:00
Frank Celler 250eee38cc Merge pull request #140 from jsteemann/index 
issue #136: adjusted message during indexing
 2012-08-07 07:48:09 -07:00
Jan Steemann 3d53f45d57 removed some TODO markers by handling some out of memory situations 2012-08-07 10:03:21 +02:00
Jan Steemann d0c9469dd9 issue #136: adjusted message during indexing 2012-08-06 18:14:57 +02:00
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
 2012-08-02 17:17:36 +02:00
Oreste Panaia b798b1d53f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
 2012-08-02 15:28:49 +08:00
Oreste Panaia 03cce62c3a bitarray index now support explicit values 2012-08-02 15:20:43 +08:00
Frank Celler 325a4d59bb datafile check 2012-07-28 20:57:03 +02:00
Frank Celler 818b6d9ec2 datafile debugger 2012-07-28 09:32:45 +02:00
Jan Steemann eeeb78c2e7 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Installation/arangod.conf.in
	Makefile.in
	arangod/Makefile.files
	arangod/RestHandler/RestBatchHandler.cpp
	arangod/RestHandler/RestBatchHandler.h
	arangod/RestServer/ArangoServer.cpp
	bin/arango-password.in
 2012-07-26 12:03:03 +02:00
Jan Steemann 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
Frank Celler b2a334a063 added datafile map for collection 2012-07-25 20:56:34 +02:00
Frank Celler 5aacb31226 removed TRI_IndexSimCollection (locking was broken for this function) 2012-07-25 16:47:50 +02:00
Frank Celler 041eb53b10 Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangoirb/MRClient/arangoirb.cpp
	lib/GeneralServer/GeneralServer.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/HttpsServer/ApplicationHttpsServer.cpp
 2012-07-24 22:19:46 +02:00
Frank Celler f126016484 added ExtractShapedJsonVocShaper 2012-07-16 15:42:41 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler b1aac93853 fixed warnings 2012-07-14 23:18:33 +02:00
Frank Celler 191b1338fe issue #98: Unable to change journalSize 2012-07-11 13:42:17 +02:00
Frank Celler e455348032 added --database.wait-for-sync 2012-07-10 16:34:06 +02:00
Frank Celler de187b1625 added wake-up call for synchroniser 2012-07-10 15:06:34 +02:00
Frank Celler 4c517c6d3c removed exec flag 2012-07-10 10:46:20 +02:00
Frank Celler 08ff930154 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-07-09 14:24:38 +02:00
Frank Celler 1fe03464c2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.1 2012-07-05 15:42:12 +02:00
Oreste Panaia 67d6b7fca0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-07-05 13:59:46 +08:00
Oreste Panaia c72f44c949 Bitarray indexes update 2012-07-05 13:59:26 +08:00
Jan Steemann ef01fa3c4e added OOM guard 2012-07-04 13:50:35 +02:00
Jan Steemann fe1ac7aebb issue #121: added more output to the figures() API call 2012-07-04 12:15:16 +02:00
Jan Steemann 570b47f649 honor option --database.maximal-journal-size 2012-07-03 17:09:35 +02:00
Frank Celler d3e2bca5ff Merge branch 'master' of github.com:fceller/ArangoDB into 1.1-stat 2012-07-02 18:47:33 +02:00
Frank Celler 237968ba26 cosmetics 2012-07-02 18:44:03 +02:00
Frank Celler 4e82d631c2 fixed memleak 2012-07-01 14:34:03 +02:00
Oreste Panaia 4ea30529ba Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-06-29 14:28:10 +08:00
Oreste Panaia 2e3b6531c8 Some fixes for bitarray indexes 2012-06-29 14:27:30 +08:00
Jan Steemann c4db88bdea fixed doxygen errors 2012-06-27 13:22:40 +02:00
Oreste Panaia a9f9c3af55 trying to upload bitarrays 2012-06-27 14:21:21 +08:00
Oreste Panaia 43309908ec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/RestServer/ArangoServer.cpp
	configure
 2012-06-26 20:41:04 +08:00
Oreste Panaia 20bbdab435 Bitarray index first draft 2012-06-26 20:05:49 +08:00
Frank Celler 4e6f4a74a6 fixed memory leaks 2012-06-22 13:38:55 +02:00
Jan Steemann 0bb547b8f9 call UpdateTickVocbase() for both document and revision id 2012-06-22 12:45:08 +02:00
Jan Steemann 5a74e95f35 allow reusing ids and revision when creating collections and documents 2012-06-19 15:50:52 +02:00
Frank Celler 0c9683fb8d Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.in
 2012-06-14 15:04:33 +02:00
Oreste Panaia 9949c9e75c renamed sl-operator.c and sl-operator.h to index-operator.c and index-operator.h respectively 2012-06-14 10:04:41 +08:00
Frank Celler 79449d5d71 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
 2012-06-13 11:40:35 +02:00
Frank Celler 73e50d932f added name for pthreads 2012-06-13 00:12:45 +02:00
Jan Steemann 4ec362fc8f some optimiser stuff 2012-06-12 09:36:58 +02:00
Jan Steemann efd48664ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	Ahuacatl/ahuacatl-statement-dump.c
	Ahuacatl/ahuacatl-statement-dump.h
	Ahuacatl/ahuacatl-statementlist.c
	Ahuacatl/ahuacatl-tree-dump.c
	Ahuacatl/ahuacatl-tree-dump.h
	Ahuacatl/ahuacatl-tree-walker.h
	Makefile.files
	Makefile.in
	arangod/Ahuacatl/ahuacatl-tree-dump.c
	arangod/Ahuacatl/ahuacatl-tree-dump.h
	arangod/Ahuacatl/ahuacatl-tree-walker.c
	arangod/Ahuacatl/ahuacatl-tree-walker.h
 2012-06-08 17:34:20 +02:00
Frank Celler 313c3c31ed Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/V8Client/arangosh.cpp
 2012-06-08 15:13:01 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00