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

77 Commits

Author SHA1 Message Date
jsteemann 2275fc8174 better automatic file-type detection for arangoimp 2017-06-08 14:55:21 +02:00
jsteemann a01716a2af fix threading problems in arangoimp 2017-06-02 13:58:18 +02:00
jsteemann 145ba83d04 fixed threading issues in import 2017-05-31 15:50:11 +02:00
jsteemann 2cfd7460d7 fix output 2017-05-31 11:38:20 +02:00
jsteemann 7b57bdf5f6 fix superfluous re-creation attempts for collections 2017-05-30 18:20:37 +02:00
jsteemann cccb2dda8d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-24 19:41:49 +02:00
jsteemann 9f856aeafb cppcheck 2017-05-24 19:41:33 +02:00
Simon Grätzer 0bf4467457 small fixes 2017-05-24 19:21:23 +02:00
Simon Grätzer 36503af230 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBReplicationTailing.cpp
 2017-05-24 18:38:34 +02:00
Simon Grätzer 2f2d07ab9a Multihreaded import 2017-05-24 18:37:45 +02:00
jsteemann 27a8adf9b8 moved shell colors into their own feature 2017-05-23 16:53:43 +02:00
jsteemann 53fa66e60d move parts from ProgramOptions from headers into cpp files 2017-05-23 10:30:36 +02:00
jsteemann e3ca787992 warn before we run out of file descriptors 2017-03-29 02:35:46 +02:00
jsteemann 97b5b2f5df fix issues reported by coverity scan 2017-03-23 19:40:39 +01:00
jsteemann 9278149b24 fixed --convert 2017-03-09 14:29:23 +01:00
jsteemann aab138a4e6 added input type jsonl 2017-03-06 17:39:44 +01:00
jsteemann 6478c6d043 updated CHANGELOG 2017-03-03 15:03:52 +01:00
jsteemann db9099f0f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-03 12:07:50 +01:00
jsteemann 7c0c84c21d added `--translate` option for arangoimp to translate attribute names from the input files to attriubte names expected by ArangoDB 
The `--translate` option can be specified multiple times (once per translation
to be executed). The following example renames the "id" column from the input
file to "_key", and the "from" column to "_from", and the "to" column to "_to":

    arangoimp --type csv --file data.csv --translate "id=_key" --translate "from=_from" --translate "to=_to"

`--translate` works for CSV and TSV inputs only.
 2017-03-03 11:35:16 +01:00
jsteemann 6217a58559 protect against out-of-bounds read 2017-03-03 11:07:41 +01:00
jsteemann 6e4e29943d added 'auto' file type 2017-03-02 23:35:52 +01:00
jsteemann 7051f5d87a fixed --convert false in arangoimp 2017-03-02 15:05:06 +01:00
jsteemann 737698151d fixed issue #2342 2017-03-02 13:45:05 +01:00
baslr cb3756bc7f arangoimp: csv convert value in _key column to string 2017-03-01 22:17:42 +01:00
jsteemann 0ac29eb177 don't fail when using optional features as dependencies 2017-03-01 12:52:51 +01:00
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +01:00
jsteemann e2a312450f fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
Wilfried Goesgens a23aeefbd9 Another place we need the binaryPath for windows 2016-10-12 13:56:32 +02:00
Wilfried Goesgens 54ae758c7c We also need to know the binary directory when looking up the config 
file; else we may miscalculate file locations.
 2016-10-12 12:03:37 +02:00
Jan Christoph Uhde 63fa20fb42 Merge remote-tracking branch 'origin/devel' into obi-velocystream-try-merge-devel 
* origin/devel:
  don't leak on help
  Abort compilation process if the cmake configure run fails
  || exit 1
  Handle 503 answer from dbservers properly
  return service unavailable during shutdown
  Add cxgcc snippets
  fix users home directory.
  Fix debian scripted password documentation.
  slighty improved error handling in import API
  fixed issue #2026
  Fix release matching for alpha/beta versions
  We mustn't use minuses in the releases since that will collide later on with packaging.
  Pass arguments along to build.sh
  Fix windows NSIS client package
  fix typo
  - properly use armhf for armv7 packages - specify CPACK_DEBIAN_PACKAGE_ARCHITECTURE so one can cx-compile packages.

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	lib/Rest/FakeRequest.cpp
 2016-08-31 15:06:27 +02:00
jsteemann 89ac2dfba5 don't leak on help 2016-08-31 14:28:23 +02:00
Jan Christoph Uhde ed111a39a1 Merge branch 'devel' into obi-velocystream-try-merge-devel 
* devel: (24 commits)
  minor fixes
  fix effect that on second install we will complain about mismatching passwords
  only test for cleaning up 3rdparty if we're parametrized to do so.
  fix CMake so it finds the PythonInterpreter even with oder versions
  hexify corrupted markers
  Fix comments
  fixed cluster start
  issue #2022: double max allowed request body size, cap --batch-size value in arangoimp
  fixed issue #2023: added replicationFactor to docs
  improve the perf script
  fix perfsetupscript
  clean up perf script
  add SYSTEM flag to boost includes to avoid warnings
  Adding Foxx access to agency
  Adding Foxx access to agency
  fix compile warning
  Add missing windows library.
  fix windows compile problems.
  Fix syntax error in windows client installer.
  If we have relative paths that are working, make them absolute so they still work after CWD's of arangod
  ...

Conflicts:
	arangod/Agency/AgentConfiguration.cpp
	arangod/GeneralServer/HttpCommTask.cpp
	arangod/RestServer/DatabaseFeature.cpp
	arangod/VocBase/datafile.cpp
 2016-08-30 22:04:31 +02:00
Jan Steemann 4b5249dc5e issue #2022: double max allowed request body size, cap --batch-size value in arangoimp 2016-08-29 09:34:23 +02:00
jsteemann a24d26d74f cppcheck 2016-08-25 14:04:42 +02:00
jsteemann 07055384b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:34:59 +02:00
Wilfried Goesgens 1688655509 Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline 2016-08-24 14:46:48 +02:00
Wilfried Goesgens 1f162ac882 Implement scheme to more clever pass the directories from the build process to the run-time 
We will now try to evaluate the toplevel install directory from the configured binary dir.
We will use this toplever directory when searching for other directories.
 2016-08-24 14:45:08 +02:00
jsteemann f92815b09b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-24 09:38:06 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
jsteemann 85cb227a4f fixed wrong default values for _sslOptions 2016-08-23 14:34:05 +02:00
jsteemann 5ee344b685 added greetings feature 2016-07-18 18:32:27 +02:00
Jan Steemann 9c98cb6cf3 added test for skipLines 2016-07-04 12:15:13 +02:00
Jan Steemann 7b62d71c63 added --skip-lines for import 2016-07-04 11:18:15 +02:00
Jan Steemann 33b40e3bf6 fix default separator 2016-06-15 18:24:10 +02:00
Jan Steemann 1726c53805 fixed some import edge cases 2016-06-15 18:16:49 +02:00
Jan Steemann 924bc0143d properly handle \t 2016-06-15 17:45:27 +02:00
Frank Celler 54300ed30c moved Console/ClientFeature to arangosh 2016-06-01 09:27:29 +02:00
jsteemann 7080f8293d various AQL changes 
added behavior of TO_STRING() for arrays and objects
added C++ implementation for CONTAINS() function
added memmem implementation for Windows
 2016-05-23 17:10:15 +02:00
Jan Steemann 8e090e642e removed "createCollection" attribute from APIs 2016-05-12 15:17:45 +02:00