Michael Hackstein
9f3479f5b6
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
...
Conflicts:
utils/Makefile.files
2014-01-10 17:41:52 +01:00
Max Neunhoeffer
eb2afb2f04
Implement case distinction for create collection between cluster and not.
2014-01-03 16:17:34 +01:00
Frank Celler
84507cfc44
merged changes from 1.4 back to devel
2013-12-27 14:59:23 +01:00
Frank Celler
995a3b06da
work-around for program-suffix
2013-12-23 18:02:06 +01:00
Frank Celler
a3ecc7cd5b
fixed wrong type
2013-12-23 16:03:30 +01:00
Frank Celler
f5759fa1b6
Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4
2013-12-23 12:56:06 +01:00
Frank Celler
0a47caa535
fixed open mode for files
2013-12-23 12:12:13 +01:00
Frank Celler
36f29a573c
fixed TRI_Basename
2013-12-22 23:57:42 +01:00
Frank Celler
2f28530bcc
wrong prototype, wrong destroy
2013-12-22 15:41:15 +01:00
Frank Celler
9ac2e751c6
fixed wrong ifdefs and missing constructor for Logger
2013-12-22 14:58:51 +01:00
Frank Celler
e30725e22d
more file path normalisation
2013-12-22 13:27:33 +01:00
Frank Celler
9b49d60b0a
fixed concatenate files
2013-12-22 12:45:54 +01:00
Frank Celler
87cc2c4104
Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4
2013-12-21 13:10:15 +01:00
Frank Celler
12fcc9a025
added TRI_LocateInstallDirectory
2013-12-21 13:09:44 +01:00
Frank Celler
1ef596733d
arangosh now uses config file name corresponding to binary name
2013-12-20 23:49:16 +01:00
Frank Celler
2651f7bae5
added TRI_LocateInstallDirectory and TRI_LocateConfigDirectory
2013-12-20 10:39:50 +01:00
Frank Celler
b2d60817dd
added NL and CH
2013-12-19 17:18:29 +01:00
Frank Celler
a82ef8b1ea
fixed lock files for Windows
2013-12-19 11:26:38 +01:00
Jan Steemann
13bcc2bf7a
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
2013-12-11 18:39:10 +01:00
Jan Steemann
9e21cf9b7e
added configure option --enable-cluster
2013-12-10 14:46:16 +01:00
Frank Celler
86b7fea992
Vs2013
2013-12-07 18:55:55 +01:00
Frank Celler
f6b40b3395
added memchr and timezone for windows
2013-12-07 18:55:51 +01:00
Jan Steemann
2965accb05
add current state to agency
2013-12-06 14:23:02 +01:00
Jan Steemann
d3acf530da
re-added stuff that got lost yesterday
2013-12-05 10:26:21 +01:00
Jan Steemann
1306e0e651
committed generated file
2013-12-04 23:10:22 +01:00
Jan Steemann
44b3237882
moved server-only tests to js/server/tests
...
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work
make logfile path accessible
2013-12-04 22:05:00 +01:00
Jan Steemann
52f514b163
fixed doxygen error
2013-12-02 13:16:06 +01:00
Frank Celler
533a33d344
va_copy and inline are defined in 2013
2013-11-25 18:30:03 +01:00
Max Neunhoeffer
317304542a
Remove index garbage collector.
2013-11-25 10:57:23 +01:00
Jan Steemann
9a1aa7a4cc
removed superfluous error codes
2013-11-22 13:49:05 +01:00
Jan Steemann
0eeac02a91
removed unused error codes
2013-11-22 13:23:23 +01:00
Jan Steemann
ff648799fe
Fix a forgotten malloc and replace it with TRI_Allocate.
2013-11-22 12:28:07 +01:00
Max Neunhoeffer
3aa1b12a45
Merge branch 'skiplist-cleanup' into devel
...
This implements a considerable cleanup of the skip list index code:
- Replace implementation of skip lists by a generic one using
callbacks for comparisons
- The new implementation resides in lib/BasicsC/skip-list.*
- It uses a singly linked list (unidirectional) as opposed to the
previous implementation which used a doubly linked list
- Adjust skip list index code in arangod/SkipLists/skiplistIndex.* to
use the generic skip list implementation
- Unify unique skip lists and non-unique ones into one code base
- Cleanup in skip list index code, in particular with respect to
iterators
- Prepare the scene for sparse skip list indices
2013-11-22 10:47:04 +01:00
Jan Steemann
999fbaee23
added newline to log message
2013-11-21 16:42:16 +01:00
Jan Steemann
610f9a3cd7
added newline to log message
2013-11-21 16:16:09 +01:00
Jan Steemann
cbd2bbf2b1
fixed some multi-thread issues
2013-11-21 15:14:46 +01:00
Jan Steemann
1bdf666da2
fixed multi-threading issues found during commando
2013-11-21 15:12:49 +01:00
Jan Steemann
cf219d92d3
added debugSegfault
2013-11-20 13:15:45 +01:00
Max Neunhoeffer
822f9d37bd
Rename method name to TRI_SkipListGetNrUsed.
2013-11-20 11:09:28 +01:00
Max Neunhoeffer
1c56e87222
Export entry count for generic skip lists.
2013-11-20 11:07:31 +01:00
Frank Celler
f35347098b
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
2013-11-20 09:20:51 +01:00
Frank Celler
7738a5b35d
cosmetics
2013-11-20 09:20:26 +01:00
Jan Steemann
4e1028d791
fixed doxygen error
2013-11-20 01:50:53 +01:00
Jan Steemann
95c341e910
issue #662 : ArangoDB on Windows hanging
2013-11-19 16:35:14 +01:00
Jan Steemann
af6da9a652
issue #662 : ArangoDB on Windows hanging
2013-11-19 16:27:26 +01:00
Max Neunhoeffer
971ab55cdd
Add keys to the generic skip list implementation.
2013-11-19 15:02:20 +01:00
Max Neunhoeffer
95e6ebc3ac
Add a cmpdata entry for comparisons.
2013-11-19 11:54:45 +01:00
Frank Celler
9f8f4cd4fd
destroy can only be called if initialised
2013-11-18 18:40:13 +01:00
Frank Celler
b58347138f
destroy can only be called if initialised
2013-11-18 18:39:18 +01:00
Max Neunhoeffer
c8b8af36b2
Follow coding style guidelines a bit more. Add nrUsed count.
2013-11-18 16:46:56 +01:00