You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2022/02/07 14:05:09 UTC
[cassandra-harry] branch release updated (714c547 -> 24469d9)
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a change to branch release
in repository https://gitbox.apache.org/repos/asf/cassandra-harry.git.
discard 714c547 [maven-release-plugin] prepare for next development iteration
omit 099081b [maven-release-plugin] prepare release 1.0.0
omit d347964 Make number of runs configurable
new 40dc69b Make number of runs configurable
new 8f67338 [maven-release-plugin] prepare release 1.0.0
new 24469d9 [maven-release-plugin] prepare for next development iteration
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (714c547)
\
N -- N -- N refs/heads/release (24469d9)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
harry-core/pom.xml | 2 +-
harry-integration-external/dependency-reduced-pom.xml | 2 +-
harry-integration-external/pom.xml | 2 +-
harry-integration/pom.xml | 2 +-
pom.xml | 14 +-------------
5 files changed, 5 insertions(+), 17 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra-harry] 02/03: [maven-release-plugin] prepare release 1.0.0
Posted by if...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/cassandra-harry.git
commit 8f67338bae54dcdfa333c2424925ca76bcde62e9
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Mon Feb 7 14:55:35 2022 +0100
[maven-release-plugin] prepare release 1.0.0
---
harry-core/pom.xml | 5 ++---
harry-integration-external/pom.xml | 5 ++---
harry-integration/pom.xml | 5 ++---
pom.xml | 7 +++----
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/harry-core/pom.xml b/harry-core/pom.xml
index 65fc8eb..7eced35 100755
--- a/harry-core/pom.xml
+++ b/harry-core/pom.xml
@@ -17,8 +17,7 @@
~ limitations under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -26,7 +25,7 @@
<parent>
<groupId>org.apache.cassandra</groupId>
<artifactId>harry-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<artifactId>harry-core</artifactId>
diff --git a/harry-integration-external/pom.xml b/harry-integration-external/pom.xml
index 553cc19..ee8a573 100755
--- a/harry-integration-external/pom.xml
+++ b/harry-integration-external/pom.xml
@@ -17,15 +17,14 @@
~ limitations under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<parent>
<groupId>org.apache.cassandra</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>harry-parent</artifactId>
</parent>
diff --git a/harry-integration/pom.xml b/harry-integration/pom.xml
index 2c2ce00..a7b04e9 100755
--- a/harry-integration/pom.xml
+++ b/harry-integration/pom.xml
@@ -17,15 +17,14 @@
~ limitations under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<parent>
<groupId>org.apache.cassandra</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<artifactId>harry-parent</artifactId>
</parent>
diff --git a/pom.xml b/pom.xml
index 4fadc09..0d08412 100755
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,7 @@
~ limitations under the License.
-->
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache</groupId>
@@ -39,7 +38,7 @@
<groupId>org.apache.cassandra</groupId>
<artifactId>harry-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Harry</name>
@@ -262,6 +261,6 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/cassandra-harry.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/cassandra-harry.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf/cassandra-harry.git</url>
- <tag>0.0.1</tag>
+ <tag>1.0.0</tag>
</scm>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra-harry] 01/03: Make number of runs configurable
Posted by if...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/cassandra-harry.git
commit 40dc69bba89bbe175a5a119747a1782fdbd7e9c2
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Mon Feb 7 14:33:09 2022 +0100
Make number of runs configurable
---
harry-core/src/harry/generators/PCGFastPure.java | 2 +-
harry-core/test/harry/generators/DataGeneratorsTest.java | 2 +-
harry-core/test/harry/generators/RandomGeneratorTest.java | 2 +-
harry-core/test/harry/model/ApproximateClockTest.java | 2 +-
harry-core/test/harry/model/OpSelectorsTest.java | 2 +-
harry-core/test/harry/operations/RelationTest.java | 4 ++--
harry-core/test/harry/util/RangesTest.java | 8 ++++----
harry-integration/test/harry/ddl/SchemaGenTest.java | 2 +-
.../test/harry/generators/DataGeneratorsIntegrationTest.java | 4 +++-
harry-integration/test/harry/model/QuerySelectorNegativeTest.java | 4 ++--
10 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/harry-core/src/harry/generators/PCGFastPure.java b/harry-core/src/harry/generators/PCGFastPure.java
index 9e438dc..caed276 100644
--- a/harry-core/src/harry/generators/PCGFastPure.java
+++ b/harry-core/src/harry/generators/PCGFastPure.java
@@ -25,7 +25,7 @@ package harry.generators;
* https://github.com/imneme/pcg-c
* https://github.com/imneme/pcg-cpp
* <p>
- * Original library developed by Melissa O'Neill <on...@pcg-random.org>
+ * Original library developed by Melissa O'Neill (oneill@pcg-random.org)
*/
public class PCGFastPure
{
diff --git a/harry-core/test/harry/generators/DataGeneratorsTest.java b/harry-core/test/harry/generators/DataGeneratorsTest.java
index 386644f..8b35418 100644
--- a/harry-core/test/harry/generators/DataGeneratorsTest.java
+++ b/harry-core/test/harry/generators/DataGeneratorsTest.java
@@ -38,7 +38,7 @@ import static harry.generators.Bijections.Bijection;
public class DataGeneratorsTest
{
- private static final int RUNS = 100;
+ private static final int RUNS = Integer.parseInt(System.getProperty("harry.test.cycles", "1000"));
private static final RandomGenerator rand = RandomGenerator.forTests(1);
@Test
diff --git a/harry-core/test/harry/generators/RandomGeneratorTest.java b/harry-core/test/harry/generators/RandomGeneratorTest.java
index d735670..15b8a77 100644
--- a/harry-core/test/harry/generators/RandomGeneratorTest.java
+++ b/harry-core/test/harry/generators/RandomGeneratorTest.java
@@ -32,7 +32,7 @@ import static junit.framework.TestCase.fail;
public class RandomGeneratorTest
{
- private static int RUNS = 100000;
+ private static int RUNS = Integer.parseInt(System.getProperty("harry.test.cycles", "1000"));
@Test
public void testScale()
diff --git a/harry-core/test/harry/model/ApproximateClockTest.java b/harry-core/test/harry/model/ApproximateClockTest.java
index 4e86a66..ada6dbe 100644
--- a/harry-core/test/harry/model/ApproximateClockTest.java
+++ b/harry-core/test/harry/model/ApproximateClockTest.java
@@ -122,7 +122,7 @@ public class ApproximateClockTest
signalError.await(10, TimeUnit.SECONDS);
lock.unlock();
executor.shutdown();
- Assert.assertTrue(executor.awaitTermination(30, TimeUnit.SECONDS));
+ Assert.assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS));
scheduledExecutor.shutdown();
Assert.assertTrue(scheduledExecutor.awaitTermination(10, TimeUnit.SECONDS));
Throwable t = throwable.get();
diff --git a/harry-core/test/harry/model/OpSelectorsTest.java b/harry-core/test/harry/model/OpSelectorsTest.java
index e2ebd82..ac991f6 100644
--- a/harry-core/test/harry/model/OpSelectorsTest.java
+++ b/harry-core/test/harry/model/OpSelectorsTest.java
@@ -51,7 +51,7 @@ import harry.util.BitSet;
public class OpSelectorsTest
{
- private static int RUNS = 10000;
+ private static int RUNS = Integer.parseInt(System.getProperty("harry.test.cycles", "1000"));
@Test
public void testRowDataDescriptorSupplier()
diff --git a/harry-core/test/harry/operations/RelationTest.java b/harry-core/test/harry/operations/RelationTest.java
index eaa7ddb..7436662 100644
--- a/harry-core/test/harry/operations/RelationTest.java
+++ b/harry-core/test/harry/operations/RelationTest.java
@@ -35,7 +35,7 @@ import harry.util.BitSet;
public class RelationTest
{
- private static int RUNS = 100;
+ private static int RUNS = Integer.parseInt(System.getProperty("harry.test.cycles", "1000"));
@Test
public void testKeyGenerators()
@@ -67,7 +67,7 @@ public class RelationTest
Collections.emptyList(),
false);
- long[] cds = new long[100];
+ long[] cds = new long[RUNS];
int[] fractions = new int[schemaSpec.clusteringKeys.size()];
int last = cds.length;
diff --git a/harry-core/test/harry/util/RangesTest.java b/harry-core/test/harry/util/RangesTest.java
index 1a0da7e..8bcad70 100644
--- a/harry-core/test/harry/util/RangesTest.java
+++ b/harry-core/test/harry/util/RangesTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
public class RangesTest
{
-
+ private static int RUNS = Integer.parseInt(System.getProperty("harry.test.cycles", "1000"));
@Test
public void simpleRangesTest()
{
@@ -52,7 +52,7 @@ public class RangesTest
@Test
public void randomizedRangesTest()
{
- for (int i = 0; i < 1000; i++)
+ for (int i = 0; i < RUNS; i++)
_randomizedRangesTest();
}
@@ -60,7 +60,7 @@ public class RangesTest
{
List<Ranges.Range> rangesList = new ArrayList<>();
Random rnd = new Random();
- for (int i = 0; i < 100; i++)
+ for (int i = 0; i < RUNS; i++)
{
long a = rnd.nextInt(1000);
long b = rnd.nextInt(1000);
@@ -73,7 +73,7 @@ public class RangesTest
}
Ranges ranges = new Ranges(rangesList);
- for (int i = 0; i < 10000; i++)
+ for (int i = 0; i < RUNS; i++)
{
long descriptor = rnd.nextLong();
long ts = rnd.nextInt(1000);
diff --git a/harry-integration/test/harry/ddl/SchemaGenTest.java b/harry-integration/test/harry/ddl/SchemaGenTest.java
index c6204cd..a55420e 100644
--- a/harry-integration/test/harry/ddl/SchemaGenTest.java
+++ b/harry-integration/test/harry/ddl/SchemaGenTest.java
@@ -46,7 +46,7 @@ import static org.quicktheories.generators.SourceDSL.integers;
public class SchemaGenTest extends CQLTester
{
- private static final int CYCLES = 10;
+ private static final int CYCLES = Integer.parseInt(System.getProperty("harry.test.cycles", "1000"));
// TODO: compact storage tests
@Test
diff --git a/harry-integration/test/harry/generators/DataGeneratorsIntegrationTest.java b/harry-integration/test/harry/generators/DataGeneratorsIntegrationTest.java
index 0da7743..e337752 100644
--- a/harry-integration/test/harry/generators/DataGeneratorsIntegrationTest.java
+++ b/harry-integration/test/harry/generators/DataGeneratorsIntegrationTest.java
@@ -26,6 +26,8 @@ import relocated.shaded.com.google.common.collect.Iterators;
public class DataGeneratorsIntegrationTest extends CQLTester
{
+ private static final int CYCLES = Integer.parseInt(System.getProperty("harry.test.cycles", "1000"));
+
@Test
public void testTimestampTieResolution() throws Throwable
{
@@ -40,7 +42,7 @@ public class DataGeneratorsIntegrationTest extends CQLTester
{
createTable(String.format("CREATE TABLE %%s (pk int PRIMARY KEY, v %s)",
dataType.toString()));
- for (int i = 0; i < 10_000; i++)
+ for (int i = 0; i < CYCLES; i++)
{
long d1 = dataType.generator().adjustEntropyDomain(rng.nextLong());
long d2 = dataType.generator().adjustEntropyDomain(rng.nextLong());
diff --git a/harry-integration/test/harry/model/QuerySelectorNegativeTest.java b/harry-integration/test/harry/model/QuerySelectorNegativeTest.java
index 13ae548..8b9e69e 100644
--- a/harry-integration/test/harry/model/QuerySelectorNegativeTest.java
+++ b/harry-integration/test/harry/model/QuerySelectorNegativeTest.java
@@ -50,7 +50,7 @@ import static harry.corruptor.QueryResponseCorruptor.SimpleQueryResponseCorrupto
@RunWith(Parameterized.class)
public class QuerySelectorNegativeTest extends IntegrationTestBase
{
- private final int CYCLES = 1000;
+ private static final int RUNS = Integer.parseInt(System.getProperty("harry.test.cycles", "1000"));
private final Random rnd = new Random();
@@ -116,7 +116,7 @@ public class QuerySelectorNegativeTest extends IntegrationTestBase
QueryResponseCorruptor corruptor = this.corruptorFactory.create(run);
- for (int i = 0; i < CYCLES; i++)
+ for (int i = 0; i < RUNS; i++)
visitor.visit();
while (true)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra-harry] 03/03: [maven-release-plugin] prepare for next development iteration
Posted by if...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch release
in repository https://gitbox.apache.org/repos/asf/cassandra-harry.git
commit 24469d93a81cf433f8cf226e8837b15363ec3f27
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Mon Feb 7 14:55:43 2022 +0100
[maven-release-plugin] prepare for next development iteration
---
harry-core/pom.xml | 2 +-
harry-integration-external/dependency-reduced-pom.xml | 2 +-
harry-integration-external/pom.xml | 2 +-
harry-integration/pom.xml | 2 +-
pom.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/harry-core/pom.xml b/harry-core/pom.xml
index 7eced35..a5c1387 100755
--- a/harry-core/pom.xml
+++ b/harry-core/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.cassandra</groupId>
<artifactId>harry-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>harry-core</artifactId>
diff --git a/harry-integration-external/dependency-reduced-pom.xml b/harry-integration-external/dependency-reduced-pom.xml
index c3d0eb7..dbb2000 100644
--- a/harry-integration-external/dependency-reduced-pom.xml
+++ b/harry-integration-external/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>harry-parent</artifactId>
<groupId>org.apache.cassandra</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>harry-integration-external</artifactId>
diff --git a/harry-integration-external/pom.xml b/harry-integration-external/pom.xml
index ee8a573..9ea6495 100755
--- a/harry-integration-external/pom.xml
+++ b/harry-integration-external/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cassandra</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<artifactId>harry-parent</artifactId>
</parent>
diff --git a/harry-integration/pom.xml b/harry-integration/pom.xml
index a7b04e9..1e41f95 100755
--- a/harry-integration/pom.xml
+++ b/harry-integration/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cassandra</groupId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<artifactId>harry-parent</artifactId>
</parent>
diff --git a/pom.xml b/pom.xml
index 0d08412..178f081 100755
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<groupId>org.apache.cassandra</groupId>
<artifactId>harry-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Harry</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org