Skip to content

Commit 9d336f6

Browse files
iamalekseyiamaleksey
committed
Ninja-fix checkstyle import warnings
1 parent a5116b9 commit 9d336f6

133 files changed

Lines changed: 501 additions & 322 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import java.util.HashSet;
2424
import java.util.List;
2525
import java.util.Map;
26-
import java.util.Set;
2726
import java.util.Objects;
27+
import java.util.Set;
2828
import java.util.TreeMap;
2929

3030
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -58,10 +58,10 @@
5858
import org.apache.cassandra.io.IVersionedSerializer;
5959
import org.apache.cassandra.io.util.DataInputPlus;
6060
import org.apache.cassandra.io.util.DataOutputPlus;
61-
import org.apache.cassandra.schema.TableMetadata;
61+
import org.apache.cassandra.schema.Schema;
6262
import org.apache.cassandra.schema.TableId;
63+
import org.apache.cassandra.schema.TableMetadata;
6364
import org.apache.cassandra.schema.TableParams;
64-
import org.apache.cassandra.schema.Schema;
6565
import org.apache.cassandra.service.ClientState;
6666
import org.apache.cassandra.service.PreserveTimestamp;
6767
import org.apache.cassandra.service.accord.api.PartitionKey;

‎src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@
124124
import org.apache.cassandra.service.accord.txn.TxnReferenceOperation;
125125
import org.apache.cassandra.service.accord.txn.TxnReferenceOperations;
126126
import org.apache.cassandra.service.accord.txn.TxnWrite;
127-
import org.apache.cassandra.service.replication.migration.MigrationRouter;
128127
import org.apache.cassandra.service.disk.usage.DiskUsageBroadcaster;
129128
import org.apache.cassandra.service.paxos.Ballot;
130129
import org.apache.cassandra.service.paxos.BallotGenerator;
131130
import org.apache.cassandra.service.paxos.Commit.Proposal;
131+
import org.apache.cassandra.service.replication.migration.MigrationRouter;
132132
import org.apache.cassandra.tcm.ClusterMetadata;
133133
import org.apache.cassandra.transport.Dispatcher;
134134
import org.apache.cassandra.transport.messages.ResultMessage;

‎src/java/org/apache/cassandra/cql3/statements/schema/KeyspaceAttributes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import org.apache.cassandra.exceptions.SyntaxException;
3030
import org.apache.cassandra.schema.KeyspaceParams;
3131
import org.apache.cassandra.schema.KeyspaceParams.Option;
32-
import org.apache.cassandra.schema.ReplicationType;
3332
import org.apache.cassandra.schema.ReplicationParams;
33+
import org.apache.cassandra.schema.ReplicationType;
3434
import org.apache.cassandra.service.accord.fastpath.FastPathStrategy;
3535

3636
public final class KeyspaceAttributes extends PropertyDefinitions

‎src/java/org/apache/cassandra/db/MutationExceededMaxSizeException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
package org.apache.cassandra.db;
2020

21+
import java.io.IOException;
2122
import java.util.Iterator;
2223
import java.util.List;
2324
import java.util.stream.Collectors;
24-
import java.io.IOException;
2525

2626
import com.google.common.annotations.VisibleForTesting;
2727

‎src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
import org.apache.cassandra.db.partitions.SingletonUnfilteredPartitionIterator;
5858
import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator;
5959
import org.apache.cassandra.db.rows.BaseRowIterator;
60-
import org.apache.cassandra.db.partitions.*;
6160
import org.apache.cassandra.db.rows.Cell;
6261
import org.apache.cassandra.db.rows.Row;
6362
import org.apache.cassandra.db.rows.Rows;
@@ -1600,4 +1599,4 @@ public ReadExecutionController executionController(boolean trackRepairedStatus)
16001599
return executionController();
16011600
}
16021601
}
1603-
}
1602+
}

‎src/java/org/apache/cassandra/db/memtable/ShardedSkipListMemtable.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333

3434
import org.apache.cassandra.db.DataRange;
3535
import org.apache.cassandra.db.DecoratedKey;
36-
import org.apache.cassandra.replication.ImmutableCoordinatorLogOffsets;
37-
import org.apache.cassandra.replication.MutableCoordinatorLogOffsets;
3836
import org.apache.cassandra.db.PartitionPosition;
3937
import org.apache.cassandra.db.RegularAndStaticColumns;
4038
import org.apache.cassandra.db.Slices;
@@ -56,6 +54,8 @@
5654
import org.apache.cassandra.dht.Token;
5755
import org.apache.cassandra.index.transactions.UpdateTransaction;
5856
import org.apache.cassandra.io.sstable.SSTableReadsListener;
57+
import org.apache.cassandra.replication.ImmutableCoordinatorLogOffsets;
58+
import org.apache.cassandra.replication.MutableCoordinatorLogOffsets;
5959
import org.apache.cassandra.replication.MutationId;
6060
import org.apache.cassandra.schema.TableMetadata;
6161
import org.apache.cassandra.schema.TableMetadataRef;

‎src/java/org/apache/cassandra/db/memtable/SkipListMemtable.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
import org.apache.cassandra.db.BufferDecoratedKey;
3535
import org.apache.cassandra.db.DataRange;
3636
import org.apache.cassandra.db.DecoratedKey;
37-
import org.apache.cassandra.replication.ImmutableCoordinatorLogOffsets;
38-
import org.apache.cassandra.replication.MutableCoordinatorLogOffsets;
3937
import org.apache.cassandra.db.PartitionPosition;
4038
import org.apache.cassandra.db.Slices;
4139
import org.apache.cassandra.db.commitlog.CommitLogPosition;
@@ -56,6 +54,8 @@
5654
import org.apache.cassandra.dht.Token;
5755
import org.apache.cassandra.index.transactions.UpdateTransaction;
5856
import org.apache.cassandra.io.sstable.SSTableReadsListener;
57+
import org.apache.cassandra.replication.ImmutableCoordinatorLogOffsets;
58+
import org.apache.cassandra.replication.MutableCoordinatorLogOffsets;
5959
import org.apache.cassandra.replication.MutationId;
6060
import org.apache.cassandra.schema.TableMetadata;
6161
import org.apache.cassandra.schema.TableMetadataRef;

‎src/java/org/apache/cassandra/db/memtable/TrieMemtable.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
import org.apache.cassandra.db.DataRange;
4242
import org.apache.cassandra.db.DecoratedKey;
4343
import org.apache.cassandra.db.DeletionInfo;
44-
import org.apache.cassandra.replication.ImmutableCoordinatorLogOffsets;
45-
import org.apache.cassandra.replication.MutableCoordinatorLogOffsets;
4644
import org.apache.cassandra.db.PartitionPosition;
4745
import org.apache.cassandra.db.RegularAndStaticColumns;
4846
import org.apache.cassandra.db.Slices;
@@ -71,6 +69,8 @@
7169
import org.apache.cassandra.io.compress.BufferType;
7270
import org.apache.cassandra.io.sstable.SSTableReadsListener;
7371
import org.apache.cassandra.metrics.TrieMemtableMetricsView;
72+
import org.apache.cassandra.replication.ImmutableCoordinatorLogOffsets;
73+
import org.apache.cassandra.replication.MutableCoordinatorLogOffsets;
7474
import org.apache.cassandra.replication.MutationId;
7575
import org.apache.cassandra.schema.TableMetadata;
7676
import org.apache.cassandra.schema.TableMetadataRef;

‎src/java/org/apache/cassandra/db/partitions/SimpleBTreePartition.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
import org.apache.cassandra.db.DecoratedKey;
2222
import org.apache.cassandra.db.DeletionInfo;
2323
import org.apache.cassandra.db.RegularAndStaticColumns;
24-
import org.apache.cassandra.db.rows.*;
24+
import org.apache.cassandra.db.rows.ColumnData;
25+
import org.apache.cassandra.db.rows.EncodingStats;
26+
import org.apache.cassandra.db.rows.Row;
27+
import org.apache.cassandra.db.rows.Rows;
2528
import org.apache.cassandra.index.transactions.UpdateTransaction;
2629
import org.apache.cassandra.schema.TableMetadata;
2730
import org.apache.cassandra.utils.btree.BTree;

‎src/java/org/apache/cassandra/db/rows/RowIterators.java‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,32 @@
1717
*/
1818
package org.apache.cassandra.db.rows;
1919

20+
import java.io.IOError;
21+
import java.io.IOException;
22+
2023
import com.google.common.base.Preconditions;
24+
2125
import net.nicoulaj.compilecommand.annotations.Inline;
22-
import org.apache.cassandra.db.*;
23-
import org.apache.cassandra.io.util.DataInputPlus;
24-
import org.apache.cassandra.io.util.DataOutputPlus;
25-
import org.apache.cassandra.schema.ColumnMetadata;
26-
import org.apache.cassandra.utils.ByteBufferUtil;
27-
import org.apache.cassandra.utils.SearchIterator;
28-
import org.apache.cassandra.utils.WrappedException;
26+
2927
import org.slf4j.Logger;
3028
import org.slf4j.LoggerFactory;
3129

30+
import org.apache.cassandra.db.Clustering;
31+
import org.apache.cassandra.db.Columns;
32+
import org.apache.cassandra.db.DecoratedKey;
33+
import org.apache.cassandra.db.Digest;
34+
import org.apache.cassandra.db.EmptyIterators;
35+
import org.apache.cassandra.db.LivenessInfo;
36+
import org.apache.cassandra.db.SerializationHeader;
3237
import org.apache.cassandra.db.filter.ColumnFilter;
3338
import org.apache.cassandra.db.transform.Transformation;
39+
import org.apache.cassandra.io.util.DataInputPlus;
40+
import org.apache.cassandra.io.util.DataOutputPlus;
41+
import org.apache.cassandra.schema.ColumnMetadata;
3442
import org.apache.cassandra.schema.TableMetadata;
35-
36-
import java.io.IOError;
37-
import java.io.IOException;
43+
import org.apache.cassandra.utils.ByteBufferUtil;
44+
import org.apache.cassandra.utils.SearchIterator;
45+
import org.apache.cassandra.utils.WrappedException;
3846

3947
/**
4048
* Static methods to work with row iterators.

0 commit comments

Comments
 (0)