Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-18284. Remove Unnecessary semicolon ';' (#4422). Contributed by fanshilun.

This commit is contained in:
slfan1989 2022-06-29 02:50:41 -07:00 committed by GitHub
parent 321a4844ad
commit 073b8ea1d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java
View File

@ -164,7 +164,7 @@ public void testWorkingDirectory() throws IOException {
public void testSyncable() throws IOException {
FileSystem fs = fileSys.getRawFileSystem();
Path file = new Path(TEST_ROOT_DIR, "syncable");
FSDataOutputStream out = fs.create(file);;
FSDataOutputStream out = fs.create(file);
final int bytesWritten = 1;
byte[] expectedBuf = new byte[] {'0', '1', '2', '3'};
try {

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeqFileComparison.java
View File

@ -516,7 +516,7 @@ private static String parameters2String(MyOptions options) {
}
private static class MyOptions {
String rootDir = GenericTestUtils.getTestDir().getAbsolutePath();;
String rootDir = GenericTestUtils.getTestDir().getAbsolutePath();
String compress = "gz";
String format = "tfile";
int dictSize = 1000;

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/RPCCallBenchmark.java
View File

@ -289,7 +289,7 @@ public int run(String[] args) throws Exception {
long cpuNanosClient = getTotalCpuTime(ctx.getTestThreads());
long cpuNanosServer = -1;
if (server != null) {
cpuNanosServer = getTotalCpuTime(server.getHandlers());;
cpuNanosServer = getTotalCpuTime(server.getHandlers());
}
System.out.println("====== Results ======");
System.out.println("Options:\n" + opts);

16
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestWhitelistBasedResolver.java
View File

@ -111,16 +111,16 @@ public void testFixedAndLocalWhiteList() throws IOException {
assertEquals (wqr.getDefaultProperties(),
wqr.getServerProperties(InetAddress.getByName("10.119.103.112")));
assertEquals (SASL_PRIVACY_PROPS, wqr.getServerProperties("10.119.103.113"));
assertEquals(SASL_PRIVACY_PROPS, wqr.getServerProperties("10.119.103.113"));
assertEquals (wqr.getDefaultProperties(), wqr.getServerProperties("10.221.103.121"));
assertEquals(wqr.getDefaultProperties(), wqr.getServerProperties("10.221.103.121"));
assertEquals (SASL_PRIVACY_PROPS, wqr.getServerProperties("10.221.104.0"));
assertEquals (SASL_PRIVACY_PROPS, wqr.getServerProperties("10.222.103.121"));
assertEquals (SASL_PRIVACY_PROPS, wqr.getServerProperties("10.223.104.0"));
assertEquals (SASL_PRIVACY_PROPS, wqr.getServerProperties("10.113.221.221"));
assertEquals (SASL_PRIVACY_PROPS, wqr.getServerProperties("10.113.221.222"));
assertEquals (wqr.getDefaultProperties(), wqr.getServerProperties("127.0.0.1"));;
assertEquals(SASL_PRIVACY_PROPS, wqr.getServerProperties("10.221.104.0"));
assertEquals(SASL_PRIVACY_PROPS, wqr.getServerProperties("10.222.103.121"));
assertEquals(SASL_PRIVACY_PROPS, wqr.getServerProperties("10.223.104.0"));
assertEquals(SASL_PRIVACY_PROPS, wqr.getServerProperties("10.113.221.221"));
assertEquals(SASL_PRIVACY_PROPS, wqr.getServerProperties("10.113.221.222"));
assertEquals(wqr.getDefaultProperties(), wqr.getServerProperties("127.0.0.1"));
TestFileBasedIPList.removeFile("fixedwhitelist.txt");
TestFileBasedIPList.removeFile("variablewhitelist.txt");

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java
View File

@ -745,7 +745,7 @@ private void constructHttpServerURI(GetEditLogManifestResponseProto ret) {
URI uri = URI.create(ret.getFromURL());
httpServerURL = getHttpServerURI(uri.getScheme(), uri.getPort());
} else {
httpServerURL = getHttpServerURI("http", ret.getHttpPort());;
httpServerURL = getHttpServerURI("http", ret.getHttpPort());
}
}
@ -754,7 +754,7 @@ private void constructHttpServerURI(GetJournalStateResponseProto ret) {
URI uri = URI.create(ret.getFromURL());
httpServerURL = getHttpServerURI(uri.getScheme(), uri.getPort());
} else {
httpServerURL = getHttpServerURI("http", ret.getHttpPort());;
httpServerURL = getHttpServerURI("http", ret.getHttpPort());
}
}

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
View File

@ -803,7 +803,7 @@ enum Command {
geteditsizeOpt = new Option("geteditsize",
"return the number of uncheckpointed transactions on the NameNode");
checkpointOpt = OptionBuilder.withArgName("force")
.hasOptionalArg().withDescription("checkpoint on startup").create("checkpoint");;
.hasOptionalArg().withDescription("checkpoint on startup").create("checkpoint");
formatOpt = new Option("format", "format the local storage during startup");
helpOpt = new Option("h", "help", false, "get help information");

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlockRetry.java
View File

@ -99,7 +99,7 @@ public void testRetryAddBlockWhileInChooseTarget() throws Exception {
HdfsConstants.GRANDFATHER_INODE_ID,
"clientName", null, onRetryBlock);
} finally {
ns.readUnlock();;
ns.readUnlock();
}
DatanodeStorageInfo targets[] = FSDirWriteFileOp.chooseTargetForNewBlock(
ns.getBlockManager(), src, null, null, null, r);

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckPointForSecurityTokens.java
View File

@ -91,7 +91,7 @@ public void testSaveNamespace() throws IOException {
log.scanLog(Long.MAX_VALUE, true);
long numTransactions = (log.getLastTxId() - log.getFirstTxId()) + 1;
assertEquals("In-progress log " + log + " should have 5 transactions",
5, numTransactions);;
5, numTransactions);
}
// Saving image in safe mode should succeed

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
View File

@ -2613,7 +2613,7 @@ private static List<File> getCheckpointCurrentDirs(SecondaryNameNode secondary)
}
private static CheckpointStorage spyOnSecondaryImage(SecondaryNameNode secondary1) {
CheckpointStorage spy = Mockito.spy((CheckpointStorage)secondary1.getFSImage());;
CheckpointStorage spy = Mockito.spy((CheckpointStorage)secondary1.getFSImage());
secondary1.setFSImage(spy);
return spy;
}

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFavoredNodesEndToEnd.java
View File

@ -150,7 +150,7 @@ public void testWhenSomeNodesAreNotGood() throws Exception {
d.stopDecommission();
BlockLocation[] locations = getBlockLocations(p);
Assert.assertEquals(replication, locations[0].getNames().length);;
Assert.assertEquals(replication, locations[0].getNames().length);
//also make sure that the datanode[0] is not in the list of hosts
for (int i = 0; i < replication; i++) {
final String loc = locations[0].getNames()[i];

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDelegationTokensWithHA.java
View File

@ -317,7 +317,7 @@ public Void run() throws Exception {
longUgi.doAs(new PrivilegedExceptionAction<Void>() {
@Override
public Void run() throws Exception {
token.cancel(conf);;
token.cancel(conf);
return null;
}
});

8
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java
View File

@ -150,8 +150,8 @@ public void readFields(DataInput in) throws IOException {
* @param <V>
*/
class TrackedRecordReader<K, V>
implements RecordReader<K,V> {
private RecordReader<K,V> rawIn;
implements RecordReader<K, V> {
private RecordReader<K, V> rawIn;
private Counters.Counter fileInputByteCounter;
private Counters.Counter inputRecordCounter;
private TaskReporter reporter;
@ -240,7 +240,7 @@ private long getInputBytes(List<Statistics> stats) {
* This class skips the records based on the failed ranges from previous
* attempts.
*/
class SkippingRecordReader<K, V> extends TrackedRecordReader<K,V> {
class SkippingRecordReader<K, V> extends TrackedRecordReader<K, V> {
private SkipRangeIterator skipIt;
private SequenceFile.Writer skipWriter;
private boolean toWriteSkipRecs;
@ -930,7 +930,7 @@ public static class MapOutputBuffer<K extends Object, V extends Object>
// spill accounting
private int maxRec;
private int softLimit;
boolean spillInProgress;;
boolean spillInProgress;
int bufferRemaining;
volatile Throwable sortSpillException = null;

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/aggregate/LongValueMax.java
View File

@ -96,7 +96,7 @@ public void reset() {
* expected to be used by the a combiner.
*/
public ArrayList<String> getCombinerOutput() {
ArrayList<String> retv = new ArrayList<String>(1);;
ArrayList<String> retv = new ArrayList<String>(1);
retv.add("" + maxVal);
return retv;
}

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsTasksBlock.java
View File

@ -123,7 +123,7 @@ public class HsTasksBlock extends HtmlBlock {
long sortFinishTime = -1;
long attemptFinishTime = -1;
long elapsedShuffleTime = -1;
long elapsedSortTime = -1;;
long elapsedSortTime = -1;
long elapsedReduceTime = -1;
long attemptElapsed = -1;
TaskAttempt successful = info.getSuccessful();

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/BigMapOutput.java
View File

@ -70,7 +70,7 @@ private static void createBigMapInputFile(Configuration conf, FileSystem fs,
BytesWritable.class, BytesWritable.class,
CompressionType.NONE);
long numBytesToWrite = fileSizeInMB * 1024 * 1024;
int minKeySize = conf.getInt(MIN_KEY, 10);;
int minKeySize = conf.getInt(MIN_KEY, 10);
int keySizeRange =
conf.getInt(MAX_KEY, 1000) - minKeySize;
int minValueSize = conf.getInt(MIN_VALUE, 0);

6
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/NotificationTestCase.java
View File

@ -179,8 +179,7 @@ public void testMR() throws Exception {
// Hack for local FS that does not have the concept of a 'mounting point'
if (isLocalFS()) {
String localPathRoot = System.getProperty("test.build.data","/tmp")
.toString().replace(' ', '+');;
String localPathRoot = System.getProperty("test.build.data", "/tmp").replace(' ', '+');
inDir = new Path(localPathRoot, inDir);
outDir = new Path(localPathRoot, outDir);
}
@ -217,8 +216,7 @@ private String launchWordCount(JobConf conf,
// Hack for local FS that does not have the concept of a 'mounting point'
if (isLocalFS()) {
String localPathRoot = System.getProperty("test.build.data","/tmp")
.toString().replace(' ', '+');;
String localPathRoot = System.getProperty("test.build.data", "/tmp").replace(' ', '+');
inDir = new Path(localPathRoot, inDir);
outDir = new Path(localPathRoot, outDir);
}

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestValueIterReset.java
View File

@ -437,7 +437,7 @@ private static int test3(IntWritable key,
int count = 0;
while (values.hasNext()) {
i = values.next();;
i = values.next();
LOG.info(key + ":" + i);
if (count == 5) {

2
hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/math/LongLong.java
View File

@ -84,7 +84,7 @@ static LongLong multiplication(final LongLong r, final long a, final long b) {
final long v = x1*y1;
final long tmp = (t - u)>>>1;
result.d0 = ((t + u)>>>1) - v + ((tmp << MID) & FULL_MASK);;
result.d0 = ((t + u)>>>1) - v + ((tmp << MID) & FULL_MASK);
result.d1 = v + (tmp >> MID);
return result;
*/

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
View File

@ -1928,7 +1928,7 @@ public void testGetQueueInfoWithNonExistedQueue() throws Exception {
QueueCLI cli = createAndGetQueueCLI();
when(client.getQueueInfo(any(String.class))).thenReturn(null);
int result = cli.run(new String[] { "-status", queueName });
assertEquals(-1, result);;
assertEquals(-1, result);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintWriter pw = new PrintWriter(baos);
pw.println("Cannot get queue from RM by queueName = " + queueName

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ReservationAllocationStatePBImpl.java
View File

@ -62,7 +62,7 @@
public class ReservationAllocationStatePBImpl extends
ReservationAllocationState {
private ReservationAllocationStateProto proto =
ReservationAllocationStateProto.getDefaultInstance();;
ReservationAllocationStateProto.getDefaultInstance();
private ReservationAllocationStateProto.Builder builder = null;
private boolean viaProto = false;

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ConfiguredYarnAuthorizer.java
View File

@ -43,7 +43,7 @@ public class ConfiguredYarnAuthorizer extends YarnAuthorizationProvider {
private final ConcurrentMap<PrivilegedEntity, Map<AccessType, AccessControlList>>
allAcls = new ConcurrentHashMap<>();
private volatile AccessControlList adminAcl = null;
private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();;
private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
private final ReentrantReadWriteLock.ReadLock readLock = lock.readLock();
private final ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/WindowsSecureContainerExecutor.java
View File

@ -449,7 +449,7 @@ private enum State {
COMPLETE
};
private State state;;
private State state;
private final String cwd;
private final String jobName;

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java
View File

@ -496,7 +496,7 @@ private void containerBasedPreemptOrKill(CSQueue root,
Map<ApplicationAttemptId, Set<RMContainer>> toPreempt =
new HashMap<>();
Map<PreemptionCandidatesSelector, Map<ApplicationAttemptId,
Set<RMContainer>>> toPreemptPerSelector = new HashMap<>();;
Set<RMContainer>>> toPreemptPerSelector = new HashMap<>();
for (PreemptionCandidatesSelector selector :
candidatesSelectionPolicies) {
long startTime = 0;

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestAppManager.java
View File

@ -1772,7 +1772,7 @@ private static ContainerLaunchContext mockContainerLaunchContext(
RecordFactory recordFactory) {
ContainerLaunchContext amContainer = recordFactory.newRecordInstance(
ContainerLaunchContext.class);
amContainer.setApplicationACLs(new HashMap<ApplicationAccessType, String>());;
amContainer.setApplicationACLs(new HashMap<ApplicationAccessType, String>());
return amContainer;
}

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
View File

@ -109,7 +109,7 @@
public class TestRMAdminService {
private Configuration configuration;;
private Configuration configuration;
private MockRM rm = null;
private FileSystem fs;
private Path workingPath;