Skip to content

Commit 3ef7ed7

Browse files
authored
HDDS-12262. Fix license headers and imports for hdds-managed-rocksdb (apache#7874)
1 parent b192c45 commit 3ef7ed7

29 files changed

+261
-300
lines changed

hadoop-hdds/managed-rocksdb/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,6 @@
6666
<proc>none</proc>
6767
</configuration>
6868
</plugin>
69-
<plugin>
70-
<groupId>org.apache.maven.plugins</groupId>
71-
<artifactId>maven-checkstyle-plugin</artifactId>
72-
<configuration>
73-
<suppressionsLocation>${basedir}/../../hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml</suppressionsLocation>
74-
</configuration>
75-
</plugin>
7669
</plugins>
7770
</build>
7871
</project>

hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/JniLibNamePropertyWriter.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
9-
* <p>
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
* <p>
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
1211
* Unless required by applicable law or agreed to in writing, software
1312
* distributed under the License is distributed on an "AS IS" BASIS,
1413
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1514
* See the License for the specific language governing permissions and
1615
* limitations under the License.
1716
*/
18-
package org.apache.hadoop.hdds.utils.db.managed;
1917

18+
package org.apache.hadoop.hdds.utils.db.managed;
2019

2120
import java.io.IOException;
2221
import java.io.OutputStreamWriter;

hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedBlockBasedTableConfig.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
98
*
109
* http://www.apache.org/licenses/LICENSE-2.0
1110
*
@@ -14,15 +13,14 @@
1413
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1514
* See the License for the specific language governing permissions and
1615
* limitations under the License.
17-
*
1816
*/
17+
1918
package org.apache.hadoop.hdds.utils.db.managed;
2019

20+
import java.util.concurrent.atomic.AtomicBoolean;
2121
import org.rocksdb.BlockBasedTableConfig;
2222
import org.rocksdb.Cache;
2323

24-
import java.util.concurrent.atomic.AtomicBoolean;
25-
2624
/**
2725
* Managed BlockBasedTableConfig.
2826
*/

hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedBloomFilter.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
98
*
109
* http://www.apache.org/licenses/LICENSE-2.0
1110
*
@@ -14,15 +13,15 @@
1413
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1514
* See the License for the specific language governing permissions and
1615
* limitations under the License.
17-
*
1816
*/
17+
1918
package org.apache.hadoop.hdds.utils.db.managed;
2019

20+
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
21+
2122
import org.apache.ratis.util.UncheckedAutoCloseable;
2223
import org.rocksdb.BloomFilter;
2324

24-
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
25-
2625
/**
2726
* Managed BloomFilter.
2827
*/

hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedCheckpoint.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
98
*
109
* http://www.apache.org/licenses/LICENSE-2.0
1110
*
12-
* Unless required by applicable law or agreed to in writing, software
13-
* distributed under the License is distributed on an "AS IS" BASIS,
14-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
* See the License for the specific language governing permissions and
16-
* limitations under the License.
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
1716
*/
17+
1818
package org.apache.hadoop.hdds.utils.db.managed;
1919

2020
import org.rocksdb.Checkpoint;

hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedColumnFamilyOptions.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
98
*
109
* http://www.apache.org/licenses/LICENSE-2.0
1110
*
@@ -14,16 +13,16 @@
1413
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1514
* See the License for the specific language governing permissions and
1615
* limitations under the License.
17-
*
1816
*/
17+
1918
package org.apache.hadoop.hdds.utils.db.managed;
2019

20+
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
21+
2122
import org.apache.ratis.util.UncheckedAutoCloseable;
2223
import org.rocksdb.ColumnFamilyOptions;
2324
import org.rocksdb.TableFormatConfig;
2425

25-
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
26-
2726
/**
2827
* Managed ColumnFamilyOptions.
2928
*/

hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedCompactRangeOptions.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
98
*
109
* http://www.apache.org/licenses/LICENSE-2.0
1110
*
@@ -14,15 +13,15 @@
1413
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1514
* See the License for the specific language governing permissions and
1615
* limitations under the License.
17-
*
1816
*/
17+
1918
package org.apache.hadoop.hdds.utils.db.managed;
2019

20+
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
21+
2122
import org.apache.ratis.util.UncheckedAutoCloseable;
2223
import org.rocksdb.CompactRangeOptions;
2324

24-
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
25-
2625
/**
2726
* Managed CompactRangeOptions.
2827
*/

hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedDBOptions.java

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
98
*
109
* http://www.apache.org/licenses/LICENSE-2.0
1110
*
@@ -14,20 +13,19 @@
1413
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1514
* See the License for the specific language governing permissions and
1615
* limitations under the License.
17-
*
1816
*/
17+
1918
package org.apache.hadoop.hdds.utils.db.managed;
2019

20+
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.LOG;
21+
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
22+
23+
import java.util.concurrent.atomic.AtomicReference;
2124
import org.apache.hadoop.hdds.utils.IOUtils;
2225
import org.apache.ratis.util.UncheckedAutoCloseable;
2326
import org.rocksdb.DBOptions;
2427
import org.rocksdb.Logger;
2528

26-
import java.util.concurrent.atomic.AtomicReference;
27-
28-
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.LOG;
29-
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
30-
3129
/**
3230
* Managed DBOptions.
3331
*/

hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedEnvOptions.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
98
*
109
* http://www.apache.org/licenses/LICENSE-2.0
1110
*
@@ -14,15 +13,15 @@
1413
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1514
* See the License for the specific language governing permissions and
1615
* limitations under the License.
17-
*
1816
*/
17+
1918
package org.apache.hadoop.hdds.utils.db.managed;
2019

20+
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
21+
2122
import org.apache.ratis.util.UncheckedAutoCloseable;
2223
import org.rocksdb.EnvOptions;
2324

24-
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
25-
2625
/**
2726
* Managed EnvOptions.
2827
*/

hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedFlushOptions.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
98
*
109
* http://www.apache.org/licenses/LICENSE-2.0
1110
*
@@ -14,15 +13,15 @@
1413
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1514
* See the License for the specific language governing permissions and
1615
* limitations under the License.
17-
*
1816
*/
17+
1918
package org.apache.hadoop.hdds.utils.db.managed;
2019

20+
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
21+
2122
import org.apache.ratis.util.UncheckedAutoCloseable;
2223
import org.rocksdb.FlushOptions;
2324

24-
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
25-
2625
/**
2726
* Managed FlushOptions.
2827
*/

hadoop-hdds/managed-rocksdb/src/main/java/org/apache/hadoop/hdds/utils/db/managed/ManagedIngestExternalFileOptions.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one
3-
* or more contributor license agreements. See the NOTICE file
4-
* distributed with this work for additional information
5-
* regarding copyright ownership. The ASF licenses this file
6-
* to you under the Apache License, Version 2.0 (the
7-
* "License"); you may not use this file except in compliance
8-
* with the License. You may obtain a copy of the License at
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
98
*
109
* http://www.apache.org/licenses/LICENSE-2.0
1110
*
@@ -14,15 +13,15 @@
1413
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1514
* See the License for the specific language governing permissions and
1615
* limitations under the License.
17-
*
1816
*/
17+
1918
package org.apache.hadoop.hdds.utils.db.managed;
2019

20+
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
21+
2122
import org.apache.ratis.util.UncheckedAutoCloseable;
2223
import org.rocksdb.IngestExternalFileOptions;
2324

24-
import static org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils.track;
25-
2625
/**
2726
* Managed IngestExternalFileOptions.
2827
*/

0 commit comments

Comments
 (0)