From 2cfc6ecedc852a9a2b9121cc721f035bf192c8b3 Mon Sep 17 00:00:00 2001 From: nec Date: Tue, 9 Jan 2024 15:19:48 +0100 Subject: [PATCH 1/5] Upgrade dependencies --- input_statistics/README.txt | 1 - pom.xml | 24 +++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 input_statistics/README.txt diff --git a/input_statistics/README.txt b/input_statistics/README.txt deleted file mode 100644 index fb86e684..00000000 --- a/input_statistics/README.txt +++ /dev/null @@ -1 +0,0 @@ -Drag & drop dump files (.json or .json.sz) in this folder. diff --git a/pom.xml b/pom.xml index 00e818e0..31c12e24 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ org.springframework.boot spring-boot-starter-parent - 2.7.8 + 2.7.18 com.activeviam.tools mac 3.0.0-SNAPSHOT - ActivePivot Memory Analysis Cube + Atoti Server Memory Analysis Cube @@ -25,11 +25,10 @@ 11 - 6.0.6 - 5.1.5 + 6.0.10 + 5.1.13 9.0.31 - 1.18.18 com.activeviam.mac.app.MacSpringBootApp @@ -43,7 +42,7 @@ com.activeviam.activepivot activepivot-server - ${activepivot.version} + ${atoti-server.version} pom import @@ -54,7 +53,6 @@ org.projectlombok lombok - ${lombok.version} provided @@ -101,11 +99,11 @@ hibernate-c3p0 - + com.activeviam.activeui activeui - ${activeui.version} + ${atoti-ui.version} runtime @@ -137,13 +135,13 @@ com.activeviam.activepivot activepivot-test - ${activepivot.version} + ${atoti-server.version} test com.activeviam.activepivot activepivot-server-test - ${activepivot.version} + ${atoti-server.version} test @@ -169,7 +167,7 @@ com.google.guava guava - 31.0.1-jre + 32.1.3-jre test @@ -179,7 +177,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.4.1 enforce-versions From 0d8613b4a671550ef089aa023ead66f55056cb2b Mon Sep 17 00:00:00 2001 From: nec Date: Tue, 9 Jan 2024 15:35:44 +0100 Subject: [PATCH 2/5] Fix tests after server upgrade --- .../memory/ATestMemoryStatistic.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/test/java/com/activeviam/mac/statistic/memory/ATestMemoryStatistic.java b/src/test/java/com/activeviam/mac/statistic/memory/ATestMemoryStatistic.java index b52007f6..7e3a4fda 100644 --- a/src/test/java/com/activeviam/mac/statistic/memory/ATestMemoryStatistic.java +++ b/src/test/java/com/activeviam/mac/statistic/memory/ATestMemoryStatistic.java @@ -50,7 +50,6 @@ import com.qfs.store.NoTransactionException; import com.qfs.store.TypeValues; import com.qfs.store.build.impl.UnitTestDatastoreBuilder; -import com.qfs.store.impl.Datastore; import com.qfs.store.query.ICursor; import com.qfs.store.record.IRecordReader; import com.qfs.store.transaction.DatastoreTransactionException; @@ -111,13 +110,13 @@ public static void performGC() { /* * Note. We can't rely on calling MemUtils.runGC() because on some servers (alto), it seems not enough. - * Plus, MemUtils relies on on heap memory.... + * Plus, MemUtils relies on on-heap memory.... */ for (int i = 0; i < MAX_GC_STEPS; i++) { try { System.gc(); - Thread.sleep(1 << i); // give gc some times. + Thread.sleep(1 << i); // give gc some time. // create a soft assertion that allows getting the assertions results of all assertions // even if the first assertion is already false. @@ -134,7 +133,7 @@ public static void performGC() { } void createApplication( - final ThrowingLambda.ThrowingBiConsumer actions) { + final ThrowingLambda.ThrowingBiConsumer actions) { final IDatastoreSchemaDescription datastoreSchema = StartBuilding.datastoreSchema() .withStore( @@ -321,7 +320,7 @@ void createApplication( .end() .build()) .build(); - final ApplicationInTests application = + final ApplicationInTests application = ApplicationInTests.builder() .withDatastore(datastoreSchema) .withManager(userManagerDescription) @@ -332,7 +331,7 @@ void createApplication( } void createMinimalApplication( - final ThrowingLambda.ThrowingBiConsumer actions) { + final ThrowingLambda.ThrowingBiConsumer actions) { final IDatastoreSchemaDescription datastoreSchema = StartBuilding.datastoreSchema() @@ -382,7 +381,7 @@ void createMinimalApplication( .build()) .build(); - final ApplicationInTests application = + final ApplicationInTests application = ApplicationInTests.builder() .withDatastore(datastoreSchema) .withManager(userManagerDescription) @@ -397,7 +396,7 @@ void createMinimalApplication( * * @param datastore datastore to fill */ - static void fillApplicationMinimal(final Datastore datastore) { + static void fillApplicationMinimal(final IDatastore datastore) { AtomicInteger operationsBatch = new AtomicInteger(); datastore.edit( tm -> { @@ -429,7 +428,7 @@ static void fillApplicationMinimal(final Datastore datastore) { * * @param datastore datastore to fill */ - static void fillApplication(final Datastore datastore) { + static void fillApplication(final IDatastore datastore) { datastore.edit( tm -> { final int peopleCount = STORE_PEOPLE_COUNT; @@ -470,7 +469,7 @@ static void fillApplication(final Datastore datastore) { * * @param datastore datastore to fill */ - static void fillApplicationMinimalWithSingleValue(final Datastore datastore) { + static void fillApplicationMinimalWithSingleValue(final IDatastore datastore) { AtomicInteger operationsBatch = new AtomicInteger(); datastore.edit( @@ -502,7 +501,7 @@ static void fillApplicationMinimalWithSingleValue(final Datastore datastore) { * * @param datastore datastore to fill */ - static void editApplicationMinimalWithSingleValue(final Datastore datastore) { + static void editApplicationMinimalWithSingleValue(final IDatastore datastore) { datastore.edit( tm -> { final int peopleCount = STORE_PEOPLE_COUNT; @@ -534,7 +533,7 @@ static void editApplicationMinimalWithSingleValue(final Datastore datastore) { * @param datastore datastore to fill */ static void fillApplicationWithBranches( - final Datastore datastore, Collection branches, boolean minimalFilling) + final IDatastore datastore, Collection branches, boolean minimalFilling) throws IllegalArgumentException { if (minimalFilling) { fillApplicationMinimal(datastore); @@ -940,7 +939,7 @@ ApplicationInTests createDistributedApplicationWithKeepAllEpochPolic StartBuilding.cube("QueryCubeA") .withContributorsCount() .withCalculations( - context -> Copper.count().multiply(Copper.constant(2L)).publish(context)) + context -> Copper.count().multiply(Copper.constant(2L)).as("Contributors count times 2").publish(context)) .asQueryCube() .withClusterDefinition() .withClusterId(clusterName) From f1a9667df9069ea2ac1cc1dc8252685f145a6f9a Mon Sep 17 00:00:00 2001 From: nec Date: Tue, 9 Jan 2024 17:33:28 +0100 Subject: [PATCH 3/5] Formatting --- .../mac/statistic/memory/ATestMemoryStatistic.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/activeviam/mac/statistic/memory/ATestMemoryStatistic.java b/src/test/java/com/activeviam/mac/statistic/memory/ATestMemoryStatistic.java index 7e3a4fda..b7cda2cd 100644 --- a/src/test/java/com/activeviam/mac/statistic/memory/ATestMemoryStatistic.java +++ b/src/test/java/com/activeviam/mac/statistic/memory/ATestMemoryStatistic.java @@ -939,7 +939,11 @@ ApplicationInTests createDistributedApplicationWithKeepAllEpochPolic StartBuilding.cube("QueryCubeA") .withContributorsCount() .withCalculations( - context -> Copper.count().multiply(Copper.constant(2L)).as("Contributors count times 2").publish(context)) + context -> + Copper.count() + .multiply(Copper.constant(2L)) + .as("Contributors count times 2") + .publish(context)) .asQueryCube() .withClusterDefinition() .withClusterId(clusterName) From 74d8d854fbcee1e70829a148b7d20d24855da120 Mon Sep 17 00:00:00 2001 From: nec Date: Thu, 11 Jan 2024 15:37:09 +0100 Subject: [PATCH 4/5] Fix gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5f5cfac1..1d2aa8df 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ # Statistic folder to drop exported reports # Keep the folder for the README but ignore everything else /input_statistics/* -!/input_statistics/README.txt +!/input_statistics/README.md target logs # misc. IDE config files From 3c079e1e15449ac100388fe95aefb2cd7cf3ae59 Mon Sep 17 00:00:00 2001 From: nec Date: Thu, 11 Jan 2024 15:37:15 +0100 Subject: [PATCH 5/5] Fix gitignore --- input_statistics/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 input_statistics/README.md diff --git a/input_statistics/README.md b/input_statistics/README.md new file mode 100644 index 00000000..fb86e684 --- /dev/null +++ b/input_statistics/README.md @@ -0,0 +1 @@ +Drag & drop dump files (.json or .json.sz) in this folder.