AMashenkov commented on a change in pull request #132: URL: https://github.com/apache/ignite-3/pull/132#discussion_r637738713
########## File path: modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverter.java ########## @@ -0,0 +1,489 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.schema.configuration; + +import org.apache.ignite.configuration.schemas.table.ColumnChange; +import org.apache.ignite.configuration.schemas.table.ColumnTypeChange; +import org.apache.ignite.configuration.schemas.table.ColumnTypeView; +import org.apache.ignite.configuration.schemas.table.ColumnView; +import org.apache.ignite.configuration.schemas.table.IndexColumnChange; +import org.apache.ignite.configuration.schemas.table.IndexColumnView; +import org.apache.ignite.configuration.schemas.table.TableChange; +import org.apache.ignite.configuration.schemas.table.TableConfiguration; +import org.apache.ignite.configuration.schemas.table.TableIndexChange; +import org.apache.ignite.configuration.schemas.table.TableIndexView; +import org.apache.ignite.configuration.schemas.table.TableView; +import org.apache.ignite.configuration.schemas.table.TablesChange; +import org.apache.ignite.configuration.tree.NamedListView; +import org.apache.ignite.internal.schema.ColumnImpl; +import org.apache.ignite.internal.schema.HashIndexImpl; +import org.apache.ignite.internal.schema.PartialIndexImpl; +import org.apache.ignite.internal.schema.PrimaryIndexImpl; +import org.apache.ignite.internal.schema.SchemaTableImpl; +import org.apache.ignite.internal.schema.SortedIndexColumnImpl; +import org.apache.ignite.internal.schema.SortedIndexImpl; +import org.apache.ignite.schema.Column; +import org.apache.ignite.schema.ColumnType; +import org.apache.ignite.schema.HashIndex; +import org.apache.ignite.schema.IndexColumn; +import org.apache.ignite.schema.PartialIndex; +import org.apache.ignite.schema.PrimaryIndex; +import org.apache.ignite.schema.SchemaTable; +import org.apache.ignite.schema.SortedIndex; +import org.apache.ignite.schema.SortedIndexColumn; +import org.apache.ignite.schema.TableIndex; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +/** + * Configuration to schema and vice versa converter. + */ +public class SchemaConfigurationConverter { + /** Hash index type. */ + private static final String HASH_TYPE = "HASH"; + + /** Sorted index type. */ + private static final String SORTED_TYPE = "SORTED"; + + /** Partial index type. */ + private static final String PARTIAL_TYPE = "PARTIAL"; + + /** Primary key index type. */ + private static final String PK_TYPE = "PK"; + + /** Types map. */ + private static Map<String, ColumnType> types = new HashMap<>(); + + static { + putType(ColumnType.INT8); + putType(ColumnType.INT16); + putType(ColumnType.INT32); + putType(ColumnType.INT64); + putType(ColumnType.UINT8); + putType(ColumnType.UINT16); + putType(ColumnType.UINT32); + putType(ColumnType.UINT64); + putType(ColumnType.FLOAT); + putType(ColumnType.DOUBLE); + putType(ColumnType.UUID); + } + + /** */ + private static void putType(ColumnType type) { + types.put(type.typeSpec().name(), type); + } + + /** + * Convert SortedIndexColumn to IndexColumnChange. + * @param col IndexColumnChange. + * @param colInit IndexColumnChange to fullfill. + */ + public static void convert(SortedIndexColumn col, IndexColumnChange colInit) { + colInit.changeName(col.name()); + colInit.changeAsc(col.asc()); + } + + /** + * Convert IndexColumnView to SortedIndexColumn. + * + * @param colCfg IndexColumnView. + * @return SortedIndexColumn. + */ + public static SortedIndexColumn convert(IndexColumnView colCfg) { + return new SortedIndexColumnImpl(colCfg.name(), colCfg.asc()); + } + + /** + * Convert TableIndex to TableIndexChange. + * + * @param idx TableIndex. + * @param idxChg TableIndexChange to fullfill. + */ + public static void convert(TableIndex idx, TableIndexChange idxChg) { + idxChg.changeName(idx.name()); + idxChg.changeType(idx.type()); + + switch (idx.type()) { + case HASH_TYPE: + HashIndex hashIdx = (HashIndex)idx; + + String[] colNames = hashIdx.columns().stream().map(IndexColumn::name).toArray(String[]::new); + + idxChg.changeColNames(colNames); + + break; + + case PARTIAL_TYPE: + PartialIndex partIdx = (PartialIndex)idx; + + idxChg.changeUniq(partIdx.unique()); + idxChg.changeExpr(partIdx.expr()); + + idxChg.changeColumns(colsChg -> { + int colIdx = 0; + + for (SortedIndexColumn col : partIdx.columns()) + colsChg.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + break; + + case SORTED_TYPE: + SortedIndex sortIdx = (SortedIndex)idx; + idxChg.changeUniq(sortIdx.unique()); + + idxChg.changeColumns(colsInit -> { + int colIdx = 0; + + for (SortedIndexColumn col : sortIdx.columns()) + colsInit.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + break; + + case PK_TYPE: + PrimaryIndex primIdx = (PrimaryIndex)idx; + + idxChg.changeColumns(colsInit -> { + int colIdx = 0; + + for (SortedIndexColumn col : primIdx.columns()) + colsInit.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + idxChg.changeAffinityColumns(primIdx.affinityColumns().toArray( + new String[primIdx.affinityColumns().size()])); + + break; + + default: + throw new IllegalArgumentException("Unknown index type " + idx.type()); + } + } + + /** + * Convert TableIndexView into TableIndex. + * + * @param idxView TableIndexView. + * @return TableIndex. + */ + public static TableIndex convert(TableIndexView idxView) { + String name = idxView.name(); + String type = idxView.type(); + + switch (type) { + case "HASH": + String[] hashCols = idxView.colNames(); + + return new HashIndexImpl(name, hashCols); + + case "SORTED": + boolean sortedUniq = idxView.uniq(); + + SortedMap<Integer, SortedIndexColumn> sortedCols = new TreeMap(); + for (String key : idxView.columns().namedListKeys()) { + SortedIndexColumn col = convert(idxView.columns().get(key)); + sortedCols.put(Integer.valueOf(key), col); Review comment: ```suggestion SortedIndexColumn col = convert(idxView.columns().get(key)); sortedCols.put(Integer.valueOf(key), col); ``` ########## File path: modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverter.java ########## @@ -0,0 +1,489 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.schema.configuration; + +import org.apache.ignite.configuration.schemas.table.ColumnChange; +import org.apache.ignite.configuration.schemas.table.ColumnTypeChange; +import org.apache.ignite.configuration.schemas.table.ColumnTypeView; +import org.apache.ignite.configuration.schemas.table.ColumnView; +import org.apache.ignite.configuration.schemas.table.IndexColumnChange; +import org.apache.ignite.configuration.schemas.table.IndexColumnView; +import org.apache.ignite.configuration.schemas.table.TableChange; +import org.apache.ignite.configuration.schemas.table.TableConfiguration; +import org.apache.ignite.configuration.schemas.table.TableIndexChange; +import org.apache.ignite.configuration.schemas.table.TableIndexView; +import org.apache.ignite.configuration.schemas.table.TableView; +import org.apache.ignite.configuration.schemas.table.TablesChange; +import org.apache.ignite.configuration.tree.NamedListView; +import org.apache.ignite.internal.schema.ColumnImpl; +import org.apache.ignite.internal.schema.HashIndexImpl; +import org.apache.ignite.internal.schema.PartialIndexImpl; +import org.apache.ignite.internal.schema.PrimaryIndexImpl; +import org.apache.ignite.internal.schema.SchemaTableImpl; +import org.apache.ignite.internal.schema.SortedIndexColumnImpl; +import org.apache.ignite.internal.schema.SortedIndexImpl; +import org.apache.ignite.schema.Column; +import org.apache.ignite.schema.ColumnType; +import org.apache.ignite.schema.HashIndex; +import org.apache.ignite.schema.IndexColumn; +import org.apache.ignite.schema.PartialIndex; +import org.apache.ignite.schema.PrimaryIndex; +import org.apache.ignite.schema.SchemaTable; +import org.apache.ignite.schema.SortedIndex; +import org.apache.ignite.schema.SortedIndexColumn; +import org.apache.ignite.schema.TableIndex; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +/** + * Configuration to schema and vice versa converter. + */ +public class SchemaConfigurationConverter { + /** Hash index type. */ + private static final String HASH_TYPE = "HASH"; + + /** Sorted index type. */ + private static final String SORTED_TYPE = "SORTED"; + + /** Partial index type. */ + private static final String PARTIAL_TYPE = "PARTIAL"; + + /** Primary key index type. */ + private static final String PK_TYPE = "PK"; + + /** Types map. */ + private static Map<String, ColumnType> types = new HashMap<>(); + + static { + putType(ColumnType.INT8); + putType(ColumnType.INT16); + putType(ColumnType.INT32); + putType(ColumnType.INT64); + putType(ColumnType.UINT8); + putType(ColumnType.UINT16); + putType(ColumnType.UINT32); + putType(ColumnType.UINT64); + putType(ColumnType.FLOAT); + putType(ColumnType.DOUBLE); + putType(ColumnType.UUID); + } + + /** */ + private static void putType(ColumnType type) { + types.put(type.typeSpec().name(), type); + } + + /** + * Convert SortedIndexColumn to IndexColumnChange. + * @param col IndexColumnChange. + * @param colInit IndexColumnChange to fullfill. + */ + public static void convert(SortedIndexColumn col, IndexColumnChange colInit) { + colInit.changeName(col.name()); + colInit.changeAsc(col.asc()); + } + + /** + * Convert IndexColumnView to SortedIndexColumn. + * + * @param colCfg IndexColumnView. + * @return SortedIndexColumn. + */ + public static SortedIndexColumn convert(IndexColumnView colCfg) { + return new SortedIndexColumnImpl(colCfg.name(), colCfg.asc()); + } + + /** + * Convert TableIndex to TableIndexChange. + * + * @param idx TableIndex. + * @param idxChg TableIndexChange to fullfill. + */ + public static void convert(TableIndex idx, TableIndexChange idxChg) { + idxChg.changeName(idx.name()); + idxChg.changeType(idx.type()); + + switch (idx.type()) { + case HASH_TYPE: + HashIndex hashIdx = (HashIndex)idx; + + String[] colNames = hashIdx.columns().stream().map(IndexColumn::name).toArray(String[]::new); + + idxChg.changeColNames(colNames); + + break; + + case PARTIAL_TYPE: + PartialIndex partIdx = (PartialIndex)idx; + + idxChg.changeUniq(partIdx.unique()); + idxChg.changeExpr(partIdx.expr()); + + idxChg.changeColumns(colsChg -> { + int colIdx = 0; + + for (SortedIndexColumn col : partIdx.columns()) + colsChg.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + break; + + case SORTED_TYPE: + SortedIndex sortIdx = (SortedIndex)idx; + idxChg.changeUniq(sortIdx.unique()); + + idxChg.changeColumns(colsInit -> { + int colIdx = 0; + + for (SortedIndexColumn col : sortIdx.columns()) + colsInit.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + break; + + case PK_TYPE: + PrimaryIndex primIdx = (PrimaryIndex)idx; + + idxChg.changeColumns(colsInit -> { + int colIdx = 0; + + for (SortedIndexColumn col : primIdx.columns()) + colsInit.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + idxChg.changeAffinityColumns(primIdx.affinityColumns().toArray( + new String[primIdx.affinityColumns().size()])); + + break; + + default: + throw new IllegalArgumentException("Unknown index type " + idx.type()); + } + } + + /** + * Convert TableIndexView into TableIndex. + * + * @param idxView TableIndexView. + * @return TableIndex. + */ + public static TableIndex convert(TableIndexView idxView) { + String name = idxView.name(); + String type = idxView.type(); + + switch (type) { + case "HASH": + String[] hashCols = idxView.colNames(); + + return new HashIndexImpl(name, hashCols); + + case "SORTED": + boolean sortedUniq = idxView.uniq(); + + SortedMap<Integer, SortedIndexColumn> sortedCols = new TreeMap(); + for (String key : idxView.columns().namedListKeys()) { Review comment: ```suggestion SortedMap<Integer, SortedIndexColumn> sortedCols = new TreeMap(); for (String key : idxView.columns().namedListKeys()) { ``` ########## File path: modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverter.java ########## @@ -0,0 +1,489 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.schema.configuration; + +import org.apache.ignite.configuration.schemas.table.ColumnChange; +import org.apache.ignite.configuration.schemas.table.ColumnTypeChange; +import org.apache.ignite.configuration.schemas.table.ColumnTypeView; +import org.apache.ignite.configuration.schemas.table.ColumnView; +import org.apache.ignite.configuration.schemas.table.IndexColumnChange; +import org.apache.ignite.configuration.schemas.table.IndexColumnView; +import org.apache.ignite.configuration.schemas.table.TableChange; +import org.apache.ignite.configuration.schemas.table.TableConfiguration; +import org.apache.ignite.configuration.schemas.table.TableIndexChange; +import org.apache.ignite.configuration.schemas.table.TableIndexView; +import org.apache.ignite.configuration.schemas.table.TableView; +import org.apache.ignite.configuration.schemas.table.TablesChange; +import org.apache.ignite.configuration.tree.NamedListView; +import org.apache.ignite.internal.schema.ColumnImpl; +import org.apache.ignite.internal.schema.HashIndexImpl; +import org.apache.ignite.internal.schema.PartialIndexImpl; +import org.apache.ignite.internal.schema.PrimaryIndexImpl; +import org.apache.ignite.internal.schema.SchemaTableImpl; +import org.apache.ignite.internal.schema.SortedIndexColumnImpl; +import org.apache.ignite.internal.schema.SortedIndexImpl; +import org.apache.ignite.schema.Column; +import org.apache.ignite.schema.ColumnType; +import org.apache.ignite.schema.HashIndex; +import org.apache.ignite.schema.IndexColumn; +import org.apache.ignite.schema.PartialIndex; +import org.apache.ignite.schema.PrimaryIndex; +import org.apache.ignite.schema.SchemaTable; +import org.apache.ignite.schema.SortedIndex; +import org.apache.ignite.schema.SortedIndexColumn; +import org.apache.ignite.schema.TableIndex; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +/** + * Configuration to schema and vice versa converter. + */ +public class SchemaConfigurationConverter { + /** Hash index type. */ + private static final String HASH_TYPE = "HASH"; + + /** Sorted index type. */ + private static final String SORTED_TYPE = "SORTED"; + + /** Partial index type. */ + private static final String PARTIAL_TYPE = "PARTIAL"; + + /** Primary key index type. */ + private static final String PK_TYPE = "PK"; + + /** Types map. */ + private static Map<String, ColumnType> types = new HashMap<>(); + + static { + putType(ColumnType.INT8); + putType(ColumnType.INT16); + putType(ColumnType.INT32); + putType(ColumnType.INT64); + putType(ColumnType.UINT8); + putType(ColumnType.UINT16); + putType(ColumnType.UINT32); + putType(ColumnType.UINT64); + putType(ColumnType.FLOAT); + putType(ColumnType.DOUBLE); + putType(ColumnType.UUID); + } + + /** */ + private static void putType(ColumnType type) { + types.put(type.typeSpec().name(), type); + } + + /** + * Convert SortedIndexColumn to IndexColumnChange. + * @param col IndexColumnChange. + * @param colInit IndexColumnChange to fullfill. + */ + public static void convert(SortedIndexColumn col, IndexColumnChange colInit) { + colInit.changeName(col.name()); + colInit.changeAsc(col.asc()); + } + + /** + * Convert IndexColumnView to SortedIndexColumn. + * + * @param colCfg IndexColumnView. + * @return SortedIndexColumn. + */ + public static SortedIndexColumn convert(IndexColumnView colCfg) { + return new SortedIndexColumnImpl(colCfg.name(), colCfg.asc()); + } + + /** + * Convert TableIndex to TableIndexChange. + * + * @param idx TableIndex. + * @param idxChg TableIndexChange to fullfill. + */ + public static void convert(TableIndex idx, TableIndexChange idxChg) { + idxChg.changeName(idx.name()); + idxChg.changeType(idx.type()); + + switch (idx.type()) { + case HASH_TYPE: + HashIndex hashIdx = (HashIndex)idx; + + String[] colNames = hashIdx.columns().stream().map(IndexColumn::name).toArray(String[]::new); + + idxChg.changeColNames(colNames); + + break; + + case PARTIAL_TYPE: + PartialIndex partIdx = (PartialIndex)idx; + + idxChg.changeUniq(partIdx.unique()); + idxChg.changeExpr(partIdx.expr()); + + idxChg.changeColumns(colsChg -> { + int colIdx = 0; + + for (SortedIndexColumn col : partIdx.columns()) + colsChg.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + break; + + case SORTED_TYPE: + SortedIndex sortIdx = (SortedIndex)idx; + idxChg.changeUniq(sortIdx.unique()); + + idxChg.changeColumns(colsInit -> { + int colIdx = 0; + + for (SortedIndexColumn col : sortIdx.columns()) + colsInit.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + break; + + case PK_TYPE: + PrimaryIndex primIdx = (PrimaryIndex)idx; + + idxChg.changeColumns(colsInit -> { + int colIdx = 0; + + for (SortedIndexColumn col : primIdx.columns()) + colsInit.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + idxChg.changeAffinityColumns(primIdx.affinityColumns().toArray( + new String[primIdx.affinityColumns().size()])); + + break; + + default: + throw new IllegalArgumentException("Unknown index type " + idx.type()); + } + } + + /** + * Convert TableIndexView into TableIndex. + * + * @param idxView TableIndexView. + * @return TableIndex. + */ + public static TableIndex convert(TableIndexView idxView) { + String name = idxView.name(); + String type = idxView.type(); + + switch (type) { + case "HASH": + String[] hashCols = idxView.colNames(); + + return new HashIndexImpl(name, hashCols); + + case "SORTED": + boolean sortedUniq = idxView.uniq(); + + SortedMap<Integer, SortedIndexColumn> sortedCols = new TreeMap(); + for (String key : idxView.columns().namedListKeys()) { + SortedIndexColumn col = convert(idxView.columns().get(key)); + sortedCols.put(Integer.valueOf(key), col); + } + + return new SortedIndexImpl(name, new ArrayList<>(sortedCols.values()), sortedUniq); + + case "PARTIAL": + boolean partialUniq = idxView.uniq(); + String expr = idxView.expr(); + + NamedListView<? extends IndexColumnView> colsView = idxView.columns(); + SortedMap<Integer, SortedIndexColumn> partialCols = new TreeMap<>(); + for (String key : idxView.columns().namedListKeys()) { + SortedIndexColumn col = convert(colsView.get(key)); + partialCols.put(Integer.valueOf(key), col); Review comment: ```suggestion NamedListView<? extends IndexColumnView> colsView = idxView.columns(); SortedMap<Integer, SortedIndexColumn> partialCols = new TreeMap<>(); for (String key : idxView.columns().namedListKeys()) { SortedIndexColumn col = convert(colsView.get(key)); partialCols.put(Integer.valueOf(key), col); ``` ########## File path: modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverter.java ########## @@ -0,0 +1,489 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.schema.configuration; + +import org.apache.ignite.configuration.schemas.table.ColumnChange; +import org.apache.ignite.configuration.schemas.table.ColumnTypeChange; +import org.apache.ignite.configuration.schemas.table.ColumnTypeView; +import org.apache.ignite.configuration.schemas.table.ColumnView; +import org.apache.ignite.configuration.schemas.table.IndexColumnChange; +import org.apache.ignite.configuration.schemas.table.IndexColumnView; +import org.apache.ignite.configuration.schemas.table.TableChange; +import org.apache.ignite.configuration.schemas.table.TableConfiguration; +import org.apache.ignite.configuration.schemas.table.TableIndexChange; +import org.apache.ignite.configuration.schemas.table.TableIndexView; +import org.apache.ignite.configuration.schemas.table.TableView; +import org.apache.ignite.configuration.schemas.table.TablesChange; +import org.apache.ignite.configuration.tree.NamedListView; +import org.apache.ignite.internal.schema.ColumnImpl; +import org.apache.ignite.internal.schema.HashIndexImpl; +import org.apache.ignite.internal.schema.PartialIndexImpl; +import org.apache.ignite.internal.schema.PrimaryIndexImpl; +import org.apache.ignite.internal.schema.SchemaTableImpl; +import org.apache.ignite.internal.schema.SortedIndexColumnImpl; +import org.apache.ignite.internal.schema.SortedIndexImpl; +import org.apache.ignite.schema.Column; +import org.apache.ignite.schema.ColumnType; +import org.apache.ignite.schema.HashIndex; +import org.apache.ignite.schema.IndexColumn; +import org.apache.ignite.schema.PartialIndex; +import org.apache.ignite.schema.PrimaryIndex; +import org.apache.ignite.schema.SchemaTable; +import org.apache.ignite.schema.SortedIndex; +import org.apache.ignite.schema.SortedIndexColumn; +import org.apache.ignite.schema.TableIndex; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +/** + * Configuration to schema and vice versa converter. + */ +public class SchemaConfigurationConverter { + /** Hash index type. */ + private static final String HASH_TYPE = "HASH"; + + /** Sorted index type. */ + private static final String SORTED_TYPE = "SORTED"; + + /** Partial index type. */ + private static final String PARTIAL_TYPE = "PARTIAL"; + + /** Primary key index type. */ + private static final String PK_TYPE = "PK"; + + /** Types map. */ + private static Map<String, ColumnType> types = new HashMap<>(); + + static { + putType(ColumnType.INT8); + putType(ColumnType.INT16); + putType(ColumnType.INT32); + putType(ColumnType.INT64); + putType(ColumnType.UINT8); + putType(ColumnType.UINT16); + putType(ColumnType.UINT32); + putType(ColumnType.UINT64); + putType(ColumnType.FLOAT); + putType(ColumnType.DOUBLE); + putType(ColumnType.UUID); + } + + /** */ + private static void putType(ColumnType type) { + types.put(type.typeSpec().name(), type); + } + + /** + * Convert SortedIndexColumn to IndexColumnChange. + * @param col IndexColumnChange. + * @param colInit IndexColumnChange to fullfill. + */ + public static void convert(SortedIndexColumn col, IndexColumnChange colInit) { + colInit.changeName(col.name()); + colInit.changeAsc(col.asc()); + } + + /** + * Convert IndexColumnView to SortedIndexColumn. + * + * @param colCfg IndexColumnView. + * @return SortedIndexColumn. + */ + public static SortedIndexColumn convert(IndexColumnView colCfg) { + return new SortedIndexColumnImpl(colCfg.name(), colCfg.asc()); + } + + /** + * Convert TableIndex to TableIndexChange. + * + * @param idx TableIndex. + * @param idxChg TableIndexChange to fullfill. + */ + public static void convert(TableIndex idx, TableIndexChange idxChg) { + idxChg.changeName(idx.name()); + idxChg.changeType(idx.type()); + + switch (idx.type()) { + case HASH_TYPE: + HashIndex hashIdx = (HashIndex)idx; + + String[] colNames = hashIdx.columns().stream().map(IndexColumn::name).toArray(String[]::new); + + idxChg.changeColNames(colNames); + + break; + + case PARTIAL_TYPE: + PartialIndex partIdx = (PartialIndex)idx; + + idxChg.changeUniq(partIdx.unique()); + idxChg.changeExpr(partIdx.expr()); + + idxChg.changeColumns(colsChg -> { + int colIdx = 0; + + for (SortedIndexColumn col : partIdx.columns()) + colsChg.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + break; + + case SORTED_TYPE: + SortedIndex sortIdx = (SortedIndex)idx; + idxChg.changeUniq(sortIdx.unique()); + + idxChg.changeColumns(colsInit -> { + int colIdx = 0; + + for (SortedIndexColumn col : sortIdx.columns()) + colsInit.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + break; + + case PK_TYPE: + PrimaryIndex primIdx = (PrimaryIndex)idx; + + idxChg.changeColumns(colsInit -> { + int colIdx = 0; + + for (SortedIndexColumn col : primIdx.columns()) + colsInit.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + idxChg.changeAffinityColumns(primIdx.affinityColumns().toArray( + new String[primIdx.affinityColumns().size()])); + + break; + + default: + throw new IllegalArgumentException("Unknown index type " + idx.type()); + } + } + + /** + * Convert TableIndexView into TableIndex. + * + * @param idxView TableIndexView. + * @return TableIndex. + */ + public static TableIndex convert(TableIndexView idxView) { + String name = idxView.name(); + String type = idxView.type(); + + switch (type) { + case "HASH": + String[] hashCols = idxView.colNames(); + + return new HashIndexImpl(name, hashCols); + + case "SORTED": + boolean sortedUniq = idxView.uniq(); + + SortedMap<Integer, SortedIndexColumn> sortedCols = new TreeMap(); + for (String key : idxView.columns().namedListKeys()) { + SortedIndexColumn col = convert(idxView.columns().get(key)); + sortedCols.put(Integer.valueOf(key), col); + } + + return new SortedIndexImpl(name, new ArrayList<>(sortedCols.values()), sortedUniq); + + case "PARTIAL": + boolean partialUniq = idxView.uniq(); + String expr = idxView.expr(); + + NamedListView<? extends IndexColumnView> colsView = idxView.columns(); + SortedMap<Integer, SortedIndexColumn> partialCols = new TreeMap<>(); + for (String key : idxView.columns().namedListKeys()) { + SortedIndexColumn col = convert(colsView.get(key)); + partialCols.put(Integer.valueOf(key), col); + } + + return new PartialIndexImpl(name, new ArrayList<>(partialCols.values()), partialUniq, expr); + + case "PK": + SortedMap<Integer, SortedIndexColumn> cols = new TreeMap<>(); + for (String key : idxView.columns().namedListKeys()) { Review comment: ```suggestion SortedMap<Integer, SortedIndexColumn> cols = new TreeMap<>(); for (String key : idxView.columns().namedListKeys()) { ``` ########## File path: modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverter.java ########## @@ -0,0 +1,489 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.schema.configuration; + +import org.apache.ignite.configuration.schemas.table.ColumnChange; +import org.apache.ignite.configuration.schemas.table.ColumnTypeChange; +import org.apache.ignite.configuration.schemas.table.ColumnTypeView; +import org.apache.ignite.configuration.schemas.table.ColumnView; +import org.apache.ignite.configuration.schemas.table.IndexColumnChange; +import org.apache.ignite.configuration.schemas.table.IndexColumnView; +import org.apache.ignite.configuration.schemas.table.TableChange; +import org.apache.ignite.configuration.schemas.table.TableConfiguration; +import org.apache.ignite.configuration.schemas.table.TableIndexChange; +import org.apache.ignite.configuration.schemas.table.TableIndexView; +import org.apache.ignite.configuration.schemas.table.TableView; +import org.apache.ignite.configuration.schemas.table.TablesChange; +import org.apache.ignite.configuration.tree.NamedListView; +import org.apache.ignite.internal.schema.ColumnImpl; +import org.apache.ignite.internal.schema.HashIndexImpl; +import org.apache.ignite.internal.schema.PartialIndexImpl; +import org.apache.ignite.internal.schema.PrimaryIndexImpl; +import org.apache.ignite.internal.schema.SchemaTableImpl; +import org.apache.ignite.internal.schema.SortedIndexColumnImpl; +import org.apache.ignite.internal.schema.SortedIndexImpl; +import org.apache.ignite.schema.Column; +import org.apache.ignite.schema.ColumnType; +import org.apache.ignite.schema.HashIndex; +import org.apache.ignite.schema.IndexColumn; +import org.apache.ignite.schema.PartialIndex; +import org.apache.ignite.schema.PrimaryIndex; +import org.apache.ignite.schema.SchemaTable; +import org.apache.ignite.schema.SortedIndex; +import org.apache.ignite.schema.SortedIndexColumn; +import org.apache.ignite.schema.TableIndex; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +/** + * Configuration to schema and vice versa converter. + */ +public class SchemaConfigurationConverter { + /** Hash index type. */ + private static final String HASH_TYPE = "HASH"; + + /** Sorted index type. */ + private static final String SORTED_TYPE = "SORTED"; + + /** Partial index type. */ + private static final String PARTIAL_TYPE = "PARTIAL"; + + /** Primary key index type. */ + private static final String PK_TYPE = "PK"; + + /** Types map. */ + private static Map<String, ColumnType> types = new HashMap<>(); + + static { + putType(ColumnType.INT8); + putType(ColumnType.INT16); + putType(ColumnType.INT32); + putType(ColumnType.INT64); + putType(ColumnType.UINT8); + putType(ColumnType.UINT16); + putType(ColumnType.UINT32); + putType(ColumnType.UINT64); + putType(ColumnType.FLOAT); + putType(ColumnType.DOUBLE); + putType(ColumnType.UUID); + } + + /** */ + private static void putType(ColumnType type) { + types.put(type.typeSpec().name(), type); + } + + /** + * Convert SortedIndexColumn to IndexColumnChange. + * @param col IndexColumnChange. + * @param colInit IndexColumnChange to fullfill. + */ + public static void convert(SortedIndexColumn col, IndexColumnChange colInit) { + colInit.changeName(col.name()); + colInit.changeAsc(col.asc()); + } + + /** + * Convert IndexColumnView to SortedIndexColumn. + * + * @param colCfg IndexColumnView. + * @return SortedIndexColumn. + */ + public static SortedIndexColumn convert(IndexColumnView colCfg) { + return new SortedIndexColumnImpl(colCfg.name(), colCfg.asc()); + } + + /** + * Convert TableIndex to TableIndexChange. + * + * @param idx TableIndex. + * @param idxChg TableIndexChange to fullfill. + */ + public static void convert(TableIndex idx, TableIndexChange idxChg) { + idxChg.changeName(idx.name()); + idxChg.changeType(idx.type()); + + switch (idx.type()) { + case HASH_TYPE: + HashIndex hashIdx = (HashIndex)idx; + + String[] colNames = hashIdx.columns().stream().map(IndexColumn::name).toArray(String[]::new); + + idxChg.changeColNames(colNames); + + break; + + case PARTIAL_TYPE: + PartialIndex partIdx = (PartialIndex)idx; + + idxChg.changeUniq(partIdx.unique()); + idxChg.changeExpr(partIdx.expr()); + + idxChg.changeColumns(colsChg -> { + int colIdx = 0; + + for (SortedIndexColumn col : partIdx.columns()) + colsChg.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + break; + + case SORTED_TYPE: + SortedIndex sortIdx = (SortedIndex)idx; + idxChg.changeUniq(sortIdx.unique()); + + idxChg.changeColumns(colsInit -> { + int colIdx = 0; + + for (SortedIndexColumn col : sortIdx.columns()) + colsInit.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + break; + + case PK_TYPE: + PrimaryIndex primIdx = (PrimaryIndex)idx; + + idxChg.changeColumns(colsInit -> { + int colIdx = 0; + + for (SortedIndexColumn col : primIdx.columns()) + colsInit.create(String.valueOf(colIdx++), colInit -> convert(col, colInit)); + }); + + idxChg.changeAffinityColumns(primIdx.affinityColumns().toArray( + new String[primIdx.affinityColumns().size()])); + + break; + + default: + throw new IllegalArgumentException("Unknown index type " + idx.type()); + } + } + + /** + * Convert TableIndexView into TableIndex. + * + * @param idxView TableIndexView. + * @return TableIndex. + */ + public static TableIndex convert(TableIndexView idxView) { + String name = idxView.name(); + String type = idxView.type(); + + switch (type) { + case "HASH": + String[] hashCols = idxView.colNames(); + + return new HashIndexImpl(name, hashCols); + + case "SORTED": + boolean sortedUniq = idxView.uniq(); + + SortedMap<Integer, SortedIndexColumn> sortedCols = new TreeMap(); + for (String key : idxView.columns().namedListKeys()) { + SortedIndexColumn col = convert(idxView.columns().get(key)); + sortedCols.put(Integer.valueOf(key), col); + } + + return new SortedIndexImpl(name, new ArrayList<>(sortedCols.values()), sortedUniq); + + case "PARTIAL": + boolean partialUniq = idxView.uniq(); + String expr = idxView.expr(); + + NamedListView<? extends IndexColumnView> colsView = idxView.columns(); + SortedMap<Integer, SortedIndexColumn> partialCols = new TreeMap<>(); + for (String key : idxView.columns().namedListKeys()) { + SortedIndexColumn col = convert(colsView.get(key)); + partialCols.put(Integer.valueOf(key), col); + } + + return new PartialIndexImpl(name, new ArrayList<>(partialCols.values()), partialUniq, expr); + + case "PK": + SortedMap<Integer, SortedIndexColumn> cols = new TreeMap<>(); + for (String key : idxView.columns().namedListKeys()) { + SortedIndexColumn col = convert(idxView.columns().get(key)); + cols.put(Integer.valueOf(key), col); + } Review comment: ```suggestion SortedIndexColumn col = convert(idxView.columns().get(key)); cols.put(Integer.valueOf(key), col); } ``` ########## File path: modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaTableValidatorImpl.java ########## @@ -0,0 +1,64 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.schema.configuration; + +import org.apache.ignite.configuration.schemas.table.TableValidator; +import org.apache.ignite.configuration.schemas.table.TableView; +import org.apache.ignite.configuration.tree.NamedListView; +import org.apache.ignite.configuration.validation.ValidationContext; +import org.apache.ignite.configuration.validation.ValidationIssue; +import org.apache.ignite.configuration.validation.Validator; +import org.apache.ignite.internal.schema.SchemaTableImpl; +import org.apache.ignite.internal.schema.builder.SchemaTableBuilderImpl; +import org.apache.ignite.schema.Column; + +import java.util.ArrayList; +import java.util.Collection; + +/** + * SchemaTable validator implementation. + */ +public class SchemaTableValidatorImpl implements Validator<TableValidator, NamedListView<TableView>> { + /** Static instance. */ + public static final SchemaTableValidatorImpl INSTANCE = new SchemaTableValidatorImpl(); + + /** {@inheritDoc} */ + @Override public void validate(TableValidator annotation, ValidationContext<NamedListView<TableView>> ctx) { + NamedListView<TableView> list = ctx.getNewValue(); + for (String key : list.namedListKeys()) { + TableView view = list.get(key); + try { Review comment: ```suggestion NamedListView<TableView> list = ctx.getNewValue(); for (String key : list.namedListKeys()) { TableView view = list.get(key); try { ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
