* logdb downgrade for use previous grammar

 * fixed to create logdb directory when start LogQueryServiceImpl
 * added LogRestoreService for delete the file Less than 40byte

Author: blackluster1

pom.xml

@@ -9,7 +9,7 @@
 		<version>1.0.0</version>
 	</parent>
 	<artifactId>kraken-logdb</artifactId>
-	<version>0.10.0</version>
+	<version>0.9.1</version>
 	<packaging>bundle</packaging>
 	<name>Kraken Log DB</name>
 	<build>
@@ -25,9 +25,8 @@
 						<Private-Package>
 							org.krakenapps.logdb.impl,
 							org.krakenapps.logdb.query,
+							org.krakenapps.logdb.mapreduce,
 							org.krakenapps.logdb.query.command,
-							org.krakenapps.logdb.query.aggregator,
-							org.krakenapps.logdb.query.expr,
 							org.krakenapps.logdb.query.parser,
 							org.krakenapps.logdb.sort,
 							org.krakenapps.logdb.msgbus
@@ -38,7 +37,7 @@
 							org.krakenapps.logstorage;version="1.12.0",
 							org.krakenapps.logstorage.file;version="1.12.0",
 							*
-						</Import-Package>
+					    </Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -60,16 +59,6 @@
 			<groupId>org.krakenapps</groupId>
 			<artifactId>kraken-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>1.5.6</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.ipojo</artifactId>
@@ -80,7 +69,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.krakenapps</groupId>
-			<artifactId>kraken-confdb</artifactId>
+			<artifactId>kraken-rpc</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.krakenapps</groupId>
@@ -103,10 +92,8 @@
 			<artifactId>kraken-opencsv</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.9.5</version>
-			<scope>test</scope>
+			<groupId>org.krakenapps</groupId>
+			<artifactId>kraken-bnf</artifactId>
 		</dependency>
 	</dependencies>
 </project>

siem/kraken-logdb/pom.xml

@@ -1,34 +1,19 @@
-/*
- * Copyright 2012 Future Systems
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.krakenapps.logdb;
 
 import java.util.Map;
 
-public class BaseLogScript implements LogQueryScript {
+public class BaseLogScript implements LogScript {
 
 	@Override
 	public void init(Map<String, Object> params) {
 	}
 
 	@Override
-	public void handle(LogQueryScriptInput input, LogQueryScriptOutput output) {
+	public void handle(LogScriptInput input, LogScriptOutput output) {
 	}
 
 	@Override
-	public void eof(LogQueryScriptOutput output) {
+	public void eof(LogScriptOutput output) {
 	}
 
 }

siem/kraken-logdb/src/main/java/org/krakenapps/logdb/BaseLogScript.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2012 Future Systems
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.krakenapps.logdb;
 
 import java.io.File;

siem/kraken-logdb/src/main/java/org/krakenapps/logdb/CsvLookupRegistry.java

@@ -0,0 +1,26 @@
+package org.krakenapps.logdb;
+
+import java.util.Map;
+
+public interface DataSource {
+	/**
+	 * @return "local" for local node, guid for remote node
+	 */
+	String getNodeGuid();
+
+	/**
+	 * @return "table" or "rpc"
+	 */
+	String getType();
+
+	/**
+	 * @return the data source name
+	 */
+	String getName();
+
+	/**
+	 * @return the data source metadata
+	 */
+	Map<String, Object> getMetadata();
+
+}

siem/kraken-logdb/src/main/java/org/krakenapps/logdb/DataSource.java

@@ -0,0 +1,7 @@
+package org.krakenapps.logdb;
+
+public interface DataSourceEventListener {
+	void onUpdate(DataSource ds);
+
+	void onRemove(DataSource ds);
+}

siem/kraken-logdb/src/main/java/org/krakenapps/logdb/DataSourceEventListener.java

@@ -0,0 +1,17 @@
+package org.krakenapps.logdb;
+
+import java.util.Collection;
+
+public interface DataSourceRegistry {
+	Collection<DataSource> getAll();
+
+	DataSource get(String nodeGuid, String name);
+
+	void update(DataSource ds);
+
+	void remove(DataSource ds);
+
+	void addListener(DataSourceEventListener listener);
+
+	void removeListener(DataSourceEventListener listener);
+}

siem/kraken-logdb/src/main/java/org/krakenapps/logdb/DataSourceRegistry.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2012 Future Systems
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.krakenapps.logdb;
 
 public abstract class EmptyLogQueryCallback implements LogQueryCallback {

siem/kraken-logdb/src/main/java/org/krakenapps/logdb/EmptyLogQueryCallback.java

@@ -19,6 +19,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.krakenapps.logdb.query.FileBufferList;
+
 public abstract class LogQueryCommand {
 	public static enum Status {
 		Waiting, Running, End, Finalizing
@@ -91,6 +93,26 @@ protected final void write(LogMap m) {
 		}
 	}
 
+	@Deprecated
+	public void push(FileBufferList<Map<String, Object>> buf) {
+		if (buf != null) {
+			for (Map<String, Object> m : buf)
+				push(new LogMap(m));
+			buf.close();
+		}
+	}
+
+	@Deprecated
+	protected final void write(FileBufferList<Map<String, Object>> buf) {
+		pushCount += buf.size();
+		if (next != null && next.status != Status.End) {
+			next.status = Status.Running;
+			next.push(buf);
+		} else {
+			buf.close();
+		}
+	}
+
 	public abstract boolean isReducer();
 
 	public boolean isCallbackTimeline() {
@@ -165,13 +187,5 @@ public boolean containsKey(String key) {
 		public Map<String, Object> map() {
 			return map;
 		}
-
-		@Override
-		public String toString() {
-			if (map != null)
-				return map.toString();
-			return "null";
-		}
-
 	}
 }

siem/kraken-logdb/src/main/java/org/krakenapps/logdb/LogQueryCommand.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2011 Future Systems
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.krakenapps.logdb;
 
 public interface LogQueryEventListener {

siem/kraken-logdb/src/main/java/org/krakenapps/logdb/LogQueryContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Future Systems
+ * Copyright 2011 Future Systems
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,9 @@
  */
 package org.krakenapps.logdb;
 
-public interface LogQueryCommandParser {
-	String getCommandName();
+import org.krakenapps.bnf.Parser;
+import org.krakenapps.bnf.Syntax;
 
-	LogQueryCommand parse(LogQueryContext context, String commandString);
+public interface LogQueryParser extends Parser {
+	void addSyntax(Syntax syntax);
 }