Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade testng version to 7.8.0 #11462

Merged
merged 1 commit into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions pinot-clients/pinot-java-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@
<pinot.root>${basedir}/../..</pinot.root>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
Expand Down
10 changes: 0 additions & 10 deletions pinot-clients/pinot-jdbc-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@
<pinot.root>${basedir}/../..</pinot.root>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
<directory>src/main/resources</directory>
Expand Down
12 changes: 12 additions & 0 deletions pinot-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,18 @@
</resources>
<!-- Antlr stuff -->
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration combine.children="override">
<properties>
<property>
<name>usedefaultlisteners</name>
<value>false</value> <!-- This will disable all default listeners -->
</property>
</properties>
</configuration>
</plugin>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
Expand Down
1 change: 0 additions & 1 deletion pinot-connectors/pinot-spark-2-connector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
Expand Down
1 change: 0 additions & 1 deletion pinot-connectors/pinot-spark-3-connector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
Expand Down
1 change: 0 additions & 1 deletion pinot-connectors/pinot-spark-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
Expand Down
5 changes: 0 additions & 5 deletions pinot-controller/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!--
version upgraded to 3.0.0-M5 since the earlier version (2.19) was causing test cases defined in suites to run
twice. See https://github.com/apache/pinot/pull/6326#issue-533412053 for more details.
-->
<version>3.0.0-M5</version>
<configuration combine.children="override">
<suiteXmlFiles>
<suiteXmlFile>testng-statefull.xml</suiteXmlFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public void setUp()
// - Failed to copy segment tar file to final location due to the same segment pushed twice concurrently.
// In such cases we upload all the segments again to ensure that the data is setup correctly.
assertTrue(e.getMessage().contains("Another segment upload is in progress for segment") || e.getMessage()
.contains("Failed to update ZK metadata for segment") || e.getMessage()
.contains("Failed to create ZK metadata for segment") || e.getMessage()
.contains("java.nio.file.FileAlreadyExistsException"), e.getMessage());
uploadSegments(getTableName(), _tarDir);
}
Expand Down Expand Up @@ -238,7 +238,7 @@ public void setUp()
// If enableParallelPushProtection is enabled and the same segment is uploaded concurrently, we could get one
// of the three exception:
// - 409 conflict of the second call enters ProcessExistingSegment ;
// - segmentZkMetadata creation failure if both calls entered ProcessNewSegment.
// - segmentZkMetadata update failure if both calls entered ProcessNewSegment.
// - Failed to copy segment tar file to final location due to the same segment pushed twice concurrently.
// In such cases we upload all the segments again to ensure that the data is setup correctly.
assertTrue(e.getMessage().contains("Another segment upload is in progress for segment") || e.getMessage()
Expand Down Expand Up @@ -1133,14 +1133,15 @@ public void testRangeIndexTriggering(boolean useMultiStageQueryEngine)
// Update table config and trigger reload
TableConfig tableConfig = getOfflineTableConfig();
tableConfig.getIndexingConfig().setRangeIndexColumns(UPDATED_RANGE_INDEX_COLUMNS);
updateTableConfig(tableConfig);
reloadAllSegments(TEST_UPDATED_RANGE_INDEX_QUERY, false, numTotalDocs);
assertEquals(postQuery(TEST_UPDATED_RANGE_INDEX_QUERY).get("numEntriesScannedInFilter").asLong(), 0L);

// Update table config to remove the new range index, and check if the new range index is removed
tableConfig = getOfflineTableConfig();
tableConfig.getIndexingConfig().setRangeIndexColumns(getRangeIndexColumns());
updateTableConfig(tableConfig);
reloadAllSegments(TEST_UPDATED_RANGE_INDEX_QUERY, false, numTotalDocs);
reloadAllSegments(TEST_UPDATED_RANGE_INDEX_QUERY, true, numTotalDocs);
assertEquals(postQuery(TEST_UPDATED_RANGE_INDEX_QUERY).get("numEntriesScannedInFilter").asLong(), numTotalDocs);
assertEquals(getTableSize(getTableName()), _tableSizeAfterRemovingIndex);
}
Expand All @@ -1163,7 +1164,7 @@ public void testBloomFilterTriggering()
tableConfig = getOfflineTableConfig();
tableConfig.getIndexingConfig().setBloomFilterColumns(getBloomFilterColumns());
updateTableConfig(tableConfig);
reloadAllSegments(TEST_UPDATED_BLOOM_FILTER_QUERY, false, numTotalDocs);
reloadAllSegments(TEST_UPDATED_BLOOM_FILTER_QUERY, true, numTotalDocs);
assertEquals(postQuery(TEST_UPDATED_BLOOM_FILTER_QUERY).get("numSegmentsProcessed").asLong(), NUM_SEGMENTS);
assertEquals(getTableSize(getTableName()), _tableSizeAfterRemovingIndex);
}
Expand Down
6 changes: 4 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@
<stax2-api.version>4.1</stax2-api.version>
<aws.sdk.version>2.20.94</aws.sdk.version>
<joda-time.version>2.12.5</joda-time.version>
<testng.version>7.8.0</testng.version>

<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>-Xms4g -Xmx4g</argLine>
<protobuf.version>3.22.0</protobuf.version>
Expand All @@ -174,9 +176,9 @@

<!-- Configuration for Packaging -->
<shade.prefix>org.apache.pinot.shaded</shade.prefix>
<surefire.version>3.0.0-M5</surefire.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
<surefire.version>3.1.2</surefire.version>
</properties>

<profiles>
Expand Down Expand Up @@ -399,7 +401,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.11</version>
<version>${testng.version}</version>
</dependency>
<dependency>
<groupId>org.roaringbitmap</groupId>
Expand Down
Loading