Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix Cass, then to Version 2.1.19
[aaf/authz.git]
/
auth
/
auth-cass
/
cass_init
/
restore.sh
diff --git
a/auth/auth-cass/cass_init/restore.sh
b/auth/auth-cass/cass_init/restore.sh
index
768cf4c
..
528978a
100644
(file)
--- a/
auth/auth-cass/cass_init/restore.sh
+++ b/
auth/auth-cass/cass_init/restore.sh
@@
-4,7
+4,7
@@
echo `date`
ENV=DOCKER
echo `date`
ENV=DOCKER
-CQLSH="
/usr/bin/
cqlsh -k authz"
+CQLSH="cqlsh -k authz"
cd dats
if [ "$*" = "" ]; then
cd dats
if [ "$*" = "" ]; then
@@
-35,9
+35,13
@@
for T in $DATA; do
echo $T
case "$T" in
# 2.1.14 still has NULL problems for COPY. Fixed in 2.1.15+
echo $T
case "$T" in
# 2.1.14 still has NULL problems for COPY. Fixed in 2.1.15+
- "approval"|"artifact"|"cred"|"ns"|"x509"|"role")
+ "approval"|"artifact"|"cred"|"ns"|"x509"|"role"
|"notified"
)
$CQLSH -e "truncate $T"
$CQLSH -e "truncate $T"
- UPLOAD="$UPLOAD dats/"$T
+ UPLOAD="$UPLOAD "$T
+ ;;
+ "history")
+ $CQLSH -e "truncate $T"
+ DO_HISTORY=true
;;
*)
$CQLSH -e "truncate $T; COPY authz.${T} FROM 'dats/${T}.dat' WITH DELIMITER='|'"
;;
*)
$CQLSH -e "truncate $T; COPY authz.${T} FROM 'dats/${T}.dat' WITH DELIMITER='|'"
@@
-47,6
+51,12
@@
for T in $DATA; do
done
if [ ! "$UPLOAD" = "" ]; then
done
if [ ! "$UPLOAD" = "" ]; then
- java -DCASS_ENV=$ENV -jar aaf-auth-batch-*-full.jar Upload $UPLOAD
+ cd dats
+ java -Dcadi_prop_files=../authBatch.props -DCASS_ENV=$ENV -jar ../aaf-auth-batch-*-full.jar Upload $UPLOAD
+ cd -
+fi
+
+if [ "$DO_HISTORY" = "true" ]; then
+ $CQLSH -e "COPY authz.history FROM 'dats/history.dat' WITH DELIMITER='|'"
fi
echo `date`
fi
echo `date`