X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fhelpers%2FCQLBatch.java;h=4547fb1b72f2589ef239bef0dcbaffde1a18172c;hb=66424b306877435b7e71e119a8d1498b4b263719;hp=5df5dcdc2b3e80277213a3a06f190008abd0f6f8;hpb=dc4923a67f424149e35a77108f5b2ac3418fbaf3;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatch.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatch.java
index 5df5dcdc..4547fb1b 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatch.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/CQLBatch.java
@@ -20,6 +20,8 @@
 
 package org.onap.aaf.auth.batch.helpers;
 
+import org.onap.aaf.misc.env.LogTarget;
+
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.Session;
 
@@ -27,8 +29,10 @@ public class CQLBatch {
 	private Session session;
 	private StringBuilder sb;
 	private int hasAdded;
+	private LogTarget log;
 
-	public CQLBatch(Session session) {
+	public CQLBatch(LogTarget log, Session session) {
+		this.log = log;
 		this.session = session;
 		sb = new StringBuilder();
 		hasAdded = 0;
@@ -42,11 +46,10 @@ public class CQLBatch {
 	
 	private boolean end() {
 		if(sb.length()==hasAdded) {
-			System.out.println("Nothing to Process");
 			return false;
 		} else {
 			sb.append("APPLY BATCH;\n");
-			System.out.println(sb);
+			log.log(sb);
 			return true;
 		}
 	}
@@ -60,12 +63,37 @@ public class CQLBatch {
 	}
 	
 	public ResultSet execute(boolean dryRun) {
+		ResultSet rv = null;
 		if(dryRun) {
 			end();
+		} else {
+			rv = execute();
+		}
+		sb.setLength(0);
+		return rv;
+	}
+	
+	public ResultSet singleExec(StringBuilder query, boolean dryRun) {
+		if(dryRun) {
 			return null;
 		} else {
-			return execute();
+			return session.execute(query.toString());
+		}
+	}
+	
+	public void touch(String table, int begin, int end, boolean dryRun) {
+		StringBuilder sb = begin();
+		for(int i=begin;i<end;++i) {
+			sb.append("UPDATE cache SET touched=dateof(now()) WHERE name='");
+			sb.append(table);
+			sb.append("' AND seg=");
+			sb.append(i);
+			sb.append(";\n");
 		}
-		
+		execute(dryRun);
+	}
+	
+	public String toString() {
+		return sb.toString();
 	}
 }