This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch gg-18540 in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 17cb55f19279593ec12a53c3843875a106497b17 Author: Sergey Antonov <[email protected]> AuthorDate: Tue Apr 30 20:56:07 2019 +0300 GG-18543 Reorder modifiers and remove unused imports. --- .../main/java/org/h2/command/dml/MergeUsing.java | 2 +- .../org/h2/expression/analysis/WindowFrame.java | 2 +- .../java/org/h2/util/geometry/GeometryUtils.java | 2 +- modules/h2/src/test/java/org/h2/test/TestAll.java | 3 --- .../h2/test/jdbc/TestCustomDataTypesHandler.java | 15 ++++++------- .../query/h2/database/H2TreeClientIndex.java | 2 -- .../internal/processors/query/h2/dml/DmlUtils.java | 1 - .../processors/query/h2/opt/GridH2ProxyIndex.java | 3 --- .../processors/query/h2/opt/GridH2Table.java | 1 - .../query/h2/sql/GridSqlQueryParser.java | 1 - .../query/h2/twostep/ReduceIndexUnsorted.java | 4 ++-- .../H2DynamicColumnsAbstractBasicSelfTest.java | 1 - .../cache/index/H2DynamicTableSelfTest.java | 1 - .../java/org/apache/ignite/ml/genetic/GAGrid.java | 26 +++++++++++----------- 14 files changed, 25 insertions(+), 39 deletions(-) diff --git a/modules/h2/src/main/java/org/h2/command/dml/MergeUsing.java b/modules/h2/src/main/java/org/h2/command/dml/MergeUsing.java index 2690cd4..17ae626 100644 --- a/modules/h2/src/main/java/org/h2/command/dml/MergeUsing.java +++ b/modules/h2/src/main/java/org/h2/command/dml/MergeUsing.java @@ -40,7 +40,7 @@ public class MergeUsing extends Prepared { /** * Abstract WHEN command of the MERGE statement. */ - public static abstract class When { + public abstract static class When { /** * The parent MERGE statement. diff --git a/modules/h2/src/main/java/org/h2/expression/analysis/WindowFrame.java b/modules/h2/src/main/java/org/h2/expression/analysis/WindowFrame.java index 7d63eec..d1a0c70 100644 --- a/modules/h2/src/main/java/org/h2/expression/analysis/WindowFrame.java +++ b/modules/h2/src/main/java/org/h2/expression/analysis/WindowFrame.java @@ -27,7 +27,7 @@ import org.h2.value.ValueNull; */ public final class WindowFrame { - private static abstract class Itr implements Iterator<Value[]> { + private abstract static class Itr implements Iterator<Value[]> { final ArrayList<Value[]> orderedRows; diff --git a/modules/h2/src/main/java/org/h2/util/geometry/GeometryUtils.java b/modules/h2/src/main/java/org/h2/util/geometry/GeometryUtils.java index c5fd6d40..1c1020e 100644 --- a/modules/h2/src/main/java/org/h2/util/geometry/GeometryUtils.java +++ b/modules/h2/src/main/java/org/h2/util/geometry/GeometryUtils.java @@ -13,7 +13,7 @@ public final class GeometryUtils { /** * Converter output target. */ - public static abstract class Target { + public abstract static class Target { public Target() { } diff --git a/modules/h2/src/test/java/org/h2/test/TestAll.java b/modules/h2/src/test/java/org/h2/test/TestAll.java index 460d850..d84be87 100644 --- a/modules/h2/src/test/java/org/h2/test/TestAll.java +++ b/modules/h2/src/test/java/org/h2/test/TestAll.java @@ -170,7 +170,6 @@ import org.h2.test.synth.TestTimer; import org.h2.test.synth.sql.TestSynth; import org.h2.test.synth.thread.TestMulti; import org.h2.test.unit.TestAnsCompression; -import org.h2.test.unit.TestAutoReconnect; import org.h2.test.unit.TestBinaryArithmeticStream; import org.h2.test.unit.TestBitStream; import org.h2.test.unit.TestBnf; @@ -188,7 +187,6 @@ import org.h2.test.unit.TestDbException; import org.h2.test.unit.TestExit; import org.h2.test.unit.TestFile; import org.h2.test.unit.TestFileLock; -import org.h2.test.unit.TestFileLockProcess; import org.h2.test.unit.TestFileLockSerialized; import org.h2.test.unit.TestFileSystem; import org.h2.test.unit.TestFtp; @@ -227,7 +225,6 @@ import org.h2.test.unit.TestStreams; import org.h2.test.unit.TestStringCache; import org.h2.test.unit.TestStringUtils; import org.h2.test.unit.TestTimeStampWithTimeZone; -import org.h2.test.unit.TestTools; import org.h2.test.unit.TestTraceSystem; import org.h2.test.unit.TestUtils; import org.h2.test.unit.TestValue; diff --git a/modules/h2/src/test/java/org/h2/test/jdbc/TestCustomDataTypesHandler.java b/modules/h2/src/test/java/org/h2/test/jdbc/TestCustomDataTypesHandler.java index 1aebdce..4fd99f2 100644 --- a/modules/h2/src/test/java/org/h2/test/jdbc/TestCustomDataTypesHandler.java +++ b/modules/h2/src/test/java/org/h2/test/jdbc/TestCustomDataTypesHandler.java @@ -37,16 +37,15 @@ import org.h2.value.ValueString; * Tests {@link CustomDataTypesHandler}. */ public class TestCustomDataTypesHandler extends TestDb { - /** * The database name. */ - public final static String DB_NAME = "customDataTypes"; + public static final String DB_NAME = "customDataTypes"; /** * The system property name. */ - public final static String HANDLER_NAME_PROPERTY = "h2.customDataTypesHandler"; + public static final String HANDLER_NAME_PROPERTY = "h2.customDataTypesHandler"; /** * Run just this test. @@ -170,13 +169,13 @@ public class TestCustomDataTypesHandler extends TestDb { public static class TestOnlyCustomDataTypesHandler implements CustomDataTypesHandler { /** Type name for complex number */ - public final static String COMPLEX_DATA_TYPE_NAME = "complex"; + public static final String COMPLEX_DATA_TYPE_NAME = "complex"; /** Type id for complex number */ - public final static int COMPLEX_DATA_TYPE_ID = 1000; + public static final int COMPLEX_DATA_TYPE_ID = 1000; /** Order for complex number data type */ - public final static int COMPLEX_DATA_TYPE_ORDER = 100_000; + public static final int COMPLEX_DATA_TYPE_ORDER = 100_000; /** Cached DataType instance for complex number */ public final DataType complexDataType; @@ -434,10 +433,10 @@ public class TestCustomDataTypesHandler extends TestDb { private static final long serialVersionUID = 1L; /** */ - public final static DecimalFormat REAL_FMT = new DecimalFormat("###.###"); + public static final DecimalFormat REAL_FMT = new DecimalFormat("###.###"); /** */ - public final static DecimalFormat IMG_FMT = new DecimalFormat("+###.###i;-###.###i"); + public static final DecimalFormat IMG_FMT = new DecimalFormat("+###.###i;-###.###i"); /** * Real part diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeClientIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeClientIndex.java index 00adc96..5a67c58 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeClientIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeClientIndex.java @@ -17,11 +17,9 @@ package org.apache.ignite.internal.processors.query.h2.database; import java.util.List; -import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.query.IgniteSQLException; import org.apache.ignite.internal.processors.query.h2.opt.GridH2IndexBase; import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table; diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlUtils.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlUtils.java index fc17ecf..283ade9 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlUtils.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/dml/DmlUtils.java @@ -50,7 +50,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.transactions.TransactionDuplicateKeyException; -import org.h2.util.DateTimeUtils; import org.h2.util.LocalDateTimeUtils; import org.h2.value.Value; import org.h2.value.ValueDate; diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java index 07fcea5..5bb73fb 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ProxyIndex.java @@ -29,11 +29,9 @@ import org.h2.message.DbException; import org.h2.result.Row; import org.h2.result.SearchRow; import org.h2.result.SortOrder; -import org.h2.table.Column; import org.h2.table.IndexColumn; import org.h2.table.TableFilter; -import java.util.HashSet; import java.util.List; /** @@ -41,7 +39,6 @@ import java.util.List; * Delegates the calls to underlying normal index */ public class GridH2ProxyIndex extends BaseIndex { - /** Underlying normal index */ protected Index idx; diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java index 97a64f1..86059b4 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java @@ -35,7 +35,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.GridCacheContextInfo; import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow; import org.apache.ignite.internal.processors.cache.query.QueryTable; -import org.apache.ignite.internal.processors.cache.tree.mvcc.data.MvccDataRow; import org.apache.ignite.internal.processors.query.IgniteSQLException; import org.apache.ignite.internal.processors.query.QueryField; import org.apache.ignite.internal.processors.query.QueryUtils; diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java index f9dbac5..cc8233d 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java @@ -73,7 +73,6 @@ import org.h2.expression.BinaryOperation; import org.h2.expression.Expression; import org.h2.expression.ExpressionColumn; import org.h2.expression.ExpressionList; -import org.h2.expression.IntervalOperation; import org.h2.expression.Parameter; import org.h2.expression.Subquery; import org.h2.expression.UnaryOperation; diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/ReduceIndexUnsorted.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/ReduceIndexUnsorted.java index 8f704f1..8e97d34 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/ReduceIndexUnsorted.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/ReduceIndexUnsorted.java @@ -119,7 +119,7 @@ public final class ReduceIndexUnsorted extends ReduceIndex { } /** {@inheritDoc} */ - public double getCost(Session session, int[] masks, TableFilter[] filters, int filter, SortOrder sortOrder, + @Override public double getCost(Session session, int[] masks, TableFilter[] filters, int filter, SortOrder sortOrder, AllColumnsForPlan allColumnsSet) { return getCostRangeIndex(masks, getRowCountApproximation(), filters, filter, sortOrder, true, allColumnsSet); } @@ -155,4 +155,4 @@ public final class ReduceIndexUnsorted extends ReduceIndex { private static class PollableQueue<X> extends LinkedBlockingQueue<X> implements Pollable<X> { // No-op. } -} \ No newline at end of file +} diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java index 6dec931..874c878 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java @@ -31,7 +31,6 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.query.QueryField; import org.apache.ignite.internal.processors.query.QueryUtils; import org.apache.ignite.testframework.config.GridTestProperties; -import org.h2.jdbc.JdbcSQLException; import org.h2.jdbc.JdbcSQLSyntaxErrorException; import org.junit.Test; diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java index fc8a7bb..e84d53b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java @@ -66,7 +66,6 @@ import org.apache.ignite.internal.util.GridStringBuilder; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.GridTestUtils; -import org.h2.jdbc.JdbcSQLException; import org.h2.jdbc.JdbcSQLSyntaxErrorException; import org.h2.value.DataType; import org.junit.Test; diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java index 723bc1f..5880402 100644 --- a/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java +++ b/modules/ml/src/main/java/org/apache/ignite/ml/genetic/GAGrid.java @@ -49,7 +49,7 @@ public class GAGrid { private IgniteCache<Long, Chromosome> populationCache; /** Gene cache */ private IgniteCache<Long, Gene> geneCache; - + /** * @param cfg GAConfiguration @@ -175,7 +175,7 @@ public class GAGrid { double averageFitnessScore = calculateAverageFitness(); Long key = map.keySet().iterator().next(); - + fittestChomosome = populationCache.get(key); // while NOT terminateCondition met @@ -199,7 +199,7 @@ public class GAGrid { map = getChromosomesByFittest(); key = map.keySet().iterator().next(); - + // Retreive the first chromosome from the list fittestChomosome = populationCache.get(key); @@ -219,7 +219,7 @@ public class GAGrid { */ private LinkedHashMap<Long,Double> getChromosomesByFittest() { LinkedHashMap<Long, Double> orderChromKeysByFittest = new LinkedHashMap<>(); - + String orderDirection = "desc"; if (!cfg.isHigherFitnessValFitter()) @@ -229,15 +229,15 @@ public class GAGrid { // Execute query to retrieve keys for ALL Chromosomes by fittnessScore QueryCursor<List<?>> cursor = populationCache.query(new SqlFieldsQuery(fittestSQL)); - + List<List<?>> res = cursor.getAll(); - + for (List row : res) { Long key = (Long)row.get(0); Double fitnessScore = (Double)row.get(1); orderChromKeysByFittest.put(key, fitnessScore); } - + return orderChromKeysByFittest; } @@ -279,7 +279,7 @@ public class GAGrid { } - + /** * Perform mutation @@ -329,16 +329,16 @@ public class GAGrid { return keys.subList(truncateCnt, keys.size()); } - + /** - * Roulette Wheel selection + * Roulette Wheel selection * * @param map Map of keys/fitness scores * @return List of primary Keys for respective chromosomes that will breed */ private List<Long> selectByRouletteWheel(LinkedHashMap map) { List<Long> populationKeys = this.ignite.compute().execute(new RouletteWheelSelectionTask(this.cfg), map); - + return populationKeys; } @@ -417,10 +417,10 @@ public class GAGrid { copyFitterChromosomesToPopulation(fittestKeys, selectedKeys); // copy more fit keys to rest of population - break; + break; case SELECTION_METHOD_ROULETTE_WHEEL: selectedKeys = this.selectByRouletteWheel(map); - + default: break; }
