add DefaultPropertiesCombiner and DefaultVertexValueCombiner

computer-core/src/main/java/com/baidu/hugegraph/computer/core/combiner/DefaultPropertiesCombiner.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017 HugeGraph Authors
+ *
+ * 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 com.baidu.hugegraph.computer.core.combiner;
+
+import com.baidu.hugegraph.computer.core.graph.properties.Properties;
+
+public class DefaultPropertiesCombiner implements PropertiesCombiner {
+
+ @Override
+ public Properties combine(Properties v1, Properties v2) {
+ return v2;
+ }
+}

computer-core/src/main/java/com/baidu/hugegraph/computer/core/combiner/DefaultVertexValueCombiner.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2017 HugeGraph Authors
+ *
+ * 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 com.baidu.hugegraph.computer.core.combiner;
+
+import com.baidu.hugegraph.computer.core.graph.value.Value;
+
+/**
+ * When vertex values with the same vertex id are loaded, this class
+ * specifies how to combine their values.
+ */
+public class DefaultVertexValueCombiner<T extends Value>
+ implements VertexValueCombiner<T> {
+
+ /**
+ * Just return the second value.
+ */
+ @Override
+ public T combine(T v1, T v2) {
+ return v2;
+ }
+}

computer-core/src/main/java/com/baidu/hugegraph/computer/core/combiner/PropertiesCombiner.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017 HugeGraph Authors
+ *
+ * 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 com.baidu.hugegraph.computer.core.combiner;
+
+import com.baidu.hugegraph.computer.core.graph.properties.Properties;
+
+/**
+ * When vertex properties with the same vertex id are loaded, this class
+ * specifies how to combine their properties.
+ */
+public interface PropertiesCombiner extends Combiner<Properties> {
+}

computer-core/src/main/java/com/baidu/hugegraph/computer/core/combiner/VertexValueCombiner.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017 HugeGraph Authors
+ *
+ * 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 com.baidu.hugegraph.computer.core.combiner;
+
+import com.baidu.hugegraph.computer.core.graph.value.Value;
+
+public interface VertexValueCombiner<T extends Value> extends Combiner<T> {
+}

computer-test/src/main/java/com/baidu/hugegraph/computer/core/combiner/CombinerTestSuite.java

@@ -24,6 +24,8 @@
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
+ DefaultPropertiesCombinerTest.class,
+ DefaultVertexValueCombinerTest.class,
  DoubleValueSumCombinerTest.class,
  LongValueSumCombinerTest.class,
  ValueMinCombinerTest.class,

computer-test/src/main/java/com/baidu/hugegraph/computer/core/combiner/DefaultPropertiesCombinerTest.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2017 HugeGraph Authors
+ *
+ * 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 com.baidu.hugegraph.computer.core.combiner;
+
+import org.junit.Test;
+
+import com.baidu.hugegraph.computer.core.graph.id.Utf8Id;
+import com.baidu.hugegraph.computer.core.graph.properties.DefaultProperties;
+import com.baidu.hugegraph.computer.core.graph.properties.Properties;
+import com.baidu.hugegraph.testutil.Assert;
+
+public class DefaultPropertiesCombinerTest {
+
+ @Test
+ public void test() {
+ Properties properties1 = new DefaultProperties();
+ properties1.put("name", new Utf8Id("marko").idValue());
+ properties1.put("city", new Utf8Id("Beijing").idValue());
+
+ Properties properties2 = new DefaultProperties();
+ properties1.put("name", new Utf8Id("josh").idValue());
+
+ PropertiesCombiner combiner = new DefaultPropertiesCombiner();
+ Properties properties = combiner.combine(properties1, properties2);
+ Assert.assertEquals(properties2, properties);
+ }
+}

computer-test/src/main/java/com/baidu/hugegraph/computer/core/combiner/DefaultVertexValueCombinerTest.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017 HugeGraph Authors
+ *
+ * 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 com.baidu.hugegraph.computer.core.combiner;
+
+
+import org.junit.Test;
+
+import com.baidu.hugegraph.computer.core.graph.value.LongValue;
+import com.baidu.hugegraph.computer.core.graph.value.Value;
+import com.baidu.hugegraph.testutil.Assert;
+
+public class DefaultVertexValueCombinerTest {
+
+ @Test
+ public void test() {
+ LongValue value1 = new LongValue(1L);
+ LongValue value2 = new LongValue(2L);
+ DefaultVertexValueCombiner combiner = new DefaultVertexValueCombiner();
+ Value value = combiner.combine(value1, value2);
+ Assert.assertEquals(value2, value);
+ }
+}