Skip to content

Commit 8ee2957

Browse files
arunkumarchackoarunkumarchacko
committed
Remove unused properties from pom.xml
Fix some spotbug issues
1 parent aa6a149 commit 8ee2957

File tree

2 files changed

+0
-148
lines changed

2 files changed

+0
-148
lines changed

‎hadoop-tools/hadoop-gcp/pom.xml

Lines changed: 0 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,6 @@
3535
<file.encoding>UTF-8</file.encoding>
3636
<downloadSources>true</downloadSources>
3737
<hadoop.tmp.dir>${project.build.directory}/test</hadoop.tmp.dir>
38-
39-
<!-- are scale tests enabled ? -->
40-
<fs.gs.scale.test.enabled>unset</fs.gs.scale.test.enabled>
41-
<!-- Size in MB of huge files. -->
42-
<fs.gs.scale.test.huge.filesize>unset</fs.gs.scale.test.huge.filesize>
43-
<!-- Size in MB of the partion size in huge file uploads. -->
44-
<fs.gs.scale.test.huge.partitionsize>unset</fs.gs.scale.test.huge.partitionsize>
45-
<!-- Timeout in seconds for scale tests.-->
46-
<fs.gs.scale.test.timeout>3600</fs.gs.scale.test.timeout>
47-
48-
<!-- Set a longer timeout for integration test (in milliseconds) -->
49-
<test.integration.timeout>200000</test.integration.timeout>
50-
51-
<!-- Job ID; allows for parallel jobs on same bucket -->
52-
<!-- job.id is used to build the path for tests; default is 00.-->
53-
<job.id>00</job.id>
54-
<!-- are root tests enabled. Set to false when running parallel jobs on same bucket -->
55-
<root.tests.enabled>unset</root.tests.enabled>
5638
</properties>
5739

5840
<profiles>
@@ -113,12 +95,6 @@
11395
<test.build.dir>${test.build.dir}/${surefire.forkNumber}</test.build.dir>
11496
<hadoop.tmp.dir>${hadoop.tmp.dir}/${surefire.forkNumber}</hadoop.tmp.dir>
11597
<test.unique.fork.id>job-${job.id}-fork-000${surefire.forkNumber}</test.unique.fork.id>
116-
117-
<!-- Propagate scale parameters -->
118-
<fs.gs.scale.test.enabled>${fs.gs.scale.test.enabled}</fs.gs.scale.test.enabled>
119-
<fs.gs.scale.test.huge.filesize>${fs.gs.scale.test.huge.filesize}</fs.gs.scale.test.huge.filesize>
120-
<fs.gs.scale.test.huge.huge.partitionsize>${fs.gs.scale.test.huge.partitionsize}</fs.gs.scale.test.huge.huge.partitionsize>
121-
<fs.gs.scale.test.timeout>${fs.gs.scale.test.timeout}</fs.gs.scale.test.timeout>
12298
</systemPropertyVariables>
12399
</configuration>
124100
</plugin>
@@ -150,26 +126,8 @@
150126
<!-- substitution. Putting a prefix in front of it like -->
151127
<!-- "fork-" makes it work. -->
152128
<test.unique.fork.id>job-${job.id}-fork-000${surefire.forkNumber}</test.unique.fork.id>
153-
<!-- Propagate scale parameters -->
154-
<fs.gs.scale.test.enabled>${fs.gs.scale.test.enabled}</fs.gs.scale.test.enabled>
155-
<fs.gs.scale.test.huge.filesize>${fs.gs.scale.test.huge.filesize}</fs.gs.scale.test.huge.filesize>
156-
<fs.gs.scale.test.huge.huge.partitionsize>${fs.gs.scale.test.huge.partitionsize}</fs.gs.scale.test.huge.huge.partitionsize>
157-
<fs.gs.scale.test.timeout>${fs.gs.scale.test.timeout}</fs.gs.scale.test.timeout>
158129
<test.default.timeout>${test.integration.timeout}</test.default.timeout>
159-
<!-- Stream Type -->
160-
<!-- <fs.gs.input.stream.type>${stream}</fs.gs.input.stream.type>-->
161-
<!-- are root tests enabled. Set to false when running parallel jobs on same bucket -->
162-
<fs.gs.root.tests.enabled>${root.tests.enabled}</fs.gs.root.tests.enabled>
163-
164130
</systemPropertyVariables>
165-
<!-- Some tests cannot run in parallel. Tests that cover -->
166-
<!-- access to the root directory must run in isolation -->
167-
<!-- from anything else that could modify the bucket. -->
168-
<!-- MiniYARNCluster has not yet been -->
169-
<!-- changed to handle parallel test execution gracefully. -->
170-
<!-- Exclude all of these tests from parallel execution, -->
171-
<!-- and instead run them sequentially in a separate -->
172-
<!-- Surefire execution step later. -->
173131
<includes>
174132
<include>**/ITest*.java</include>
175133
</includes>
@@ -187,15 +145,6 @@
187145
<systemPropertyVariables>
188146
<!-- Tell tests that they are being executed sequentially -->
189147
<test.parallel.execution>false</test.parallel.execution>
190-
<!-- Propagate scale parameters -->
191-
<fs.gs.scale.test.enabled>${fs.gs.scale.test.enabled}</fs.gs.scale.test.enabled>
192-
<fs.gs.scale.test.huge.filesize>${fs.gs.scale.test.huge.filesize}</fs.gs.scale.test.huge.filesize>
193-
<fs.gs.scale.test.huge.huge.partitionsize>${fs.gs.scale.test.huge.partitionsize}</fs.gs.scale.test.huge.huge.partitionsize>
194-
<fs.gs.scale.test.timeout>${fs.gs.scale.test.timeout}</fs.gs.scale.test.timeout>
195-
<!-- Stream Type -->
196-
<!-- <fs.gs.input.stream.type>${stream}</fs.gs.input.stream.type>-->
197-
<!-- are root tests enabled. Set to false when running parallel jobs on same bucket -->
198-
<!-- <fs.gs.root.tests.enabled>${root.tests.enabled}</fs.gs.root.tests.enabled>-->
199148
<test.unique.fork.id>job-${job.id}</test.unique.fork.id>
200149
</systemPropertyVariables>
201150
<!-- Do a sequential run for tests that cannot handle -->
@@ -231,61 +180,15 @@
231180
<configuration>
232181
<trimStackTrace>false</trimStackTrace>
233182
<systemPropertyVariables>
234-
<!-- Propagate scale parameters -->
235-
<fs.gs.scale.test.enabled>${fs.gs.scale.test.enabled}</fs.gs.scale.test.enabled>
236-
<fs.gs.scale.test.huge.filesize>${fs.gs.scale.test.huge.filesize}</fs.gs.scale.test.huge.filesize>
237-
<fs.gs.scale.test.timeout>${fs.gs.scale.test.timeout}</fs.gs.scale.test.timeout>
238-
239183
<test.unique.fork.id>job-${job.id}</test.unique.fork.id>
240184
</systemPropertyVariables>
241-
<forkedProcessTimeoutInSeconds>${fs.gs.scale.test.timeout}</forkedProcessTimeoutInSeconds>
242185
</configuration>
243186
</execution>
244187
</executions>
245188
</plugin>
246189
</plugins>
247190
</build>
248191
</profile>
249-
250-
<!-- Turn on scale tests-->
251-
<profile>
252-
<id>scale</id>
253-
<activation>
254-
<property>
255-
<name>scale</name>
256-
</property>
257-
</activation>
258-
<properties >
259-
<fs.gs.scale.test.enabled>true</fs.gs.scale.test.enabled>
260-
</properties>
261-
</profile>
262-
263-
<!-- Turn on prefetching-->
264-
<profile>
265-
<id>prefetch</id>
266-
<activation>
267-
<property>
268-
<name>prefetch</name>
269-
</property>
270-
</activation>
271-
<properties>
272-
<stream>prefetch</stream>
273-
</properties>
274-
</profile>
275-
276-
<!-- Switch to the analytics input stream-->
277-
<profile>
278-
<id>analytics</id>
279-
<activation>
280-
<property>
281-
<name>analytics</name>
282-
</property>
283-
</activation>
284-
<properties>
285-
<stream>analytics</stream>
286-
</properties>
287-
</profile>
288-
289192
</profiles>
290193

291194
<build>
@@ -469,54 +372,6 @@
469372
</systemPropertyVariables>
470373
</configuration>
471374
</plugin>
472-
<plugin>
473-
<groupId>org.apache.maven.plugins</groupId>
474-
<artifactId>maven-dependency-plugin</artifactId>
475-
<executions>
476-
<execution>
477-
<id>deplist1</id>
478-
<phase>compile</phase>
479-
<goals>
480-
<goal>list</goal>
481-
</goals>
482-
<configuration>
483-
<!-- build a shellprofile for hadoop-aws optional tools -->
484-
<outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-optional.txt</outputFile>
485-
</configuration>
486-
</execution>
487-
<execution>
488-
<id>copy</id>
489-
<phase>test-compile</phase>
490-
<goals>
491-
<goal>copy-dependencies</goal>
492-
</goals>
493-
<configuration>
494-
<includeScope>test</includeScope>
495-
<includeTypes>so,dll,dylib</includeTypes>
496-
<outputDirectory>${project.build.directory}/native-libs</outputDirectory>
497-
</configuration>
498-
</execution>
499-
<execution>
500-
<phase>package</phase>
501-
<goals>
502-
<goal>copy-dependencies</goal>
503-
</goals>
504-
<configuration>
505-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
506-
</configuration>
507-
</execution>
508-
<execution>
509-
<id>deplist2</id>
510-
<phase>compile</phase>
511-
<goals>
512-
<goal>list</goal>
513-
</goals>
514-
<configuration>
515-
<outputFile>${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt</outputFile>
516-
</configuration>
517-
</execution>
518-
</executions>
519-
</plugin>
520375
<plugin>
521376
<groupId>org.apache.maven.plugins</groupId>
522377
<artifactId>maven-enforcer-plugin</artifactId>

‎hadoop-tools/hadoop-gcp/src/main/java/org/apache/hadoop/fs/gs/CreateOptions.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap;
2424

25-
import java.time.Duration;
2625
import java.util.Map;
2726
import javax.annotation.Nullable;
2827

@@ -97,8 +96,6 @@ long getOverwriteGenerationId() {
9796
static class CreateOperationOptionsBuilder {
9897
private Map<String, byte[]> attributes = ImmutableMap.of();
9998
private String contentType = "application/octet-stream";
100-
private boolean ensureNoDirectoryConflict = true;
101-
private Duration interval = Duration.ZERO;
10299
private long overwriteGenerationId = StorageResourceId.UNKNOWN_GENERATION_ID;
103100
private WriteMode writeMode = WriteMode.CREATE_NEW;
104101

0 commit comments

Comments
 (0)