You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by GitBox <gi...@apache.org> on 2022/06/23 08:30:14 UTC
[GitHub] [shardingsphere] aoyvx opened a new pull request, #18542: Features/federation database meta data test
aoyvx opened a new pull request, #18542:
URL: https://github.com/apache/shardingsphere/pull/18542
Fixes #[17375](https://github.com/apache/shardingsphere/issues/17375).
Changes proposed in this pull request:
- add FederationDatabaseMetaDataTest.java
- fix Use the nonexistent name to get `SchemaMetadata` will throw an `NullPointerException`
--
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.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] strongduanmu commented on a diff in pull request #18542: Features/federation database meta data test
Posted by GitBox <gi...@apache.org>.
strongduanmu commented on code in PR #18542:
URL: https://github.com/apache/shardingsphere/pull/18542#discussion_r904812799
##########
shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationDatabaseMetaDataTest.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.shardingsphere.infra.federation.optimizer.metadata;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.Map;
+import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
+import org.junit.Test;
+
+public class FederationDatabaseMetaDataTest {
Review Comment:
Please add final for FederationDatabaseMetaDataTest.
##########
shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationDatabaseMetaDataTest.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.shardingsphere.infra.federation.optimizer.metadata;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.Map;
+import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
+import org.junit.Test;
+
+public class FederationDatabaseMetaDataTest {
+
+ @Test
+ public void assertPutSchemaMetadata() {
+ final FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo",
Review Comment:
@aoyvx Please remove final modifier in method domain.
##########
shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationDatabaseMetaDataTest.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.shardingsphere.infra.federation.optimizer.metadata;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.Map;
+import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
+import org.junit.Test;
+
+public class FederationDatabaseMetaDataTest {
+
+ @Test
+ public void assertPutSchemaMetadata() {
+ final FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo",
+ Collections.emptyMap());
+ final FederationSchemaMetaData schemaMetaData = mock(FederationSchemaMetaData.class);
+ federationDatabaseMetaData.putSchemaMetadata("foo_db", schemaMetaData);
+ assertThat(federationDatabaseMetaData.getSchemas().get("foo_db"), is(schemaMetaData));
+ }
+
+ @Test
+ public void assertRemoveSchemaMetadata() {
+ final Map<String, ShardingSphereSchema> map = Maps.of(
Review Comment:
@aoyvx Please remove final modifier in method domain.
--
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.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] aoyvx commented on pull request #18542: Features/federation database meta data test
Posted by GitBox <gi...@apache.org>.
aoyvx commented on PR #18542:
URL: https://github.com/apache/shardingsphere/pull/18542#issuecomment-1164197631
@strongduanmu done
--
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.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] strongduanmu commented on pull request #18542: Features/federation database meta data test
Posted by GitBox <gi...@apache.org>.
strongduanmu commented on PR #18542:
URL: https://github.com/apache/shardingsphere/pull/18542#issuecomment-1165063216
@aoyvx Thank you for your contribution.
--
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.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] strongduanmu merged pull request #18542: Features/federation database meta data test
Posted by GitBox <gi...@apache.org>.
strongduanmu merged PR #18542:
URL: https://github.com/apache/shardingsphere/pull/18542
--
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.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] strongduanmu commented on a diff in pull request #18542: Features/federation database meta data test
Posted by GitBox <gi...@apache.org>.
strongduanmu commented on code in PR #18542:
URL: https://github.com/apache/shardingsphere/pull/18542#discussion_r904849464
##########
shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationDatabaseMetaDataTest.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.shardingsphere.infra.federation.optimizer.metadata;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.Map;
+import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
+import org.junit.Test;
+
+public final class FederationDatabaseMetaDataTest {
+
+ @Test
+ public void assertPutSchemaMetadata() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo",
+ Collections.emptyMap());
+ FederationSchemaMetaData schemaMetaData = mock(FederationSchemaMetaData.class);
+ federationDatabaseMetaData.putSchemaMetadata("foo_db", schemaMetaData);
+ assertThat(federationDatabaseMetaData.getSchemas().get("foo_db"), is(schemaMetaData));
+ }
+
+ @Test
+ public void assertRemoveSchemaMetadata() {
+ Map<String, ShardingSphereSchema> map = Maps.of(
+ "foo_db_1", mock(ShardingSphereSchema.class),
+ "foo_db_2", mock(ShardingSphereSchema.class));
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ federationDatabaseMetaData.removeSchemaMetadata("foo_db_1");
+ assertFalse(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_2"));
+ }
+
+ @Test
+ public void assertGetSchemaMetadata() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertNotNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").orElse(null));
+ }
+
+ @Test
+ public void assertGetSchemaMetadataByNonexistentKey() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ federationDatabaseMetaData.getSchemaMetadata("foo_db_2");
+ }
+
+ @Test
+ public void assertPutTable() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", Collections.emptyMap());
+ ShardingSphereTable fooTable = new ShardingSphereTable("foo_table", Collections.emptyList(),
+ Collections.emptyList(), Collections.emptyList());
+ federationDatabaseMetaData.putTable("foo_db", fooTable);
+ assertNotNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").orElse(null));
+ assertNotNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").map(FederationSchemaMetaData::getTables).map(e -> e.get("foo_table")).orElse(null));
+ }
+
+ @Test
+ public void assertRemoveTableMetadata() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", Collections.emptyMap());
+ ShardingSphereTable fooTable = new ShardingSphereTable("foo_table", Collections.emptyList(),
+ Collections.emptyList(), Collections.emptyList());
+ federationDatabaseMetaData.putTable("foo_db", fooTable);
+ federationDatabaseMetaData.removeTableMetadata("foo_db", "foo_table");
+ assertNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").map(s -> s.getTables().get("foo_table")).orElse(null));
+ }
+
Review Comment:
Please remove this useless black line.
##########
shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationDatabaseMetaDataTest.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.shardingsphere.infra.federation.optimizer.metadata;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.Map;
+import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
+import org.junit.Test;
+
+public final class FederationDatabaseMetaDataTest {
+
+ @Test
+ public void assertPutSchemaMetadata() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo",
+ Collections.emptyMap());
+ FederationSchemaMetaData schemaMetaData = mock(FederationSchemaMetaData.class);
+ federationDatabaseMetaData.putSchemaMetadata("foo_db", schemaMetaData);
+ assertThat(federationDatabaseMetaData.getSchemas().get("foo_db"), is(schemaMetaData));
+ }
+
+ @Test
+ public void assertRemoveSchemaMetadata() {
+ Map<String, ShardingSphereSchema> map = Maps.of(
+ "foo_db_1", mock(ShardingSphereSchema.class),
+ "foo_db_2", mock(ShardingSphereSchema.class));
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ federationDatabaseMetaData.removeSchemaMetadata("foo_db_1");
+ assertFalse(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_2"));
+ }
+
+ @Test
+ public void assertGetSchemaMetadata() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
Review Comment:
Please replace `Maps.of()` with `new HashMap()`;
##########
shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationDatabaseMetaDataTest.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.shardingsphere.infra.federation.optimizer.metadata;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.Map;
+import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
+import org.junit.Test;
+
+public final class FederationDatabaseMetaDataTest {
+
+ @Test
+ public void assertPutSchemaMetadata() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo",
+ Collections.emptyMap());
+ FederationSchemaMetaData schemaMetaData = mock(FederationSchemaMetaData.class);
+ federationDatabaseMetaData.putSchemaMetadata("foo_db", schemaMetaData);
+ assertThat(federationDatabaseMetaData.getSchemas().get("foo_db"), is(schemaMetaData));
+ }
+
+ @Test
+ public void assertRemoveSchemaMetadata() {
+ Map<String, ShardingSphereSchema> map = Maps.of(
+ "foo_db_1", mock(ShardingSphereSchema.class),
+ "foo_db_2", mock(ShardingSphereSchema.class));
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ federationDatabaseMetaData.removeSchemaMetadata("foo_db_1");
+ assertFalse(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_2"));
+ }
+
+ @Test
+ public void assertGetSchemaMetadata() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertNotNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").orElse(null));
+ }
+
+ @Test
+ public void assertGetSchemaMetadataByNonexistentKey() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ federationDatabaseMetaData.getSchemaMetadata("foo_db_2");
+ }
+
+ @Test
+ public void assertPutTable() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", Collections.emptyMap());
+ ShardingSphereTable fooTable = new ShardingSphereTable("foo_table", Collections.emptyList(),
+ Collections.emptyList(), Collections.emptyList());
+ federationDatabaseMetaData.putTable("foo_db", fooTable);
+ assertNotNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").orElse(null));
Review Comment:
Do you think use assertTrue is better?
##########
shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationDatabaseMetaDataTest.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.shardingsphere.infra.federation.optimizer.metadata;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.Map;
+import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
+import org.junit.Test;
+
+public final class FederationDatabaseMetaDataTest {
+
+ @Test
+ public void assertPutSchemaMetadata() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo",
+ Collections.emptyMap());
+ FederationSchemaMetaData schemaMetaData = mock(FederationSchemaMetaData.class);
+ federationDatabaseMetaData.putSchemaMetadata("foo_db", schemaMetaData);
+ assertThat(federationDatabaseMetaData.getSchemas().get("foo_db"), is(schemaMetaData));
+ }
+
+ @Test
+ public void assertRemoveSchemaMetadata() {
+ Map<String, ShardingSphereSchema> map = Maps.of(
+ "foo_db_1", mock(ShardingSphereSchema.class),
+ "foo_db_2", mock(ShardingSphereSchema.class));
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ federationDatabaseMetaData.removeSchemaMetadata("foo_db_1");
+ assertFalse(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_2"));
+ }
+
+ @Test
+ public void assertGetSchemaMetadata() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertNotNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").orElse(null));
+ }
+
+ @Test
+ public void assertGetSchemaMetadataByNonexistentKey() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
Review Comment:
Rename sphereSchema to schema may be better.
##########
shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationDatabaseMetaDataTest.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.shardingsphere.infra.federation.optimizer.metadata;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.Map;
+import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
+import org.junit.Test;
+
+public final class FederationDatabaseMetaDataTest {
+
+ @Test
+ public void assertPutSchemaMetadata() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo",
+ Collections.emptyMap());
+ FederationSchemaMetaData schemaMetaData = mock(FederationSchemaMetaData.class);
+ federationDatabaseMetaData.putSchemaMetadata("foo_db", schemaMetaData);
+ assertThat(federationDatabaseMetaData.getSchemas().get("foo_db"), is(schemaMetaData));
+ }
+
+ @Test
+ public void assertRemoveSchemaMetadata() {
+ Map<String, ShardingSphereSchema> map = Maps.of(
Review Comment:
Please replace `Maps.of()` with `new HashMap()`;
##########
shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationDatabaseMetaDataTest.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.shardingsphere.infra.federation.optimizer.metadata;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.Map;
+import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
+import org.junit.Test;
+
+public final class FederationDatabaseMetaDataTest {
+
+ @Test
+ public void assertPutSchemaMetadata() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo",
+ Collections.emptyMap());
+ FederationSchemaMetaData schemaMetaData = mock(FederationSchemaMetaData.class);
+ federationDatabaseMetaData.putSchemaMetadata("foo_db", schemaMetaData);
+ assertThat(federationDatabaseMetaData.getSchemas().get("foo_db"), is(schemaMetaData));
+ }
+
+ @Test
+ public void assertRemoveSchemaMetadata() {
+ Map<String, ShardingSphereSchema> map = Maps.of(
+ "foo_db_1", mock(ShardingSphereSchema.class),
+ "foo_db_2", mock(ShardingSphereSchema.class));
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ federationDatabaseMetaData.removeSchemaMetadata("foo_db_1");
+ assertFalse(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_2"));
+ }
+
+ @Test
+ public void assertGetSchemaMetadata() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertNotNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").orElse(null));
Review Comment:
Do you think use assertTrue is better?
##########
shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationDatabaseMetaDataTest.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.shardingsphere.infra.federation.optimizer.metadata;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.Map;
+import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
+import org.junit.Test;
+
+public final class FederationDatabaseMetaDataTest {
+
+ @Test
+ public void assertPutSchemaMetadata() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo",
+ Collections.emptyMap());
+ FederationSchemaMetaData schemaMetaData = mock(FederationSchemaMetaData.class);
+ federationDatabaseMetaData.putSchemaMetadata("foo_db", schemaMetaData);
+ assertThat(federationDatabaseMetaData.getSchemas().get("foo_db"), is(schemaMetaData));
+ }
+
+ @Test
+ public void assertRemoveSchemaMetadata() {
+ Map<String, ShardingSphereSchema> map = Maps.of(
+ "foo_db_1", mock(ShardingSphereSchema.class),
+ "foo_db_2", mock(ShardingSphereSchema.class));
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ federationDatabaseMetaData.removeSchemaMetadata("foo_db_1");
+ assertFalse(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_2"));
+ }
+
+ @Test
+ public void assertGetSchemaMetadata() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertNotNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").orElse(null));
+ }
+
+ @Test
+ public void assertGetSchemaMetadataByNonexistentKey() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ federationDatabaseMetaData.getSchemaMetadata("foo_db_2");
Review Comment:
Please add assert for this case.
##########
shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationDatabaseMetaDataTest.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.shardingsphere.infra.federation.optimizer.metadata;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.Map;
+import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
+import org.junit.Test;
+
+public final class FederationDatabaseMetaDataTest {
+
+ @Test
+ public void assertPutSchemaMetadata() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo",
+ Collections.emptyMap());
+ FederationSchemaMetaData schemaMetaData = mock(FederationSchemaMetaData.class);
+ federationDatabaseMetaData.putSchemaMetadata("foo_db", schemaMetaData);
+ assertThat(federationDatabaseMetaData.getSchemas().get("foo_db"), is(schemaMetaData));
+ }
+
+ @Test
+ public void assertRemoveSchemaMetadata() {
+ Map<String, ShardingSphereSchema> map = Maps.of(
+ "foo_db_1", mock(ShardingSphereSchema.class),
+ "foo_db_2", mock(ShardingSphereSchema.class));
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ federationDatabaseMetaData.removeSchemaMetadata("foo_db_1");
+ assertFalse(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_2"));
+ }
+
+ @Test
+ public void assertGetSchemaMetadata() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertNotNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").orElse(null));
+ }
+
+ @Test
+ public void assertGetSchemaMetadataByNonexistentKey() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
Review Comment:
Please replace `Maps.of()` with `new HashMap()`;
##########
shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/test/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/FederationDatabaseMetaDataTest.java:
##########
@@ -0,0 +1,94 @@
+/*
+ * 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.shardingsphere.infra.federation.optimizer.metadata;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.Map;
+import org.apache.groovy.util.Maps;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereSchema;
+import org.apache.shardingsphere.infra.metadata.database.schema.decorator.model.ShardingSphereTable;
+import org.junit.Test;
+
+public final class FederationDatabaseMetaDataTest {
+
+ @Test
+ public void assertPutSchemaMetadata() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo",
+ Collections.emptyMap());
+ FederationSchemaMetaData schemaMetaData = mock(FederationSchemaMetaData.class);
+ federationDatabaseMetaData.putSchemaMetadata("foo_db", schemaMetaData);
+ assertThat(federationDatabaseMetaData.getSchemas().get("foo_db"), is(schemaMetaData));
+ }
+
+ @Test
+ public void assertRemoveSchemaMetadata() {
+ Map<String, ShardingSphereSchema> map = Maps.of(
+ "foo_db_1", mock(ShardingSphereSchema.class),
+ "foo_db_2", mock(ShardingSphereSchema.class));
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ federationDatabaseMetaData.removeSchemaMetadata("foo_db_1");
+ assertFalse(federationDatabaseMetaData.getSchemas().containsKey("foo_db_1"));
+ assertTrue(federationDatabaseMetaData.getSchemas().containsKey("foo_db_2"));
+ }
+
+ @Test
+ public void assertGetSchemaMetadata() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ assertNotNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").orElse(null));
+ }
+
+ @Test
+ public void assertGetSchemaMetadataByNonexistentKey() {
+ ShardingSphereSchema sphereSchema = mock(ShardingSphereSchema.class);
+ Map<String, ShardingSphereSchema> map = Maps.of("foo_db", sphereSchema);
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", map);
+ federationDatabaseMetaData.getSchemaMetadata("foo_db_2");
+ }
+
+ @Test
+ public void assertPutTable() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", Collections.emptyMap());
+ ShardingSphereTable fooTable = new ShardingSphereTable("foo_table", Collections.emptyList(),
+ Collections.emptyList(), Collections.emptyList());
+ federationDatabaseMetaData.putTable("foo_db", fooTable);
+ assertNotNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").orElse(null));
+ assertNotNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").map(FederationSchemaMetaData::getTables).map(e -> e.get("foo_table")).orElse(null));
+ }
+
+ @Test
+ public void assertRemoveTableMetadata() {
+ FederationDatabaseMetaData federationDatabaseMetaData = new FederationDatabaseMetaData("foo", Collections.emptyMap());
+ ShardingSphereTable fooTable = new ShardingSphereTable("foo_table", Collections.emptyList(),
+ Collections.emptyList(), Collections.emptyList());
+ federationDatabaseMetaData.putTable("foo_db", fooTable);
+ federationDatabaseMetaData.removeTableMetadata("foo_db", "foo_table");
+ assertNull(federationDatabaseMetaData.getSchemaMetadata("foo_db").map(s -> s.getTables().get("foo_table")).orElse(null));
Review Comment:
Do you think use assertTrue is better?
--
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.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] aoyvx commented on pull request #18542: Features/federation database meta data test
Posted by GitBox <gi...@apache.org>.
aoyvx commented on PR #18542:
URL: https://github.com/apache/shardingsphere/pull/18542#issuecomment-1164369569
@strongduanmu Thank you for your suggestion, I have done it here.
--
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.
To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org