This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 4c80522 [IOTDB-2003] add overwrite method with @Override (#4374)
4c80522 is described below
commit 4c80522cc52c48b3cea35a11cc2563915fd43f42
Author: Qian.Sun <[email protected]>
AuthorDate: Sat Nov 13 12:31:07 2021 +0800
[IOTDB-2003] add overwrite method with @Override (#4374)
---
.../WrappedSingleThreadScheduledExecutor.java | 17 +++++++++++++++++
.../cross/AbstractCrossSpaceCompactionSelector.java | 1 +
.../inner/AbstractInnerSpaceCompactionSelector.java | 1 +
.../sizetiered/SizeTieredCompactionRecoverTask.java | 1 +
.../engine/compaction/task/AbstractCompactionTask.java | 1 +
.../org/apache/iotdb/db/engine/flush/FlushManager.java | 1 +
.../engine/modification/utils/TracedBufferedReader.java | 8 ++++++++
.../org/apache/iotdb/db/metadata/mnode/EntityMNode.java | 1 +
.../apache/iotdb/db/metadata/mnode/IEntityMNode.java | 1 +
.../apache/iotdb/db/metadata/mnode/InternalMNode.java | 1 +
.../db/qp/physical/crud/InsertMultiTabletPlan.java | 2 ++
.../db/qp/physical/crud/InsertRowsOfOneDevicePlan.java | 1 +
.../iotdb/db/qp/physical/crud/InsertRowsPlan.java | 1 +
.../db/qp/physical/sys/CreateMultiTimeSeriesPlan.java | 1 +
.../org/apache/iotdb/db/qp/utils/EmptyOutputStream.java | 1 +
15 files changed, 39 insertions(+)
diff --git
a/server/src/main/java/org/apache/iotdb/db/concurrent/threadpool/WrappedSingleThreadScheduledExecutor.java
b/server/src/main/java/org/apache/iotdb/db/concurrent/threadpool/WrappedSingleThreadScheduledExecutor.java
index 78acfe9..e6949ef 100644
---
a/server/src/main/java/org/apache/iotdb/db/concurrent/threadpool/WrappedSingleThreadScheduledExecutor.java
+++
b/server/src/main/java/org/apache/iotdb/db/concurrent/threadpool/WrappedSingleThreadScheduledExecutor.java
@@ -45,79 +45,96 @@ public class WrappedSingleThreadScheduledExecutor
JMXService.registerMBean(this, this.mbeanName);
}
+ @Override
public ScheduledFuture<?> schedule(Runnable command, long delay, TimeUnit
unit) {
return service.schedule(command, delay, unit);
}
+ @Override
public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay,
TimeUnit unit) {
return service.schedule(callable, delay, unit);
}
+ @Override
public ScheduledFuture<?> scheduleAtFixedRate(
Runnable command, long initialDelay, long period, TimeUnit unit) {
return service.scheduleAtFixedRate(command, initialDelay, period, unit);
}
+ @Override
public ScheduledFuture<?> scheduleWithFixedDelay(
Runnable command, long initialDelay, long delay, TimeUnit unit) {
return service.scheduleWithFixedDelay(command, initialDelay, delay, unit);
}
+ @Override
public void shutdown() {
service.shutdown();
JMXService.deregisterMBean(mbeanName);
}
+ @Override
public List<Runnable> shutdownNow() {
JMXService.deregisterMBean(mbeanName);
return service.shutdownNow();
}
+ @Override
public boolean isShutdown() {
return service.isShutdown();
}
+ @Override
public boolean isTerminated() {
return service.isTerminated();
}
+ @Override
public boolean awaitTermination(long timeout, TimeUnit unit) throws
InterruptedException {
return service.awaitTermination(timeout, unit);
}
+ @Override
public <T> Future<T> submit(Callable<T> task) {
return service.submit(task);
}
+ @Override
public <T> Future<T> submit(Runnable task, T result) {
return service.submit(task, result);
}
+ @Override
public Future<?> submit(Runnable task) {
return service.submit(task);
}
+ @Override
public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
throws InterruptedException {
return service.invokeAll(tasks);
}
+ @Override
public <T> List<Future<T>> invokeAll(
Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
throws InterruptedException {
return service.invokeAll(tasks, timeout, unit);
}
+ @Override
public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
throws InterruptedException, ExecutionException {
return service.invokeAny(tasks);
}
+ @Override
public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long
timeout, TimeUnit unit)
throws InterruptedException, ExecutionException, TimeoutException {
return service.invokeAny(tasks, timeout, unit);
}
+ @Override
public void execute(Runnable command) {
service.execute(command);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/AbstractCrossSpaceCompactionSelector.java
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/AbstractCrossSpaceCompactionSelector.java
index 954e770..f7d1368 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/AbstractCrossSpaceCompactionSelector.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/AbstractCrossSpaceCompactionSelector.java
@@ -47,5 +47,6 @@ public abstract class AbstractCrossSpaceCompactionSelector
extends AbstractCompa
this.taskFactory = taskFactory;
}
+ @Override
public abstract boolean selectAndSubmit();
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/AbstractInnerSpaceCompactionSelector.java
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/AbstractInnerSpaceCompactionSelector.java
index e2e1b91..43039d8 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/AbstractInnerSpaceCompactionSelector.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/AbstractInnerSpaceCompactionSelector.java
@@ -48,5 +48,6 @@ public abstract class AbstractInnerSpaceCompactionSelector
extends AbstractCompa
this.taskFactory = taskFactory;
}
+ @Override
public abstract boolean selectAndSubmit();
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionRecoverTask.java
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionRecoverTask.java
index bb85289..9cf2772 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionRecoverTask.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionRecoverTask.java
@@ -71,6 +71,7 @@ public class SizeTieredCompactionRecoverTask extends
SizeTieredCompactionTask {
* <li><b>No compaction log file exists</b>: do nothing
* </ol>
*/
+ @Override
public void doCompaction() {
// read log -> Set<Device> -> doCompaction -> clear
try {
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java
index 70eccf9..b1d9128 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/task/AbstractCompactionTask.java
@@ -85,6 +85,7 @@ public abstract class AbstractCompactionTask implements
Callable<Void> {
*/
public abstract boolean checkValidAndSetMerging();
+ @Override
public boolean equals(Object other) {
if (other instanceof AbstractCompactionTask) {
return equalsOtherTask((AbstractCompactionTask) other);
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
b/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
index 1901fd1..752dffd 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
@@ -171,6 +171,7 @@ public class FlushManager implements FlushManagerMBean,
IService {
private static FlushManager instance = new FlushManager();
}
+ @Override
public String toString() {
return String.format(
"TSProcessors in the queue: %d, TaskPool size %d + %d,",
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/modification/utils/TracedBufferedReader.java
b/server/src/main/java/org/apache/iotdb/db/engine/modification/utils/TracedBufferedReader.java
index 2dce0b2..429eff9 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/modification/utils/TracedBufferedReader.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/modification/utils/TracedBufferedReader.java
@@ -130,6 +130,7 @@ public class TracedBufferedReader extends Reader {
}
/** {@link BufferedReader#read()} */
+ @Override
public int read() throws IOException {
synchronized (lock) {
ensureOpen();
@@ -179,6 +180,7 @@ public class TracedBufferedReader extends Reader {
}
/** {@link BufferedReader#read(char[], int, int)} */
+ @Override
public int read(char cbuf[], int off, int len) throws IOException {
synchronized (lock) {
ensureOpen();
@@ -272,6 +274,7 @@ public class TracedBufferedReader extends Reader {
}
/** {@link BufferedReader#skip(long)} */
+ @Override
public long skip(long n) throws IOException {
if (n < 0L) {
throw new IllegalArgumentException("skip value is negative");
@@ -303,6 +306,7 @@ public class TracedBufferedReader extends Reader {
}
/** {@link BufferedReader#ready()} */
+ @Override
public boolean ready() throws IOException {
synchronized (lock) {
ensureOpen();
@@ -328,11 +332,13 @@ public class TracedBufferedReader extends Reader {
}
/** {@link BufferedReader#markSupported()} */
+ @Override
public boolean markSupported() {
return true;
}
/** {@link BufferedReader#mark(int)} */
+ @Override
public void mark(int readAheadLimit) throws IOException {
if (readAheadLimit < 0) {
throw new IllegalArgumentException("Read-ahead limit < 0");
@@ -346,6 +352,7 @@ public class TracedBufferedReader extends Reader {
}
/** {@link BufferedReader#reset()} */
+ @Override
public void reset() throws IOException {
synchronized (lock) {
ensureOpen();
@@ -357,6 +364,7 @@ public class TracedBufferedReader extends Reader {
}
/** {@link BufferedReader#close()} */
+ @Override
public void close() throws IOException {
synchronized (lock) {
if (in == null) return;
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/EntityMNode.java
b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/EntityMNode.java
index 11e7f91..ad8d3d5 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/EntityMNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/EntityMNode.java
@@ -115,6 +115,7 @@ public class EntityMNode extends InternalMNode implements
IEntityMNode {
this.useTemplate = useTemplate;
}
+ @Override
public ILastCacheContainer getLastCacheContainer(String measurementId) {
checkLastCacheMap();
return lastCacheMap.computeIfAbsent(measurementId, k -> new
LastCacheContainer());
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/IEntityMNode.java
b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/IEntityMNode.java
index a77abe62..fadc368 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/IEntityMNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/IEntityMNode.java
@@ -32,6 +32,7 @@ public interface IEntityMNode extends IMNode {
void setAliasChildren(Map<String, IMeasurementMNode> aliasChildren);
+ @Override
boolean isUseTemplate();
void setUseTemplate(boolean useTemplate);
diff --git
a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/InternalMNode.java
b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/InternalMNode.java
index 4a07b53..f745fe2 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/InternalMNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/InternalMNode.java
@@ -104,6 +104,7 @@ public class InternalMNode extends MNode {
* @param child child's node
* @return return the MNode already added
*/
+ @Override
public IMNode addChild(IMNode child) {
/* use cpu time to exchange memory
* measurementNode's children should be null to save memory
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertMultiTabletPlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertMultiTabletPlan.java
index d425cda..bee6c12 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertMultiTabletPlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertMultiTabletPlan.java
@@ -129,6 +129,7 @@ public class InsertMultiTabletPlan extends InsertPlan
implements BatchPlan {
return result;
}
+ @Override
public List<PartialPath> getPrefixPaths() {
if (prefixPaths != null) {
return prefixPaths;
@@ -165,6 +166,7 @@ public class InsertMultiTabletPlan extends InsertPlan
implements BatchPlan {
return insertTabletPlanList.size();
}
+ @Override
public Map<Integer, TSStatus> getResults() {
return results;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsOfOneDevicePlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsOfOneDevicePlan.java
index 1c09c22..01c0fbc 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsOfOneDevicePlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsOfOneDevicePlan.java
@@ -239,6 +239,7 @@ public class InsertRowsOfOneDevicePlan extends InsertPlan
implements BatchPlan {
return isExecuted[i];
}
+ @Override
public Map<Integer, TSStatus> getResults() {
return results;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsPlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsPlan.java
index 0bc4322..b2597c6 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsPlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsPlan.java
@@ -218,6 +218,7 @@ public class InsertRowsPlan extends InsertPlan implements
BatchPlan {
}
}
+ @Override
public Map<Integer, TSStatus> getResults() {
return results;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateMultiTimeSeriesPlan.java
b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateMultiTimeSeriesPlan.java
index 2fc3e9c..19572e7 100644
---
a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateMultiTimeSeriesPlan.java
+++
b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/CreateMultiTimeSeriesPlan.java
@@ -142,6 +142,7 @@ public class CreateMultiTimeSeriesPlan extends PhysicalPlan
implements BatchPlan
this.indexes = indexes;
}
+ @Override
public Map<Integer, TSStatus> getResults() {
return results;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/qp/utils/EmptyOutputStream.java
b/server/src/main/java/org/apache/iotdb/db/qp/utils/EmptyOutputStream.java
index ee8fde8..55a28e2 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/utils/EmptyOutputStream.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/utils/EmptyOutputStream.java
@@ -30,5 +30,6 @@ public class EmptyOutputStream extends OutputStream {
@Override
public void write(byte b[], int off, int len) throws IOException {}
+ @Override
public void write(byte b[]) throws IOException {}
}
