[WIP] New storage using Time Series Server

afs-cassandra/src/test/java/com/powsybl/afs/cassandra/CassandraAppStorageTest.java

@@ -22,7 +22,7 @@ public class CassandraAppStorageTest extends AbstractAppStorageTest {
     public CassandraCQLUnit cassandraCQLUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("afs.cql", CassandraConstants.AFS_KEYSPACE), null, 20000L);
 
     @Override
-    protected AppStorage createStorage() {
+    public AppStorage createStorage() {
         return new CassandraAppStorage("test", () -> new CassandraTestContext(cassandraCQLUnit),
                 new CassandraAppStorageConfig(), new InMemoryEventsBus());
     }

afs-mapdb/src/main/java/com/powsybl/afs/mapdb/MapDbAppFileSystemConfig.java

@@ -8,6 +8,7 @@
 
 import com.powsybl.afs.AfsException;
 import com.powsybl.afs.storage.AbstractAppFileSystemConfig;
+import com.powsybl.commons.config.ModuleConfig;
 import com.powsybl.commons.config.PlatformConfig;
 
 import java.nio.file.Files;
@@ -31,30 +32,32 @@ public static List<MapDbAppFileSystemConfig> load() {
     public static List<MapDbAppFileSystemConfig> load(PlatformConfig platformConfig) {
 
         return platformConfig.getOptionalModuleConfig("mapdb-app-file-system")
-                .map(moduleConfig -> {
-                    List<MapDbAppFileSystemConfig> configs = new ArrayList<>();
-                    if (moduleConfig.hasProperty("drive-name")
-                            && moduleConfig.hasProperty("db-file")) {
-                        String driveName = moduleConfig.getStringProperty("drive-name");
-                        boolean remotelyAccessible = moduleConfig.getBooleanProperty("remotely-accessible", DEFAULT_REMOTELY_ACCESSIBLE);
-                        Path rootDir = moduleConfig.getPathProperty("db-file");
-                        configs.add(new MapDbAppFileSystemConfig(driveName, remotelyAccessible, rootDir));
-                    }
-                    int maxAdditionalDriveCount = moduleConfig.getIntProperty("max-additional-drive-count", 0);
-                    for (int i = 0; i < maxAdditionalDriveCount; i++) {
-                        if (moduleConfig.hasProperty("drive-name-" + i)
-                                && moduleConfig.hasProperty("db-file-" + i)) {
-                            String driveName = moduleConfig.getStringProperty("drive-name-" + i);
-                            boolean remotelyAccessible = moduleConfig.getBooleanProperty("remotely-accessible-" + i, DEFAULT_REMOTELY_ACCESSIBLE);
-                            Path rootDir = moduleConfig.getPathProperty("db-file-" + i);
-                            configs.add(new MapDbAppFileSystemConfig(driveName, remotelyAccessible, rootDir));
-                        }
-                    }
-                    return configs;
-                })
+                .map(MapDbAppFileSystemConfig::load)
                 .orElse(Collections.emptyList());
     }
 
+    public static List<MapDbAppFileSystemConfig> load(ModuleConfig moduleConfig) {
+        List<MapDbAppFileSystemConfig> configs = new ArrayList<>();
+        if (moduleConfig.hasProperty("drive-name")
+            && moduleConfig.hasProperty("db-file")) {
+            String driveName = moduleConfig.getStringProperty("drive-name");
+            boolean remotelyAccessible = moduleConfig.getBooleanProperty("remotely-accessible", DEFAULT_REMOTELY_ACCESSIBLE);
+            Path rootDir = moduleConfig.getPathProperty("db-file");
+            configs.add(new MapDbAppFileSystemConfig(driveName, remotelyAccessible, rootDir));
+        }
+        int maxAdditionalDriveCount = moduleConfig.getIntProperty("max-additional-drive-count", 0);
+        for (int i = 0; i < maxAdditionalDriveCount; i++) {
+            if (moduleConfig.hasProperty("drive-name-" + i)
+                && moduleConfig.hasProperty("db-file-" + i)) {
+                String driveName = moduleConfig.getStringProperty("drive-name-" + i);
+                boolean remotelyAccessible = moduleConfig.getBooleanProperty("remotely-accessible-" + i, DEFAULT_REMOTELY_ACCESSIBLE);
+                Path rootDir = moduleConfig.getPathProperty("db-file-" + i);
+                configs.add(new MapDbAppFileSystemConfig(driveName, remotelyAccessible, rootDir));
+            }
+        }
+        return configs;
+    }
+
     private static Path checkDbFile(Path dbFile) {
         Objects.requireNonNull(dbFile);
         if (Files.isDirectory(dbFile)) {

afs-spring-server/src/test/java/com/powsybl/afs/server/StorageServerTest.java

@@ -79,7 +79,7 @@ private URI getRestUri() {
     }
 
     @Override
-    protected AppStorage createStorage() {
+    public AppStorage createStorage() {
         URI restUri = getRestUri();
         return new RemoteAppStorage(FS_TEST_NAME, restUri, "");
     }

afs-storage-api/src/test/java/com/powsybl/afs/storage/AbstractAppStorageTest.java

@@ -43,10 +43,23 @@ public abstract class AbstractAppStorageTest {
 
     protected AppStorage storage;
 
+    protected boolean conservesChunks;
+
+    protected boolean handlesStringTimeSeries;
+
     protected BlockingQueue<NodeEvent> eventStack;
 
     protected AppStorageListener l = eventList -> eventStack.addAll(eventList.getEvents());
 
+    public AbstractAppStorageTest() {
+        this(true, true);
+    }
+
+    public AbstractAppStorageTest(boolean conservesChunks, boolean handlesStringTimeSeries) {
+        this.conservesChunks = conservesChunks;
+        this.handlesStringTimeSeries = handlesStringTimeSeries;
+    }
+
     protected abstract AppStorage createStorage();
 
     @Before
@@ -385,8 +398,13 @@ public void test() throws IOException, InterruptedException {
         assertTrue(storage.getTimeSeriesMetadata(testData3Info.getId(), Sets.newHashSet("ts1")).isEmpty());
 
         // 14) add data to double time series
-        storage.addDoubleTimeSeriesData(testData2Info.getId(), 0, "ts1", Arrays.asList(new UncompressedDoubleDataChunk(2, new double[] {1d, 2d}),
-                                                                                       new UncompressedDoubleDataChunk(5, new double[] {3d})));
+        if (conservesChunks) {
+            storage.addDoubleTimeSeriesData(testData2Info.getId(), 0, "ts1", Arrays.asList(new UncompressedDoubleDataChunk(2, new double[] {1d, 2d}),
+                new UncompressedDoubleDataChunk(5, new double[] {3d})));
+        } else {
+            storage.addDoubleTimeSeriesData(testData2Info.getId(), 0, "ts1", Arrays.asList(new UncompressedDoubleDataChunk(0, new double[] {1d, 2d, 3d})));
+        }
+
         storage.flush();
 
         // check event
@@ -399,52 +417,58 @@ public void test() throws IOException, InterruptedException {
         // check double time series data query
         Map<String, List<DoubleDataChunk>> doubleTimeSeriesData = storage.getDoubleTimeSeriesData(testData2Info.getId(), Sets.newHashSet("ts1"), 0);
         assertEquals(1, doubleTimeSeriesData.size());
-        assertEquals(Arrays.asList(new UncompressedDoubleDataChunk(2, new double[] {1d, 2d}),
-                                   new UncompressedDoubleDataChunk(5, new double[] {3d})),
-                     doubleTimeSeriesData.get("ts1"));
+        if (conservesChunks) {
+            assertEquals(Arrays.asList(new UncompressedDoubleDataChunk(2, new double[] {1d, 2d}),
+                new UncompressedDoubleDataChunk(5, new double[] {3d})),
+                doubleTimeSeriesData.get("ts1"));
+        } else {
+            assertEquals(Arrays.asList(new UncompressedDoubleDataChunk(0, new double[]{1d, 2d, 3d})), doubleTimeSeriesData.get("ts1"));
+        }
         assertTrue(storage.getDoubleTimeSeriesData(testData3Info.getId(), Sets.newHashSet("ts1"), 0).isEmpty());
 
         // 15) create a second string time series
-        TimeSeriesMetadata metadata2 = new TimeSeriesMetadata("ts2",
-                                                              TimeSeriesDataType.STRING,
-                                                              ImmutableMap.of(),
-                                                              RegularTimeSeriesIndex.create(Interval.parse("2015-01-01T00:00:00Z/2015-01-01T01:15:00Z"),
-                                                                                            Duration.ofMinutes(15)));
-        storage.createTimeSeries(testData2Info.getId(), metadata2);
-        storage.flush();
-
-        // check event
-        assertEventStack(new TimeSeriesCreated(testData2Info.getId(), "ts2"));
-
-        // check string time series query
-        assertEquals(Sets.newHashSet("ts1", "ts2"), storage.getTimeSeriesNames(testData2Info.getId()));
-        metadataList = storage.getTimeSeriesMetadata(testData2Info.getId(), Sets.newHashSet("ts1"));
-        assertEquals(1, metadataList.size());
-
-        // 16) add data to double time series
-        storage.addStringTimeSeriesData(testData2Info.getId(), 0, "ts2", Arrays.asList(new UncompressedStringDataChunk(2, new String[] {"a", "b"}),
-                                                                                       new UncompressedStringDataChunk(5, new String[] {"c"})));
-        storage.flush();
-
-        // check event
-        assertEventStack(new TimeSeriesDataUpdated(testData2Info.getId(), "ts2"));
-
-        // check string time series data query
-        Map<String, List<StringDataChunk>> stringTimeSeriesData = storage.getStringTimeSeriesData(testData2Info.getId(), Sets.newHashSet("ts2"), 0);
-        assertEquals(1, stringTimeSeriesData.size());
-        assertEquals(Arrays.asList(new UncompressedStringDataChunk(2, new String[] {"a", "b"}),
-                                   new UncompressedStringDataChunk(5, new String[] {"c"})),
-                     stringTimeSeriesData.get("ts2"));
-
-        // 17) clear time series
-        storage.clearTimeSeries(testData2Info.getId());
-        storage.flush();
-
-        // check event
-        assertEventStack(new TimeSeriesCleared(testData2Info.getId()));
-
-        // check there is no more time series
-        assertTrue(storage.getTimeSeriesNames(testData2Info.getId()).isEmpty());
+        if (handlesStringTimeSeries) {
+            TimeSeriesMetadata metadata2 = new TimeSeriesMetadata("ts2",
+                TimeSeriesDataType.STRING,
+                ImmutableMap.of(),
+                RegularTimeSeriesIndex.create(Interval.parse("2015-01-01T00:00:00Z/2015-01-01T01:15:00Z"),
+                    Duration.ofMinutes(15)));
+            storage.createTimeSeries(testData2Info.getId(), metadata2);
+            storage.flush();
+
+            // check event
+            assertEventStack(new TimeSeriesCreated(testData2Info.getId(), "ts2"));
+
+            // check string time series query
+            assertEquals(Sets.newHashSet("ts1", "ts2"), storage.getTimeSeriesNames(testData2Info.getId()));
+            metadataList = storage.getTimeSeriesMetadata(testData2Info.getId(), Sets.newHashSet("ts1"));
+            assertEquals(1, metadataList.size());
+
+            // 16) add data to double time series
+            storage.addStringTimeSeriesData(testData2Info.getId(), 0, "ts2", Arrays.asList(new UncompressedStringDataChunk(2, new String[] {"a", "b"}),
+                new UncompressedStringDataChunk(5, new String[] {"c"})));
+            storage.flush();
+
+            // check event
+            assertEventStack(new TimeSeriesDataUpdated(testData2Info.getId(), "ts2"));
+
+            // check string time series data query
+            Map<String, List<StringDataChunk>> stringTimeSeriesData = storage.getStringTimeSeriesData(testData2Info.getId(), Sets.newHashSet("ts2"), 0);
+            assertEquals(1, stringTimeSeriesData.size());
+            assertEquals(Arrays.asList(new UncompressedStringDataChunk(2, new String[] {"a", "b"}),
+                new UncompressedStringDataChunk(5, new String[] {"c"})),
+                stringTimeSeriesData.get("ts2"));
+
+            // 17) clear time series
+            storage.clearTimeSeries(testData2Info.getId());
+            storage.flush();
+
+            // check event
+            assertEventStack(new TimeSeriesCleared(testData2Info.getId()));
+
+            // check there is no more time series
+            assertTrue(storage.getTimeSeriesNames(testData2Info.getId()).isEmpty());
+        }
 
         // 18) change parent test
         NodeInfo folder1Info = storage.createNode(rootFolderInfo.getId(), "test1", FOLDER_PSEUDO_CLASS, "", 0, new NodeGenericMetadata());

afs-timeseries-server-storage/pom.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2017, RTE (http://www.rte-france.com)
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <properties>
+        <project.version>3.6.0-SNAPSHOT</project.version>
+        <jackson.version>2.12.1</jackson.version>
+        <time-series-server.version>0.0.1-SNAPSHOT</time-series-server.version>
+    </properties>
+
+    <parent>
+        <artifactId>powsybl-afs</artifactId>
+        <groupId>com.powsybl</groupId>
+        <version>3.6.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>powsybl-afs-timeseries-server-storage</artifactId>
+    <name>AFS time series server filesystem storage implementations</name>
+    <description>An AFS time series provider based on time series server</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-afs-storage-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-time-series-server-interfaces</artifactId>
+            <version>${time-series-server.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jackson-provider</artifactId>
+            <version>${resteasy.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-client</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- tests -->
+        <dependency>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-afs-mapdb-storage</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-afs-storage-api</artifactId>
+            <version>3.6.0-SNAPSHOT</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-netty</artifactId>
+            <version>5.11.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+        </dependency>
+    </dependencies>
+</project>