8000 Merge branch 'devel' of github.com:arangodb/arangodb into devel · saliormoon/arangodb@9bb239b · GitHub
[go: up one dir, main page]
Skip to content

Commit 9bb239b

Browse files
fcellerfceller
committed
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2 parents 52c2c4a + 3c3a941 commit 9bb239b

File tree

35 files changed

+492
-175
lines changed

35 files changed

+492
-175
lines changed

‎CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ devel
4848
v3.0.6 (XXXX-XX-XX)
4949
-------------------
5050

51+
* fixed issue #2026
52+
5153
* slightly better error diagnostics for AQL query compilation and replication
5254

5355
* fixed issue #2018

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ endif ()
3737
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
3838

3939
# where to find CMAKE modules
40-
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
40+
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
4141

4242
# be verbose about flags used
4343
option(VERBOSE OFF)
@@ -708,7 +708,7 @@ if (NOT USE_BOOST_UNITTESTS)
708708
message(STATUS "BOOST unit-tests are disabled")
709709
endif ()
710710

711-
include_directories(${Boost_INCLUDE_DIR})
711+
include_directories(SYSTEM ${Boost_INCLUDE_DIR})
712712
add_definitions(-DARANGODB_BOOST_VERSION=\"${Boost_VERSION}\")
713713

714714
################################################################################

‎Documentation/Books/Manual/GettingStarted/Installing/Linux.mdpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ For unattended installation, you can set the password using the
3939
[debconf helpers](http://www.microhowto.info/howto/perform_an_unattended_installation_of_a_debian_package.html).
4040

4141
```
42-
echo arangodb3 arangodb/password password NEWPASSWORD | debconf-set-selections
43-
echo arangodb3 arangodb/password_again password NEWPASSWORD | debconf-set-selections
42+
echo arangodb3 arangodb3/password password NEWPASSWORD | debconf-set-selections
43+
echo arangodb3 arangodb3/password_again password NEWPASSWORD | debconf-set-selections
4444
```
4545

4646
The commands should be executed prior to the installation.

‎Documentation/DocuBlocks/Rest/Collections/JSF_post_api_collection.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,19 @@ and the hash value is used to determine the target shard.
9494
**Note**: Values of shard key attributes cannot be changed once set.
9595
This option is meaningless in a single server setup.
9696

97+
@RESTBODYPARAM{replicationFactor,integer,optional,int64}
98+
(The default is *1*): in a cluster, this attribute determines how many copies
99+
of each shard are kept on different DBServers. The value 1 means that only one
100+
copy (no synchronous replication) is kept. A value of k means that k-1 replicas
101+
are kept. Any two copies reside on different DBServers. Replication between them is
102+
synchronous, that is, every write operation to the "leader" copy will be replicated
103+
to all "follower" replicas, before the write operation is reported successful.
104+
105+
If a server fails, this is detected automatically and one of the servers holding
106+
copies take over, usually without an error being reported.
107+
97108
@RESTDESCRIPTION
98-
Creates an new collection with a given name. The request must contain an
109+
Creates a new collection with a given name. The request must contain an
99110
object with the following attributes.
100111

101112

‎Installation/Jenkins/build.sh

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,6 @@ if test -f last_compiled_version.sha; then
101101
fi
102102

103103
COMPILE_MATTERS="3rdParty"
104-
CLEAN_IT=1
105-
106-
if test -n "$LASTREV"; then
107-
lines=`git diff ${LASTREV}: ${COMPILE_MATTERS} | wc -l`
108-
109-
if test $lines -eq 0; then
110-
echo "no relevant changes, no need for full recompile"
111-
CLEAN_IT=0
112-
fi
113-
fi
114104

115105
# setup make options
116106
if test -z "${CXX}"; then
@@ -193,6 +183,8 @@ case "$1" in
193183
;;
194184
esac
195185

186+
CLEAN_IT=0
187+
196188

197189
while [ $# -gt 0 ]; do
198190
case "$1" in
@@ -303,14 +295,30 @@ while [ $# -gt 0 ]; do
303295
TARGET_DIR=$1
304296
shift
305297
;;
306-
298+
299+
--checkCleanBuild)
300+
CLEAN_IT=1
301+
shift
302+
;;
307303
*)
308304
echo "Unknown option: $1"
309305
exit 1
310306
;;
311307
esac
312308
done
313309

310+
311+
if test -n "$LASTREV"; then
312+
lines=`git diff ${LASTREV}: ${COMPILE_MATTERS} | wc -l`
313+
314+
if test $lines -eq 0; then
315+
echo "no relevant changes, no need for full recompile"
316+
CLEAN_IT=0
317+
fi
318+
fi
319+
320+
321+
314322
if [ "$GCC5" == 1 ]; then
315323
CC=/usr/bin/gcc-5
316324
CXX=/usr/bin/g++-5

‎Installation/Windows/Templates/NSIS.template.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ Function default_installation_directory
946946
Return
947947
FunctionEnd
948948

949-
Function assign_proper_access_rigths
949+
Function assign_proper_access_rights
950950
StrCpy $0 "0"
951951
AccessControl::GrantOnFile \
952952
"$INSTDIR" "(BU)" "GenericRead + GenericWrite + GenericExecute"
@@ -963,7 +963,7 @@ Function is_writable
963963
; is does not matter if we do some errors here
964964
${If} $TRI_INSTALL_ALL_USERS == '1'
965965
CreateDirectory $INSTDIR
966-
Call assign_proper_access_rigths
966+
Call assign_proper_access_rights
967967
${EndIf}
968968
FunctionEnd
969969

‎Installation/Windows/client/Templates/NSIS.template.in

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
; CPack install script designed for a nmake build
2+
; TODO !addplugindir '@CPACK_PLUGIN_PATH@/AccessControl/Plugins'
23

34
;--------------------------------
45
; Include LogicLib for more readable code
@@ -484,14 +485,10 @@ FunctionEnd
484485

485486
;--------------------------------
486487
;Pages
487-
!define MUI_PAGE_CUSTOMFUNCTION_PRE skip_page
488488
!insertmacro MUI_PAGE_WELCOME
489489

490-
!define MUI_PAGE_CUSTOMFUNCTION_PRE skip_page
491490
!insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@"
492491

493-
Page custom InstallOptionsPage skip_page
494-
495492
!define MUI_PAGE_CUSTOMFUNCTION_PRE default_installation_directory
496493
!define MUI_PAGE_CUSTOMFUNCTION_LEAVE check_installation_directory
497494
!insertmacro MUI_PAGE_DIRECTORY
@@ -709,7 +706,6 @@ displayAgain:
709706
StrCmp $PASSWORD $PASSWORD_AGAIN +3 0
710707
MessageBox MB_OK|MB_ICONSTOP "Passwords don't match, try again"
711708
Goto displayAgain
712-
done:
713709
Pop ${TEMP1}
714710

715711
Return
@@ -725,20 +721,17 @@ FunctionEnd
725721
Function default_installation_directory
726722
; Read variables which defines if arango should be installed as Service
727723

728-
!insertmacro MUI_INSTALLOPTIONS_READ $R2 "NSIS.InstallOptions.ini" "Field 2" "State"
729-
!insertmacro MUI_INSTALLOPTIONS_READ $R3 "NSIS.InstallOptions.ini" "Field 3" "State"
730-
!insertmacro MUI_INSTALLOPTIONS_READ $R4 "NSIS.InstallOptions.ini" "Field 4" "State"
724+
!insertmacro MUI_INSTALLOPTIONS_READ $R2 "NSIS.InstallOptions.ini" "Field 2" "State"
725+
!insertmacro MUI_INSTALLOPTIONS_READ $R3 "NSIS.InstallOptions.ini" "Field 3" "State"
726+
!insertmacro MUI_INSTALLOPTIONS_READ $R4 "NSIS.InstallOptions.ini" "Field 4" "State"
731727

732-
${If} $R3 == '1'
733-
StrCpy $TRI_INSTALL_TYPE 'AllUsers'
734-
${EndIf}
735-
736-
${If} $R4 == '1'
737-
StrCpy $TRI_INSTALL_TYPE 'SingleUser'
738-
${EndIf}
739-
Call read_options
728+
${If} $R3 == '1'
729+
StrCpy $TRI_INSTALL_TYPE 'AllUsers'
740730
${EndIf}
741731

732+
${If} $R4 == '1'
733+
StrCpy $TRI_INSTALL_TYPE 'SingleUser'
734+
${EndIf}
742735

743736
${Switch} $TRI_INSTALL_TYPE
744737
${Case} 'SingleUser'
@@ -750,25 +743,25 @@ Function default_installation_directory
750743
Return
751744
FunctionEnd
752745

753-
Function assign_proper_access_rigths
754-
StrCpy $0 "0"
755-
AccessControl::GrantOnFile \
756-
"$INSTDIR" "(BU)" "GenericRead + GenericWrite + GenericExecute"
757-
Pop $R0
758-
${If} $R0 == error
759-
Pop $R0
760-
StrCpy $0 "1"
761-
DetailPrint `AccessControl error: $R0`
762-
; MessageBox MB_OK "target directory $INSTDIR can not get cannot get correct access rigths"
763-
${EndIf}
764-
FunctionEnd
746+
; TODO Function assign_proper_access_rights
747+
; TODO StrCpy $0 "0"
748+
; TODO AccessControl::GrantOnFile \
749+
; TODO "$INSTDIR" "(BU)" "GenericRead + GenericWrite + GenericExecute"
750+
; TODO Pop $R0
751+
; TODO ${If} $R0 == error
752+
; TODO Pop $R0
753+
; TODO StrCpy $0 "1"
754+
; TODO DetailPrint `AccessControl error: $R0`
755+
; TODO ; MessageBox MB_OK "target directory $INSTDIR can not get cannot get correct access rigths"
756+
; TODO ${EndIf}
757+
; TODO FunctionEnd
765758

766759
Function is_writable
767760
; is does not matter if we do some errors here
768761
${If} $TRI_INSTALL_ALL_USERS == '1'
769762
CreateDirectory $INSTDIR
< F438 /code>
770-
Call assign_proper_access_rigths
771-
${EndIf}
763+
; TODO Call assign_proper_access_rights
764+
${EndIf}
772765
FunctionEnd
773766

774767
Function check_installation_directory

‎Installation/debian/postinst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ if [ "$1" = "configure" -a -z "$2" ]; then
1515
/usr/sbin/arango-init-database \
1616
--uid arangodb --gid arangodb || true
1717
fi
18-
18+
db_set arangodb3/password_again ""
1919
db_set arangodb3/password ""
20+
db_go
2021
fi
2122

2223
# check if we should upgrade the database directory

‎Installation/debian/preinst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
getent group arangodb >/dev/null || groupadd -r arangodb
5-
getent passwd arangodb >/dev/null || useradd -r -g arangodb -d /usr/share/arangodb -s /bin/false -c "ArangoDB Application User" arangodb
5+
getent passwd arangodb >/dev/null || useradd -r -g arangodb -d /usr/share/arangodb3 -s /bin/false -c "ArangoDB Application User" arangodb
66

77
install -o arangodb -g arangodb -m 755 -d /var/lib/arangodb3
88
install -o arangodb -g arangodb -m 755 -d /var/lib/arangodb3-apps

‎Installation/release.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ fi
5050

5151
VERSION="$1"
5252

53+
if echo ${VERSION} | grep -q -- '-'; then
54+
echo "${VERSION} mustn't contain minuses! "
55+
exit 1
56+
fi
57+
5358
if git tag | grep -q "^v$VERSION$"; then
5459
echo "$0: version $VERSION already defined"
5560
exit 1

0 commit comments

Comments
 (0)
0