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

640 Commits

Author SHA1 Message Date
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann edc71e5424 support for deflate compression 2013-08-28 11:44:49 +02:00
Jan Steemann b94ee1042c cppcheck 2013-08-27 16:13:44 +02:00
Jan Steemann 08f09a6bc7 do not flush log messages after initialisation 2013-08-27 13:26:00 +02:00
Jan Steemann 3efd6f46af change signatures of static functions 2013-08-27 12:17:49 +02:00
Jan Steemann fb76008108 added TRI_WriteFile convenience function 2013-08-27 12:17:19 +02:00
Jan Steemann 7b422e6f4a added convenience functions 2013-08-26 19:38:12 +02:00
Jan Steemann b2575376bc issue #582: ifdef'd unused feature 2013-08-21 12:56:04 +02:00
Jan Steemann 3871fb7af3 improved error messages 2013-08-20 11:48:08 +02:00
Jan Steemann 1a6f3c2981 added new error codes 2013-08-20 11:12:08 +02:00
Jan Steemann 5056512a37 mimetypes for fonts 2013-08-20 10:03:38 +02:00
Jan Steemann 01bc494493 merged single commits by @guidoreina 2013-08-19 10:02:37 +02:00
Guido Reina 011117edee In the function: TRI_LocateBinaryPath(), "binaryPath" was duplicated from "dir" and then "dir" freed. Better just to assign to "binaryPath" the result of TRI_Dirname(). 2013-08-16 06:55:43 +02:00
Guido Reina 72c8847324 In the function: RemoveAllLockedFiles(void), if we call TRI_RemoveVectorString() and TRI_RemoveVector() the next elements in the vector will be memmoved to the left. The next iteration of the loop will check the element at position 1 (but we are skipping the new element at position 0), so these calls have been removed. 
The other alternative would be to have a loop: while (FileNames._length > 0) and take always the element at position 0. But this has the disadvantage that we are performing memmove() when later the vectors will be freed anyway.
 2013-08-15 18:36:41 +02:00
Guido Reina 5da5715fa9 Merge branch 'experiment' of https://github.com/guidoreina/ArangoDB into experiment 2013-08-13 20:07:17 +02:00
Guido Reina a371aac4af In the function TRI_StringInt8InPlace, when attr == INT8_MIN, it was copying only 4 bytes instead of 5 and it was returning 3 instead of 4. 2013-08-13 20:02:25 +02:00
Jan Steemann 5f1bfcf9cd documentation for replication 2013-08-02 15:28:30 +02:00
Jan Steemann 1fc1bb108d added replication client tests 2013-08-02 11:45:55 +02:00
Jan Steemann 48fbdb1b6a cap constraint for replication logger 2013-07-31 16:56:56 +02:00
Jan Steemann 936fb6c6a6 better progress reports for replication applier 2013-07-31 10:01:56 +02:00
Jan Steemann 002ebd48bc removed all replication conditionals 2013-07-30 13:16:37 +02:00
Jan Steemann ec6792e11e added authentication 2013-07-28 16:02:21 +02:00
Jan Steemann 08b9f57166 stoppable replication applier 2013-07-17 10:58:10 +02:00
Oreste Panaia 2d4a26e29d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-16 16:17:40 +08:00
Jan Steemann cdbcf71411 removed superfluous space 2013-07-15 17:48:44 +02:00
Oreste Panaia b4acec0fe6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-15 22:54:38 +08:00
Jan Steemann b5e26235a7 replication configuration 2013-07-12 17:37:24 +02:00
Oreste Panaia b8163e79c4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-12 22:40:37 +08:00
Jan Steemann 98dd1c2522 moved replication parts into separate files 2013-07-11 14:44:09 +02:00
Jan Steemann 80362ec82f fixed issues reported by cppcheck 2013-07-11 10:02:27 +02:00
Jan Steemann 3f718ef0fa fixed some issues in replication 2013-07-10 18:08:18 +02:00
Jan Steemann ca6b184286 added TRI_JSON_STRING_REFERENCE 2013-07-10 17:00:29 +02:00
Jan Steemann 7ef7ad297f added TRI_StealStringBuffer() 2013-07-10 12:02:42 +02:00
Jan Steemann 3cc4405c18 added collection.checksum() 2013-07-10 11:10:00 +02:00
Jan Steemann c6ff61b159 added new error code 2013-07-09 12:33:10 +02:00
Jan Steemann 4c952ad927 added unit tests 2013-07-09 12:32:47 +02:00
Jan Steemann 48d851bb7b log dump 2013-07-08 16:33:47 +02:00
Oreste Panaia 752a60025c merge conflicts 2013-07-08 16:47:39 +08:00
Oreste Panaia a7661542a2 windows 2012 fixes 2013-07-08 16:44:32 +08:00
Jan Steemann 054ed3ca3f apply collection data dumps 2013-07-05 11:41:37 +02:00
Jan Steemann 230f0ddcc3 added errors 2013-07-04 15:51:24 +02:00
Jan Steemann f5968a4646 handle a master's state response 2013-07-04 10:13:09 +02:00
Jan Steemann 44c9ca4e90 issue #565, plus a few usability fixxes for aal.search() 2013-07-03 14:06:57 +02:00
Jan Steemann e34566aa68 messed it up and fixed it 2013-07-03 13:06:20 +02:00
Jan Steemann cf04fcfc44 memory size restrictions 2013-07-03 13:01:01 +02:00
Jan Steemann c5cbfdb3e6 indentation 2013-07-03 12:40:12 +02:00
Jan Steemann 74489d9f93 OOM handling 2013-07-02 17:33:31 +02:00
Jan Steemann a35de51042 handle OOM 2013-07-02 17:19:03 +02:00
Jan Steemann d2b12968e0 avoid usage of NULL pointer 2013-07-02 17:09:44 +02:00
Jan Steemann 00b5970bfc check for NULL values 2013-07-02 17:08:27 +02:00
Jan Steemann d7561e70e1 added logging options 2013-07-02 12:16:13 +02:00
Jan Steemann 2e063df6c1 fixed some zone debugging output 2013-06-29 00:10:41 +02:00
Jan Steemann 64f01e9a7b prevent logging deadlock 2013-06-28 19:14:33 +02:00
Jan Steemann 1f68cb50a0 replaced LOG_ERROR with fprintf to not run into logging deadlock 2013-06-28 19:04:56 +02:00
Jan Steemann 6e9c3e8e2c replication logging 2013-06-26 12:04:55 +02:00
Jan Steemann b0acfba634 less faults when server cannot start 2013-06-25 09:56:09 +02:00
Jan Steemann 191d389e8c a few mallocs less 2013-06-24 20:55:12 +02:00
Jan Steemann 315848c93c typo 2013-06-24 20:52:43 +02:00
Jan Steemann 0f7c632f0f less strlen 2013-06-24 17:31:37 +02:00
Jan Steemann 2d7edbef96 added db._exists() 2013-06-21 21:50:00 +02:00
Jan Steemann 8063ade2be fixed issues reported by cppcheck 2013-06-21 19:40:57 +02:00
Jan Steemann ee2de60670 less syscalls in logging, do not use file-logging in tests 
file-based logging creates a problem with Valgrind 3.8.1 for `make unittests-http-server VALGRIND=valgrind` on OpenSuse 64 bits, -O2
 2013-06-21 16:05:58 +02:00
Jan Steemann b1f243d296 fixed segfault for too big shapes, make shape collection filesize adaptive 2013-06-20 19:14:14 +02:00
Jan Steemann 9599a021b9 moved some graph traversal validation into the traversal module 
- that simplifies some of the traversal-calling routines
- make returning error codes more consistent (specific 404 errors when
referring to unknown collections instead of simple 400 errors)
- optionally limit traversals to a certain number of iterations so they
  don't run endlessly in cyclic graphs
 2013-06-12 17:04:47 +02:00
Oreste Panaia 35ab2e6f62 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-10 17:05:58 +08:00
Oreste Panaia 8e10a5e173 windows updates 2013-06-10 17:05:33 +08:00
Jan Steemann d31573a8b4 fixed a few type issues, updated TODOs 2013-06-07 11:31:42 +02:00
Oreste Panaia 2afd8a742c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-05 19:53:25 +08:00
Oreste Panaia 8a95c1c2a8 update 2013-06-05 19:52:34 +08:00
Guido Reina 7decf1560a TRI_CreateRecursiveDirectory returns an int, but the function prototype says it returns a bool (the return code is not checked in the source code, so it is not a problem). 2013-05-26 18:44:35 +02:00
Guido Reina 0331ff7993 Typo. 2013-05-26 18:16:36 +02:00
Guido Reina 6ec2014052 dst->length is set again afterwards. 2013-05-26 18:04:46 +02:00
Oreste Panaia 70bc62a5a5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-05-21 17:47:22 +08:00
Oreste Panaia b764b4f71e extended errors for skiplist 2013-05-21 17:45:19 +08:00
Jan Steemann d7b64d4ae2 merged patches by @guidoreina 2013-05-21 11:33:43 +02:00
Jan Steemann ed77c19e16 added derived file 2013-05-17 15:59:58 +02:00
Jan Steemann c59f00efa8 fixed handling of --temp-path 2013-05-15 15:55:48 +02:00
Jan Steemann 35f3711d08 less realloc 2013-05-13 21:48:09 +02:00
Jan Steemann 06fb9eacd7 fixed wrong size calculation 2013-05-13 09:23:23 +02:00
Jan Steemann c7d2f8f8cd some json / shaped-json and string handling improvements 2013-05-13 09:01:07 +02:00
Jan Steemann 8d329e3ab0 removed some redundant code 2013-05-13 08:59:52 +02:00
Jan Steemann 5b94d9af98 less malloc/free for JSON parsing 2013-05-08 23:32:14 +02:00
Jan Steemann 6740db7207 fix different resident set size report units 2013-05-08 19:10:49 +02:00
Jan Steemann d40f96d8e9 fixed potential memleaks 2013-05-08 18:02:10 +02:00
Jan Steemann eb8325ef34 fixed typo in error message 2013-05-08 11:10:34 +02:00
Jan Steemann 203aceccdf Merge pull request #510 from guidoreina/experiment 
A bug fix and small code improvements?
 2013-05-05 23:51:49 -07:00
Guido Reina 2f4319b31a [Small improvements] In the function ResizeAssociativeArray(), array->_table is already initialized to '\0's, so there is no need to call clearElement() for each element. 
An associative array is only used by PQIndex and MasterTable_t.
For PQIndex the function ClearElementPQIndex() will be used, which sets the whole element to '\0's.
For MasterTable_t the function tablePositionClearElement() will be used, which sets all but one field to 0/NULL (the only field which is not set is _vectorNum).
If the clearElement() should be called, maybe TRI_Allocate() could be called with false, to avoid double initialization.
When copying elements, the for loop stops when the number of elements is the same as the original number of elements.

In the function TRI_FindByKeyAssociativeArray(), there is no need to check whether the element is not empty and is equal key element, only if it is not empty (as it is done in the function TRI_InsertKeyAssociativeArray()).
In the function TRI_FindByElementAssociativeArray(), there is no need to check whether the element is not empty and is equal element element, only if it is not empty (as it is done in the function TRI_InsertElementAssociativeArray()).
 2013-05-05 18:10:37 +02:00
Guido Reina 4ac19a99fc Typos. 2013-05-05 16:12:17 +02:00
Frank Celler 51cefb18bf fixed issue 505: statistics not populated on MacOS 
Conflicts:
	CHANGELOG
 2013-05-04 21:54:22 +02:00
Jan Steemann ee7ab712d6 issue #495 2013-05-03 11:08:58 +02:00
Frank Celler f85b1c5a21 Merge pull request #499 from guidoreina/experiment 
Minor changes
 2013-05-01 05:27:07 -07:00
Guido Reina 4c5494c67d In the functions TRI_VerifyLockFile (Linux and Windows), the buffer 'buffer' was initialized to 0 right before calling TRI_UInt32String(), making TRI_UInt32String() return always 0, instead of the PID. 2013-05-01 11:05:20 +02:00
Oreste Panaia 115d87196c sync windows dev 2013-04-29 23:13:06 +08:00
Oreste Panaia c42c0bf565 sync dev for windows 2013-04-29 21:49:28 +08:00
Oreste Panaia 532c7eae8e windows dev update 2013-04-29 21:24:57 +08:00
Oreste Panaia ee339ffd9f windows 1.3 changes 2013-04-23 19:03:08 +02:00
Oreste Panaia 1ddbd2e4d9 update 2013-04-23 19:02:46 +08:00
Oreste Panaia b83d90f021 skiplist transaction support 2013-04-23 18:56:26 +08:00
Jan Steemann 8ea6915b55 added IndexedPropertyGetter for ShapedJson 2013-04-19 11:35:55 +02:00
Jan Steemann b667e458fc fixed error messages 2013-04-16 11:55:17 +02:00
Jan Steemann f6c4589852 fixed type 2013-04-16 11:39:07 +02:00
Jan Steemann dee5adb9f5 added client side API for transactions 2013-04-12 23:18:48 +02:00
Jan Steemann 9b5849f650 updated documentation 2013-04-12 00:42:02 +02:00
Jan Steemann 229893c086 documentation for transactions 2013-04-12 00:03:05 +02:00
Jan Steemann b6925a7b7b transactions 2013-04-11 19:06:55 +02:00
Jan Steemann 7f1cd2681c added functions to add to front 2013-04-10 08:50:49 +02:00
Jan Steemann 5f5ee7e5e1 added error code 2013-04-10 08:50:13 +02:00
Frank Celler a0278476da Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	lib/Basics/StringUtils.cpp
 2013-04-06 10:19:09 +02:00
Frank Celler 1d7ee507e2 added TRI_ERROR_ARANGO_DOCUMENT_KEY_MISSING 2013-04-06 10:18:29 +02:00
Jan Steemann edf513551f error handling 2013-04-05 15:35:08 +02:00
Jan Steemann ed10d9b6aa AQL user functions 2013-04-05 12:50:44 +02:00
Jan Steemann 1417def879 disallow create/drop/rename operations inside transactions 2013-04-04 09:41:44 +02:00
Jan Steemann f7a5cf4cf3 transactions 2013-04-03 14:40:23 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Frank Celler 42b92c794f fixed error messages and tests 2013-04-02 17:46:19 +02:00
Frank Celler 31a9a71050 fixed unzip and create of parent directory 2013-03-28 20:31:04 +01:00
Jan Steemann 007cae87e6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-28 14:42:19 +01:00
Jan Steemann ba0d608a25 renamed function 2013-03-28 14:13:11 +01:00
Lucas Dohmen f1b5f20fab Foxx: Also using ArangoDB Mimetype Lookup for the other way around 2013-03-28 14:01:04 +01:00
Lucas Dohmen 8261a46577 Added a Mimetype 2013-03-28 13:25:30 +01:00
Jan Steemann 3fd4fd984b mimetypes w/ charsets 2013-03-27 10:31:30 +01:00
Jan Steemann 909c316e22 added mimetype generation file 2013-03-27 10:11:56 +01:00
Jan Steemann 1492118545 added test cases for "fs" module 2013-03-26 14:09:20 +01:00
Jan Steemann 75d2d05b04 added comment 2013-03-24 18:58:05 +01:00
Jan Steemann 124d7cb29f fixed file uploads 2013-03-24 18:13:13 +01:00
Jan Steemann 071144ecc0 temporary file functons 2013-03-24 14:32:09 +01:00
Jan Steemann d9595caaf5 added upload API 2013-03-24 13:17:50 +01:00
Jan Steemann f58e1a4b9a sendFile 2013-03-24 11:44:29 +01:00
Jan Steemann 91fbb454f3 added zipFile() 2013-03-23 22:32:59 +01:00
Jan Steemann d97954e466 unzip 2013-03-23 20:52:33 +01:00
Jan Steemann 5cf913b2ca zlib 2013-03-23 19:13:31 +01:00
Jan Steemann 0d2fdcae58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/bootstrap/module-fs.js
 2013-03-23 14:36:45 +01:00
Frank Celler 8a54df7419 added .arangosh.rc, added /_admin/execute 2013-03-23 14:04:08 +01:00
Frank Celler 734a0350e4 fixed wrong cast 2013-03-19 14:17:29 +01:00
Jan Steemann 95d78faa3c fixed doxygen errors 2013-03-18 20:07:31 +01: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 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 312b5fda64 some refactoring of document CRUD operations 2013-03-15 17:58:56 +01:00
Frank Celler 71fbdf87cd Mac fixes 2013-03-15 15:46:17 +01:00
Frank Celler b0fc77d83d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-15 11:37:59 +01:00
Frank Celler c773a0e825 replaced union by CONST_CAST 2013-03-15 11:37:49 +01:00
Oreste Panaia c8ea7ddc8b prepartion for skiplist transactions 2013-03-15 18:26:15 +08:00
Oreste Panaia 36733eb19f preparation for skiplists supporting transactions 2013-03-15 18:12:20 +08:00
Jan Steemann 12a0bc787c empty string optimisations 2013-03-14 16:41:28 +01:00
Jan Steemann ab14179ee7 made fsync configurable when writing json files 2013-03-14 12:33:25 +01:00
Frank Celler 891cac01b2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/VocBase/collection.c
 2013-03-13 17:05:59 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Achim Brandt eb8855d37a removed <mach/shared_memory_server.h> for MacOSX 2013-03-12 16:54:45 +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 1a7e6b2d5b colorize! 2013-03-08 18:36:11 +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 1ea4c1c4b0 issue #443 2013-03-08 15:16:29 +01:00
Jan Steemann 0a883f4076 merged some changes from trx branch into devel 2013-03-08 14:22:25 +01:00
Jan Steemann b307e4cd6d completed auto-increment key generator 2013-03-08 10:51:50 +01:00
Jan Steemann 092327058b potential solution for #438 (non-windows) 2013-03-07 10:50:40 +01:00
Jan Steemann a73d32c553 initialise lists to the correct size 2013-03-07 00:46:27 +01:00
a-brandt 18c05bdac6 added session errors 2013-03-06 14:05:42 +01:00
Frank Celler dd96bb4abd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-03 22:40:55 +01:00
Frank Celler 7abeda64b8 fixed process statistics for MacOSX 2013-03-01 13:37:44 +01:00
Oreste Panaia 586a10ef2c final merge errors 2013-03-01 18:19:30 +08:00
Oreste Panaia 0f5717cd61 more merge conflicts fixes 2013-02-28 21:36:14 +08: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 ebc653a0bd issue #435 2013-02-26 12:11:13 +01:00
Jan Steemann cd6c4c99a5 adjust log buffers for frontend 
now the log level & date are not redundantly stored in the log message
 2013-02-23 01:29:51 +01:00
Jan Steemann 8e5919b597 return error if oom 2013-02-23 01:16:21 +01:00
Jan Steemann 81f79315d1 removed configure option --enable-zone-debug 2013-02-22 15:54:14 +01:00
Oreste Panaia 9e69106c90 Merge branch '1.2' of https://github.com/triAGENS/ArangoDB into 1.2 2013-02-22 16:58:06 +08:00
Oreste Panaia ea601a23b3 Socket changes for windows libev 2013-02-22 16:51:13 +08:00
Frank Celler fe9f10af8d Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 
Conflicts:
	CHANGELOG
	Documentation/Manual/arangodb_1.2_shell_reference_card.pdf
	Makefile.in
	aclocal.m4
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/missing
	configure
	lib/JsonParser/json-parser.c
 2013-02-21 14:21:59 +01:00
Frank Celler 2553b572ab fixed mode 2013-02-21 14:14:20 +01:00
Jan Steemann 53b41e7832 get rid of Valgrind warnings due to libev re-alloc behavior 2013-02-20 19:33:32 +01:00
Jan Steemann e1da2c45fd added TRI_ShutdownMemory() to free core reserve on clean shutdown 2013-02-20 19:11:33 +01:00
Oreste Panaia 2c12f63d7f libev interface 2013-02-19 20:58:21 +08:00
Jan Steemann 4f37fada0d some mini-modifications for slightly higher throughput 2013-02-19 09:54:36 +01:00
Frank Celler 2ac556d0f1 changed default 2013-02-18 10:06:36 +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
Frank Celler 7b92dcc9bc fixed issue #405: 1.2 compile warnings 2013-02-15 11:57:35 +01:00
Frank Celler cf9a942417 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
 2013-02-15 11:52:53 +01:00
Frank Celler e4d1c8a6bd partly fix for issue #333: [debian] Group arangodb is not used when starting vie init.d script 2013-02-15 11:50:05 +01:00
Jan Steemann d321f32523 moved some const value out of loop 2013-02-15 11:35:48 +01:00
Jan Steemann 8b7a5d2649 slighty optimise duplicates check 2013-02-15 10:22:47 +01:00
Jan Steemann 637ed65e09 expose reserve function 2013-02-15 10:22:31 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Jan Steemann 332da75bcb fixed invalid number to string conversion for edge cases 2013-02-13 11:35:34 +01:00
Jan Steemann 8365c4294c small mods 2013-02-12 18:16:23 +01:00
a-brandt 6147a1d9c0 unset the escape codes for windows 2013-02-08 15:39:52 +01:00
Jan Steemann f16f88a2e6 added docs for CONTAINS(), added LIKE() 2013-02-06 11:40:45 +01:00
Jan Steemann 3fd6373c2f removed error 1520, replaced with standard error 1203 2013-02-04 23:04:37 +01:00
Jan Steemann 621f0dbb2c test remove 2013-02-01 10:49:18 +01:00
Jan Steemann ca0074f3c0 test add 2013-02-01 10:48:25 +01:00
Jan Steemann a36805857b test remove 2013-02-01 10:47:59 +01:00
Jan Steemann 089ac0a7b7 test add 2013-02-01 10:46:45 +01:00
Jan Steemann 5c55f6bf97 test remove 2013-02-01 10:46:09 +01:00
Jan Steemann e489c7380c test 2013-02-01 10:43:56 +01:00
Jan Steemann 8330f2d12a test 2013-02-01 10:33:24 +01:00
Jan Steemann 767c4fb3bb test 2013-02-01 10:31:28 +01:00
Jan Steemann 4f4e0e7a9a test 2013-02-01 10:27:28 +01:00
Jan Steemann 8b523873d5 test 2013-02-01 10:26:24 +01:00
Jan Steemann 8927da8020 test 2013-02-01 10:24:53 +01:00
Jan Steemann 424d284961 test 2013-02-01 10:20:25 +01:00
Jan Steemann 98e8e24604 test 2013-02-01 10:18:59 +01:00
Jan Steemann d9b572bfb0 test 2013-02-01 10:16:21 +01:00
Jan Steemann e9ff3b7749 test 2013-02-01 10:14:59 +01:00
Jan Steemann bae7bfd588 test 2013-02-01 10:14:01 +01:00
Jan Steemann ee3c534b7f test 2013-02-01 10:12:28 +01:00
Jan Steemann 9b7245373f test commit 2013-02-01 09:26:22 +01:00
Jan Steemann d43e9b89ca issue #381: lifted restrictions on usernames 2013-01-31 13:20:39 +01:00
Oreste Panaia 741510e8cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 17:33:36 +08:00
Jan Steemann 2d7f0a7979 removed an unnecessary file 2013-01-31 10:33:16 +01:00
Jan Steemann 8d501f75e4 test commit hook 2013-01-31 10:30:43 +01:00
Jan Steemann 2c82dae6d8 test commit hook 2013-01-31 10:30:19 +01:00
Oreste Panaia 95f6b0dc9c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 16:22:41 +08:00
Jan Steemann 843453a76c test for infinite values to prevent endless while loops in number value printing 2013-01-30 19:26:43 +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 fe74508299 return a hard-coded string in case no error message is known for a particular error 2013-01-30 16:44:25 +01:00
Jan Steemann 47ad5e1139 removed dead configure option for 1.2 2013-01-30 13:19:20 +01:00
Jan Steemann 9773a88cf9 prevent endless loops for inf double values being appended to string buffer 2013-01-29 12:07:30 +01:00
Jan Steemann ac12e98480 wrong type for thread id. this caused potentially wrong thread ids on 32 bits... 2013-01-26 01:35:40 +01:00
Jan Steemann 17530a5e45 added number of shapes in return value of figures() 2013-01-25 10:19:02 +01:00
Jan Steemann 5d093576e2 fix a few -pedantic errors 2013-01-23 08:58:54 +01:00
Oreste Panaia bb54d606ad Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-22 23:06:39 +08:00
Oreste Panaia c4f6465ee7 attempt to link icu libraries into arango 2013-01-22 23:04:16 +08:00
Jan Steemann 376c264281 take precautions to prevent issue #365 2013-01-22 11:58:08 +01:00
Jan Steemann f1fbb4796e fixed anonymous mmap for MacOS 2013-01-16 12:32:28 +01:00
Jan Steemann a20cb437e1 some macros for zone debug 2013-01-16 01:58:41 +01:00
Jan Steemann 6fde7e2f27 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-15 16:45:54 +01:00
Jan Steemann 7a6db16241 added db._version() 2013-01-15 16:44:48 +01:00
Frank Celler 244d258fe7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-15 15:51:32 +01:00
Frank Celler 7380ddfabe Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/V8Client/arangosh.cpp
	bin/arango32.msi
	bin/arango64.msi
	lib/BasicsC/win-utils.c
 2013-01-15 15:50:47 +01:00
Jan Steemann 4712e1637e optionally do not check element equality when inserting into the associative multi index 
this might speed up insertion a lot if we know that the same element cannot be in the index already
 2013-01-15 15:11:16 +01:00
Jan Steemann 682d22bfb0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-15 14:35:19 +01:00
Jan Steemann 2058700697 issue #353 2013-01-15 14:35:05 +01:00
Oreste Panaia c01a5c6275 arango shell and import 2013-01-14 20:16:09 +08:00
a-brandt c1fec4c5b0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-10 14:48:26 +01:00
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
 2013-01-09 15:30:21 +01:00
Oreste Panaia afa0268e70 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into 1.1 2013-01-09 22:23:46 +08:00
Oreste Panaia 9baae9c129 windows bug fixes 2013-01-09 22:23:35 +08:00
a-brandt 00a3d87bc4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-08 10:43:28 +01:00
a-brandt 8f9e2e51f9 libicu is mandatory now 2013-01-08 10:39:19 +01:00
Jan Steemann 876cda6ce1 cppcheck 2013-01-07 22:37:52 +01:00
Frank Celler 89a7cac605 added listTree 2013-01-05 22:45:09 +01:00
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
 2013-01-05 11:16:50 +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
Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1 
Conflicts:
	js/common/bootstrap/modules.js
 2013-01-03 18:57:18 +01:00
Frank Celler 114de14816 fixed duplicate 2013-01-03 17:16:25 +01:00