From 8f50a79e69278ce4118ea2daca09aa146c17fd48 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Tue, 1 Nov 2016 23:11:30 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86=E7=B4=A2?= =?UTF-8?q?=E5=BC=95=E4=BC=AA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/a/eye/skywalking/storage/Main.java | 16 --- .../a/eye/skywalking/storage/conf/Config.java | 8 -- .../storage/conf/ConfigInitializer.java | 71 ---------- .../storage/data/DataFileWriter.java | 41 ------ .../skywalking/storage/data/DataOperator.java | 8 ++ .../skywalking/storage/data/DataStorager.java | 34 ----- .../storage/data/file/DataFileOperator.java | 16 +++ .../storage/data/file/DataFileReader.java | 7 + .../storage/data/file/DataFileWriter.java | 7 + .../storage/data/index/DataIndexFile.java | 14 ++ .../data/index/DataIndexFileOperator.java | 16 +++ .../data/index/DataIndexFileReader.java | 7 + .../data/index/DataIndexFileWriter.java | 7 + .../IndexDataSaveFailedException.java | 11 -- .../storage/index/DataFileIndexEngine.java | 28 ++++ .../storage/index/DataFileIndexFinder.java | 5 + .../storage/index/DataFileIndexUpdator.java | 5 + .../storage/index/DataIndexMetaData.java | 7 + .../storage/index/TimeRangeOfIndexData.java | 50 ------- .../index/TimeRangeOfIndexDataFile.java | 62 -------- .../index/TimeRangeOfIndexDataFinder.java | 132 ------------------ .../index/cache/DataFileIndexCache.java | 26 ++++ .../index/cache/DataFileIndexReader.java | 9 ++ .../index/cache/DataFileIndexWriter.java | 8 ++ .../storage/index/cache/IndexL1Cache.java | 7 + .../storage/index/cache/IndexL2Cache.java | 7 + 26 files changed, 184 insertions(+), 425 deletions(-) delete mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/Main.java delete mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/conf/Config.java delete mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/conf/ConfigInitializer.java delete mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/DataFileWriter.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/DataOperator.java delete mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/DataStorager.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileOperator.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileReader.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileWriter.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFile.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFileOperator.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFileReader.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFileWriter.java delete mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/exception/IndexDataSaveFailedException.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataFileIndexEngine.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataFileIndexFinder.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataFileIndexUpdator.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataIndexMetaData.java delete mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/TimeRangeOfIndexData.java delete mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/TimeRangeOfIndexDataFile.java delete mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/TimeRangeOfIndexDataFinder.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/DataFileIndexCache.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/DataFileIndexReader.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/DataFileIndexWriter.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/IndexL1Cache.java create mode 100644 skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/IndexL2Cache.java diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/Main.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/Main.java deleted file mode 100644 index f5236f692..000000000 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/Main.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.a.eye.skywalking.storage; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class Main { - - private static final Logger logger = LogManager.getLogger(Main.class); - - public static void main(String[] args) { - logger.info("Init config param."); - // - new DataStorager().start(); - logger.info("start success."); - } -} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/conf/Config.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/conf/Config.java deleted file mode 100644 index 441f361e2..000000000 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/conf/Config.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.a.eye.skywalking.storage.conf; - -public class Config { - - public static class Index_DB { - public static String TIME_RANGE_INDEX_FILE_PATH = "/tmp/skywalking/index"; - } -} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/conf/ConfigInitializer.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/conf/ConfigInitializer.java deleted file mode 100644 index 577de796a..000000000 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/conf/ConfigInitializer.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.a.eye.skywalking.storage.conf; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.LinkedList; -import java.util.Properties; - -public class ConfigInitializer { - - public static Logger logger = LogManager.getLogger(ConfigInitializer.class); - - public static void initialize(Properties properties, Class rootConfigType) throws IllegalAccessException { - initNextLevel(properties, rootConfigType, new ConfigDesc()); - } - - private static void initNextLevel(Properties properties, Class recentConfigType, ConfigDesc parentDesc) throws NumberFormatException, IllegalArgumentException, IllegalAccessException { - for (Field field : recentConfigType.getFields()) { - if (Modifier.isPublic(field.getModifiers()) && Modifier.isStatic(field.getModifiers())) { - String configKey = (parentDesc + "." + - field.getName()).toLowerCase(); - String value = properties.getProperty(configKey); - if (value != null) { - if (field.getType().equals(int.class)) - field.set(null, Integer.valueOf(value)); - if (field.getType().equals(String.class)) - field.set(null, value); - if (field.getType().equals(long.class)) - field.set(null, Long.valueOf(value)); - } - logger.debug("{}={}", configKey, field.get(null)); - } - } - for (Class innerConfiguration : recentConfigType.getClasses()) { - parentDesc.append(innerConfiguration.getSimpleName()); - initNextLevel(properties, innerConfiguration, parentDesc); - parentDesc.removeLastDesc(); - } - } -} - -class ConfigDesc { - private LinkedList descs = new LinkedList(); - - void append(String currentDesc) { - descs.addLast(currentDesc); - } - - void removeLastDesc() { - descs.removeLast(); - } - - @Override - public String toString() { - if (descs.size() == 0) { - return ""; - } - StringBuilder ret = new StringBuilder(descs.getFirst()); - boolean first = true; - for (String desc : descs) { - if (first) { - first = false; - continue; - } - ret.append(".").append(desc); - } - return ret.toString(); - } -} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/DataFileWriter.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/DataFileWriter.java deleted file mode 100644 index 741b37900..000000000 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/DataFileWriter.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.a.eye.skywalking.storage.data; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; - -/** - * 主要功能： - * 1. 控制源数据的写入 - * 2. 当数据文件满足阈值，自动切换文件 - */ -public class DataFileWriter { - - private FileOutputStream outputStream; - private File currentOriginDataFile; - private String bufferFileBasePath; - - public DataFileWriter(String bufferFileBasePath) { - this.bufferFileBasePath = bufferFileBasePath; - - } - - public DataFileWriter(File bufferFile) { - - } - - public int write(byte[] data) throws IOException { - outputStream.write(data); - return 0; - } - - private void convertFile() { - - } - - public void releaseResource() throws IOException { - outputStream.flush(); - outputStream.close(); - } - -} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/DataOperator.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/DataOperator.java new file mode 100644 index 000000000..8cd4d6566 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/DataOperator.java @@ -0,0 +1,8 @@ +package com.a.eye.skywalking.storage.data; + +/** + * Created by xin on 2016/11/1. + */ +public class DataOperator { + +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/DataStorager.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/DataStorager.java deleted file mode 100644 index 9a077a129..000000000 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/DataStorager.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.a.eye.skywalking.storage.data; - -import com.a.eye.skywalking.storage.index.IndexData; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.io.IOException; - -/** - * 主要用于源数据文件的缓存 - */ -public class DataStorager { - private static Logger logger = LogManager.getLogger(DataStorager.class); - private DataFileWriter writer; - - public void start() { - - } - - public IndexData save(byte[] data) { - - // convert it to data; -// IndexData index = new IndexData(); - - try { - int offset = writer.write(data); - } catch (IOException e) { - logger.error("Failed to save data"); - return null; - } - - return null; - } -} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileOperator.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileOperator.java new file mode 100644 index 000000000..d8573982f --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileOperator.java @@ -0,0 +1,16 @@ +package com.a.eye.skywalking.storage.data.file; + +/** + * Created by xin on 2016/10/31. + */ +public class DataFileOperator { + + public int write(){ + + return 0; + } + + public Object read(Object dataIndex) { + return null; + } +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileReader.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileReader.java new file mode 100644 index 000000000..864e8ca5c --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileReader.java @@ -0,0 +1,7 @@ +package com.a.eye.skywalking.storage.data.file; + +/** + * Created by xin on 2016/10/31. + */ +public class DataFileReader { +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileWriter.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileWriter.java new file mode 100644 index 000000000..27751ebf4 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/file/DataFileWriter.java @@ -0,0 +1,7 @@ +package com.a.eye.skywalking.storage.data.file; + +/** + * Created by xin on 2016/10/31. + */ +public class DataFileWriter { +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFile.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFile.java new file mode 100644 index 000000000..86c92cb84 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFile.java @@ -0,0 +1,14 @@ +package com.a.eye.skywalking.storage.data.index; + +/** + * Created by xin on 2016/10/31. + */ +public class DataIndexFile { + + public void read(String traceId) { + } + + public void write() { + + } +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFileOperator.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFileOperator.java new file mode 100644 index 000000000..6d8bc1946 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFileOperator.java @@ -0,0 +1,16 @@ +package com.a.eye.skywalking.storage.data.index; + +/** + * Created by xin on 2016/10/31. + */ +public class DataIndexFileOperator { + + public Object read(String traceId) { + return null; + } + + public void write(Object o, int offset) { + + } + +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFileReader.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFileReader.java new file mode 100644 index 000000000..c06583c63 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFileReader.java @@ -0,0 +1,7 @@ +package com.a.eye.skywalking.storage.data.index; + +/** + * Created by xin on 2016/10/31. + */ +public class DataIndexFileReader { +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFileWriter.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFileWriter.java new file mode 100644 index 000000000..320d64654 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/index/DataIndexFileWriter.java @@ -0,0 +1,7 @@ +package com.a.eye.skywalking.storage.data.index; + +/** + * Created by xin on 2016/10/31. + */ +public class DataIndexFileWriter { +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/exception/IndexDataSaveFailedException.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/exception/IndexDataSaveFailedException.java deleted file mode 100644 index 0de978239..000000000 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/exception/IndexDataSaveFailedException.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.a.eye.skywalking.storage.exception; - -/** - * Index data cannot be saved. - */ -public class IndexDataSaveFailedException extends Exception { - - public IndexDataSaveFailedException(String message) { - super(message); - } -} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataFileIndexEngine.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataFileIndexEngine.java new file mode 100644 index 000000000..dc66ab542 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataFileIndexEngine.java @@ -0,0 +1,28 @@ +package com.a.eye.skywalking.storage.index; + +import com.a.eye.skywalking.storage.index.cache.DataFileIndexCache; + +/** + * 用于初始化DataFileIndex的数据，并且提供操作Index的所有类 + */ +public class DataFileIndexEngine { + + private static final DataFileIndexCache indexCache; + + static { + + indexCache = new DataFileIndexCache(); + } + + private DataFileIndexEngine() { + //DO Nothing + } + + public static DataFileIndexFinder newFinder() { + return indexCache; + } + + public static DataFileIndexUpdator newUpdator() { + return indexCache; + } +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataFileIndexFinder.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataFileIndexFinder.java new file mode 100644 index 000000000..4e3a1f44b --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataFileIndexFinder.java @@ -0,0 +1,5 @@ +package com.a.eye.skywalking.storage.index; + +public interface DataFileIndexFinder { + DataIndexMetaData find(long timestamp); +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataFileIndexUpdator.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataFileIndexUpdator.java new file mode 100644 index 000000000..958c32922 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataFileIndexUpdator.java @@ -0,0 +1,5 @@ +package com.a.eye.skywalking.storage.index; + +public interface DataFileIndexUpdator { + void update(long timestamp); +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataIndexMetaData.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataIndexMetaData.java new file mode 100644 index 000000000..176bf332b --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/DataIndexMetaData.java @@ -0,0 +1,7 @@ +package com.a.eye.skywalking.storage.index; + +/** + * Created by xin on 2016/11/1. + */ +public class DataIndexMetaData { +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/TimeRangeOfIndexData.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/TimeRangeOfIndexData.java deleted file mode 100644 index 382b5e21f..000000000 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/TimeRangeOfIndexData.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.a.eye.skywalking.storage.index; - -/** - * Created by xin on 2016/10/31. - */ -public class TimeRangeOfIndexData { - private String indexDataFileName; - - private long startTime; - - private long endTime; - - - public TimeRangeOfIndexData() { - } - - public TimeRangeOfIndexData(String fileName) { - this.indexDataFileName = fileName; - } - - public TimeRangeOfIndexData(String fileName, long startTime, long endTime) { - this.indexDataFileName = fileName; - this.startTime = startTime; - this.endTime = endTime; - } - - - public String getIndexDataFileName() { - return indexDataFileName; - } - - public long getStartTime() { - return startTime; - } - - public long getEndTime() { - return endTime; - } - - public String buildConnectionURL() { - // TODO: 2016/10/31 通过参数构建连接URL - return null; - } - - @Override - public String toString() { - return "TimeRangeOfIndexData{" + "indexDataFileName='" + indexDataFileName + '\'' + ", startTime=" + startTime - + ", endTime=" + endTime + '}'; - } -} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/TimeRangeOfIndexDataFile.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/TimeRangeOfIndexDataFile.java deleted file mode 100644 index 69c6a0c54..000000000 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/TimeRangeOfIndexDataFile.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.a.eye.skywalking.storage.index; - -import com.a.eye.skywalking.storage.conf.Config; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.io.*; -import java.util.ArrayList; -import java.util.List; - -public class TimeRangeOfIndexDataFile { - private static Logger logger = LogManager.getLogger(TimeRangeOfIndexDataFile.class); - private final String FILE_NAME = "time_range.index"; - private static final TimeRangeOfIndexDataFile INSTANCE = new TimeRangeOfIndexDataFile(); - private final File indexFile; - - private TimeRangeOfIndexDataFile() { - indexFile = new File(Config.Index_DB.TIME_RANGE_INDEX_FILE_PATH, FILE_NAME); - if (!indexFile.exists()) { - indexFile.getParentFile().mkdirs(); - - try { - indexFile.createNewFile(); - } catch (IOException e) { - logger.error("Failed to create time_range.index", e); - System.exit(-1); - } - } - } - - public void write(TimeRangeOfIndexData timeRange) { - try { - FileWriter writer = new FileWriter(indexFile); - writer.write( - timeRange.getIndexDataFileName() + "\t" + timeRange.getStartTime() + "\t" + timeRange.getEndTime()); - } catch (IOException e) { - logger.error("Failed to write {} to index file", timeRange, e); - } - } - - public List read() { - List indexData = new ArrayList(); - try { - BufferedReader reader = new BufferedReader(new FileReader(indexFile)); - String indexDataStr = null; - while ((reader.readLine()) != null) { - String[] indexSegment = indexDataStr.split("\t"); - indexData.add(new TimeRangeOfIndexData(indexSegment[0], Long.parseLong(indexSegment[1]), - Long.parseLong(indexSegment[2]))); - } - } catch (IOException e) { - logger.error("Failed to read data from index file", e); - } - - return indexData; - } - - - public static TimeRangeOfIndexDataFile INSTANCE() { - return INSTANCE; - } -} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/TimeRangeOfIndexDataFinder.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/TimeRangeOfIndexDataFinder.java deleted file mode 100644 index 85808b9bf..000000000 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/TimeRangeOfIndexDataFinder.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.a.eye.skywalking.storage.index; - -import com.zaxxer.hikari.HikariConfig; -import com.zaxxer.hikari.HikariDataSource; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; - -/** - * Created by xin on 2016/10/31. - */ -public class TimeRangeOfIndexDataFinder { - private static Logger logger = LogManager.getLogger(TimeRangeOfIndexDataFinder.class); - private static final String SQL_JDBC_URL = "jdbc:hsqldb:mem:TIME_RANGE"; - private static final String SQL_CREATE_TABLE = - "CREATE TABLE Time_Range(" - + "id INT PRIMARY KEY NOT NULL IDENTITY," - + "fileName VARCHAR(32) NOT NULL," + " " - + "startTime INT NOT NULL," - + "endTime INT NOT NULL\n" - + ");"; - private static final String SQL_CREATE_INDEX = - "CREATE INDEX \"Time_Range_startTime_endTime_index\" ON Time_Range (startTime, endTime);"; - private static final String SQL_INSERT_DATA = "INSERT INTO Time_Range(fileName,startTime,endTime) VALUES(?,?,?);"; - private static final String SQL_SELECT_DATA = "SELECT fileName FROM Time_Range WHERE startTime < ? AND endTime >?"; - - - - private static final TimeRangeOfIndexDataFinder finder = new TimeRangeOfIndexDataFinder(); - - private HikariDataSource hikariDataSource; - - private TimeRangeOfIndexDataFinder() { - initDataSource(); - initTableAndIndex(); - initTimeRangeData(); - } - - private void initDataSource() { - HikariConfig config = new HikariConfig(); - config.setJdbcUrl(SQL_JDBC_URL); - // TODO: 2016/10/31 初始化数据源参数 - hikariDataSource = new HikariDataSource(config); - } - - private void initTableAndIndex() { - Connection connection = null; - try { - connection = hikariDataSource.getConnection(); - PreparedStatement ps = connection.prepareStatement(SQL_CREATE_TABLE); - ps.execute(); - - ps = connection.prepareStatement(SQL_CREATE_INDEX); - ps.execute(); - } catch (SQLException e) { - logger.error("Failed to "); - } finally { - if (connection != null) { - try { - connection.close(); - } catch (SQLException e) { - logger.error("Failed to close connection when init time range data"); - } - } - } - } - - private void initTimeRangeData() { - List timeRangeOfIndexDataList = TimeRangeOfIndexDataFile.INSTANCE().read(); - Connection connection = null; - int currentCount = 0; - try { - connection = hikariDataSource.getConnection(); - PreparedStatement ps = connection.prepareStatement(SQL_INSERT_DATA); - for (TimeRangeOfIndexData data : timeRangeOfIndexDataList) { - ps.setString(1, data.getIndexDataFileName()); - ps.setLong(2, data.getStartTime()); - ps.setLong(3, data.getEndTime()); - - if ((currentCount++) % 100 == 0) { - ps.executeBatch(); - } - } - - ps.executeBatch(); - } catch (SQLException e) { - logger.error("Failed to init time range data"); - } finally { - if (connection != null) { - try { - connection.close(); - } catch (SQLException e) { - logger.error("Failed to close connection when init time range data"); - } - } - } - - } - - - public static TimeRangeOfIndexDataFinder INSTANCE() { - return finder; - } - - public TimeRangeOfIndexData find(long timestamp) { - Connection connection = null; - try { - connection = hikariDataSource.getConnection(); - PreparedStatement ps = connection.prepareStatement(SQL_SELECT_DATA); - ps.setLong(1, timestamp); - ps.setLong(2, timestamp); - ResultSet rs = ps.executeQuery(); - rs.next(); - return new TimeRangeOfIndexData(rs.getString("fileName")); - } catch (SQLException e) { - return null; - } finally { - if (connection != null) { - try { - connection.close(); - } catch (SQLException e) { - logger.error("Failed to close connection when find data."); - } - } - } - } -} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/DataFileIndexCache.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/DataFileIndexCache.java new file mode 100644 index 000000000..3cd27fb76 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/DataFileIndexCache.java @@ -0,0 +1,26 @@ +package com.a.eye.skywalking.storage.index.cache; + +import com.a.eye.skywalking.storage.index.DataFileIndexFinder; +import com.a.eye.skywalking.storage.index.DataFileIndexUpdator; +import com.a.eye.skywalking.storage.index.DataIndexMetaData; + +public class DataFileIndexCache implements DataFileIndexFinder, DataFileIndexUpdator { + + private IndexL1Cache l1Cache; + private IndexL2Cache l2Cache; + + public DataFileIndexCache() { + //load the index data + } + + @Override + public void update(long timestamp) { + // TODO: 2016/11/1 通知Cache更新，以及Index的文件更新 + } + + @Override + public DataIndexMetaData find(long timestamp) { + // TODO: 2016/11/1 查找一级缓存，二级缓存 + return null; + } +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/DataFileIndexReader.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/DataFileIndexReader.java new file mode 100644 index 000000000..1c78adb8d --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/DataFileIndexReader.java @@ -0,0 +1,9 @@ +package com.a.eye.skywalking.storage.index.cache; + +import java.util.SortedSet; + +public class DataFileIndexReader { + public SortedSet read() { + return null; + } +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/DataFileIndexWriter.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/DataFileIndexWriter.java new file mode 100644 index 000000000..5576ce5f3 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/DataFileIndexWriter.java @@ -0,0 +1,8 @@ +package com.a.eye.skywalking.storage.index.cache; + +public class DataFileIndexWriter { + + public void write(long timestamp) { + + } +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/IndexL1Cache.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/IndexL1Cache.java new file mode 100644 index 000000000..44791dd87 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/IndexL1Cache.java @@ -0,0 +1,7 @@ +package com.a.eye.skywalking.storage.index.cache; + +/** + * Created by xin on 2016/11/1. + */ +class IndexL1Cache { +} diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/IndexL2Cache.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/IndexL2Cache.java new file mode 100644 index 000000000..ef7878762 --- /dev/null +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/index/cache/IndexL2Cache.java @@ -0,0 +1,7 @@ +package com.a.eye.skywalking.storage.index.cache; + +/** + * Created by xin on 2016/11/1. + */ +class IndexL2Cache { +}