1
0
Fork 0
Commit Graph

39481 Commits

Author SHA1 Message Date
Jan Christoph Uhde 1ad5fde19e change mmfiles indexes to work with slightly changed API 2017-04-13 08:38:13 +02:00
baslr cfe5d1891f Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-12 20:42:18 +02:00
Michael Hackstein 94c7ac283b Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-12 17:28:01 +02:00
Michael Hackstein 5f33a95a82 Fixed AttribtueWeighted ShortestPath computation. 2017-04-12 17:27:45 +02:00
Simon Grätzer 3b3ee5f996 Counter fixes 2017-04-12 17:10:35 +02:00
jsteemann 93e3707a47 fixed issue #2422 2017-04-12 15:38:08 +02:00
jsteemann ac65ee6fc2 added assert 2017-04-12 15:38:01 +02:00
Dan Larkin d435d274ea Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-12 09:35:19 -04:00
baslr 399ce5fb90 options fix 2017-04-12 15:30:16 +02:00
mpv1989 d2fe5adbc9 Fix skiplist docs 2017-04-12 15:29:23 +02:00
Simon Grätzer d8c191600a Better log messages 2017-04-12 15:24:45 +02:00
Simon Grätzer 5df9867a7c removed unnecessary code 2017-04-12 15:23:35 +02:00
Simon Grätzer df7e7d3749 Forgotten code 2017-04-12 15:22:30 +02:00
Simon Grätzer d9510eee0b Fixing count 2017-04-12 15:22:18 +02:00
Jan Christoph Uhde 2700a6d79d fix rocksdb engine index reporting but break report for mmfiles engine 2017-04-12 14:50:55 +02:00
Andreas Streichardt f60a60a4b9 manually initialize logger 2017-04-12 14:48:31 +02:00
Michael Hackstein 034b38f0cc Replaced the velocypack ConstantDistance ShortestPath API by a StringRef & TraverserCache version. This should be save for RocksDB. This commit fails in ClusterMode. 2017-04-12 14:21:53 +02:00
baslr 966ea503c2 first ldap tests 2017-04-12 14:00:35 +02:00
Wilfried Goesgens 6887cdbb43 lean on the ICU_DATA env that arangosh exposes. 2017-04-12 13:53:21 +02:00
jsteemann 1d6793d4b0 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-12 13:53:03 +02:00
Wilfried Goesgens 24fca9974d run the tests one time without reporting to debug windows issue 2017-04-12 12:58:11 +02:00
Wilfried Goesgens b9bcf292d5 better filter when building windows test tarball 2017-04-12 12:16:09 +02:00
Wilfried Goesgens ccb2175904 exclude two testsuites to check whether this hinders jenkins 2017-04-12 11:15:38 +02:00
Simon Grätzer 1d90520a9d Updated counter manager 2017-04-12 09:58:01 +02:00
Jan Christoph Uhde afd5d92f19 update error messages 2017-04-12 09:25:59 +02:00
Jan Christoph Uhde ce77f4933a Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  Reenabled ShortestPath with AttributeWeight. Was accidentially disabled by options modifications.
2017-04-12 09:08:07 +02:00
Michael Hackstein 7469cc7bec Reenabled ShortestPath with AttributeWeight. Was accidentially disabled by options modifications. 2017-04-12 09:05:54 +02:00
Jan Christoph Uhde 11d7e11a45 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  Moved some Edge Lookup logic around and moved the EdgeCursor to it's own class. This is still ongoing work. Expect shortest-path to fail.
  Fixed a bug with SortedIndexes. Some sort functions for AstNodes ordered upperbounds before lower bounds. This caused the index iterator to ignore the upperbound in sparse index cases.
  ShortestPathOptions now contain forward and backward lookupinfos for all edge collections in use.
  The ShortestPathBlock and -Node now use a pointer to the same options instead of managing one each.
  Simplified AqlTraverser Setup code by moving shared logic into the TraverserOptions.
  Removed external expander functions and moved them into the PathFinder implementations.
2017-04-12 09:01:40 +02:00
Jan Christoph Uhde d67aa33fe3 limit transaction size and work on intermediate commits 2017-04-12 09:01:13 +02:00
Michael Hackstein c2be40b4ab Moved some Edge Lookup logic around and moved the EdgeCursor to it's own class. This is still ongoing work. Expect shortest-path to fail. 2017-04-11 18:03:56 +02:00
Michael Hackstein 3cb9f0b805 Fixed a bug with SortedIndexes. Some sort functions for AstNodes ordered upperbounds before lower bounds. This caused the index iterator to ignore the upperbound in sparse index cases. 2017-04-11 17:57:59 +02:00
Wilfried Goesgens 839d44de80 another place where we need to know the testresult output directory 2017-04-11 17:06:52 +02:00
Michael Hackstein 9498116450 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-11 16:15:14 +02:00
baslr 850097247d prepare ldap test 2017-04-11 16:05:54 +02:00
mpv1989 2e8750fa33 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-11 15:58:59 +02:00
mpv1989 efbc3fe0ac Fix Foxx docs 2017-04-11 15:58:54 +02:00
Jan Christoph Uhde 4c4d491eac Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixing transaction-no-commit
  Fixing create collections
2017-04-11 15:04:14 +02:00
Jan Christoph Uhde 028afb782d enable logtopic development for recovery tests
if extreme verbosity is set to true
2017-04-11 15:03:13 +02:00
Michael Hackstein 1119257d49 ShortestPathOptions now contain forward and backward lookupinfos for all edge collections in use. 2017-04-11 15:00:21 +02:00
Jan Christoph Uhde a3de2df144 add some comments to unittests.js 2017-04-11 14:59:21 +02:00
Michael Hackstein 7e3ce102b1 The ShortestPathBlock and -Node now use a pointer to the same options instead of managing one each. 2017-04-11 14:08:21 +02:00
Simon Grätzer bcea7b62b0 Fixing transaction-no-commit 2017-04-11 14:01:50 +02:00
Michael Hackstein 212de2b0d1 Simplified AqlTraverser Setup code by moving shared logic into the TraverserOptions. 2017-04-11 13:47:06 +02:00
Simon Grätzer 7610e0303b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
# Conflicts:
#	js/server/tests/recovery/create-collections.js
2017-04-11 13:42:15 +02:00
Simon Grätzer e418bfca26 Fixing create collections 2017-04-11 13:41:05 +02:00
Jan Christoph Uhde 44bc73266a fix test 2017-04-11 13:35:19 +02:00
Simon Grätzer 5ed8f67726 Fixed counter manager 2017-04-11 13:09:30 +02:00
Kaveh Vahedipour 001c2b4092 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-11 11:46:40 +02:00
Kaveh Vahedipour 28fbf8ec12 sensitivityEstimates do not belong in Current 2017-04-11 11:46:20 +02:00
Michael Hackstein b09dfaa323 Removed external expander functions and moved them into the PathFinder implementations. 2017-04-11 11:41:12 +02:00