You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by ji...@apache.org on 2022/11/22 13:19:04 UTC

[incubator-hugegraph-computer] branch cc-algo updated (268d91f8 -> d8b4e48a)

This is an automated email from the ASF dual-hosted git repository.

jin pushed a change to branch cc-algo
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph-computer.git


    from 268d91f8 tiny improve
     add c5f11f5d [fix][ci] Fix loader compile error & adaptation apache loader/client (#194)
     add d8b4e48a Merge branch 'master' into cc-algo

No new revisions were added by this update.

Summary of changes:
 .github/{workflows => outdated}/release.yml        |   0
 .github/workflows/ci.yml                           |  21 +++-
 computer-algorithm/pom.xml                         |  10 ++
 .../betweenness/BetweennessCentrality.java         |   2 +-
 .../centrality/betweenness/BetweennessMessage.java |   2 +-
 .../centrality/closeness/ClosenessCentrality.java  |   4 +-
 .../centrality/degree/DegreeCentrality.java        |   2 +-
 .../centrality/pagerank/PageRank4Master.java       |   2 +-
 .../algorithm/community/kcore/KcoreValue.java      |   2 +-
 .../path/rings/filter/FilterDescribe.java          |   2 +-
 computer-api/pom.xml                               |   2 +-
 .../computer/algorithm/AlgorithmParams.java        |   4 +-
 .../core/combiner/DoubleValueSumCombiner.java      |   2 +-
 .../core/combiner/FloatValueSumCombiner.java       |   2 +-
 .../core/combiner/IntValueSumCombiner.java         |   2 +-
 .../core/combiner/LongValueSumCombiner.java        |   2 +-
 .../core/combiner/MergeNewPropertiesCombiner.java  |   2 +-
 .../core/combiner/MergeOldPropertiesCombiner.java  |   2 +-
 .../computer/core/combiner/OverwriteCombiner.java  |   2 +-
 .../core/combiner/OverwritePropertiesCombiner.java |   2 +-
 .../computer/core/combiner/ValueMaxCombiner.java   |   2 +-
 .../computer/core/combiner/ValueMinCombiner.java   |   2 +-
 .../computer/core/common/ComputerContext.java      |   2 +-
 .../hugegraph/computer/core/common/Constants.java  |   2 +-
 .../hugegraph/computer/core/common/SerialEnum.java |   2 +-
 .../hugegraph/computer/core/config/Config.java     |   6 +-
 .../baidu/hugegraph/computer/core/config/Null.java |   2 +-
 .../computer/core/graph/value/BooleanValue.java    |   2 +-
 .../computer/core/graph/value/DoubleValue.java     |   2 +-
 .../computer/core/graph/value/FloatValue.java      |   2 +-
 .../computer/core/graph/value/IntValue.java        |   2 +-
 .../computer/core/graph/value/ListValue.java       |   2 +-
 .../computer/core/graph/value/LongValue.java       |   2 +-
 .../computer/core/graph/value/NullValue.java       |   2 +-
 .../computer/core/graph/value/StringValue.java     |   2 +-
 .../hugegraph/computer/core/graph/value/Value.java |   2 +-
 .../hugegraph/computer/core/input/InputFilter.java |   4 +-
 .../computer/core/worker/FilterComputation.java    |   2 +-
 computer-core/pom.xml                              |  20 ++-
 .../computer/core/aggregator/Aggregators.java      |   2 +-
 .../core/aggregator/DefaultAggregator.java         |   2 +-
 .../core/aggregator/MasterAggrManager.java         |   4 +-
 .../core/aggregator/RegisterAggregators.java       |   2 +-
 .../core/aggregator/WorkerAggrManager.java         |   2 +-
 .../hugegraph/computer/core/bsp/Bsp4Master.java    |   2 +-
 .../hugegraph/computer/core/bsp/Bsp4Worker.java    |   2 +-
 .../baidu/hugegraph/computer/core/bsp/BspBase.java |   2 +-
 .../hugegraph/computer/core/bsp/EtcdClient.java    |   6 +-
 .../computer/core/common/ContainerInfo.java        |   2 +-
 .../computer/core/compute/ComputeManager.java      |   4 +-
 .../computer/core/compute/FileGraphPartition.java  |   4 +-
 .../computer/core/config/ComputerOptions.java      |  26 ++--
 .../computer/core/config/DefaultConfig.java        |  10 +-
 .../computer/core/graph/SuperstepStat.java         |   2 +-
 .../hugegraph/computer/core/graph/id/BytesId.java  |   2 +-
 .../computer/core/graph/value/MapValue.java        |   2 +-
 .../hugegraph/computer/core/input/EdgeFetcher.java |   2 +-
 .../computer/core/input/HugeConverter.java         |   2 +-
 .../hugegraph/computer/core/input/IdUtil.java      |   8 +-
 .../computer/core/input/MasterInputManager.java    |   4 +-
 .../computer/core/input/VertexFetcher.java         |   2 +-
 .../core/input/filter/DefaultInputFilter.java      |   4 +-
 .../filter/ExtractAllPropertyInputFilter.java      |   4 +-
 .../computer/core/input/hg/HugeEdgeFetcher.java    |   6 +-
 .../computer/core/input/hg/HugeElementFetcher.java |   4 +-
 .../computer/core/input/hg/HugeGraphFetcher.java   |   4 +-
 .../core/input/hg/HugeInputSplitFetcher.java       |   8 +-
 .../computer/core/input/hg/HugeVertexFetcher.java  |   6 +-
 .../core/input/loader/FileEdgeFetcher.java         |  16 +--
 .../core/input/loader/FileElementFetcher.java      |  26 ++--
 .../computer/core/input/loader/FileInputSplit.java |   4 +-
 .../core/input/loader/FileVertxFetcher.java        |  12 +-
 .../input/loader/LoaderFileInputSplitFetcher.java  |  18 +--
 .../core/io/AbstractBufferedFileInput.java         |   2 +-
 .../core/io/AbstractBufferedFileOutput.java        |   2 +-
 .../computer/core/io/BufferedFileInput.java        |   4 +-
 .../computer/core/io/BufferedFileOutput.java       |   2 +-
 .../computer/core/io/BufferedStreamInput.java      |   2 +-
 .../computer/core/io/BufferedStreamOutput.java     |   2 +-
 .../computer/core/io/OptimizedBytesInput.java      |   4 +-
 .../computer/core/io/OptimizedBytesOutput.java     |   2 +-
 .../computer/core/io/StructRandomAccessOutput.java |   2 +-
 .../computer/core/io/UnsafeBytesInput.java         |   2 +-
 .../computer/core/io/UnsafeBytesOutput.java        |   2 +-
 .../hugegraph/computer/core/manager/Managers.java  |   4 +-
 .../computer/core/master/MasterService.java        |   6 +-
 .../computer/core/network/ConnectionId.java        |   2 +-
 .../computer/core/network/DataClientManager.java   |   4 +-
 .../computer/core/network/DataServerManager.java   |   2 +-
 .../computer/core/network/TransportConf.java       |   2 +-
 .../computer/core/network/TransportUtil.java       |   4 +-
 .../connection/TransportConnectionManager.java     |   2 +-
 .../computer/core/network/message/DataMessage.java |   2 +-
 .../computer/core/network/message/FailMessage.java |   2 +-
 .../core/network/netty/AbstractNettyHandler.java   |   2 +-
 .../netty/ChannelFutureListenerOnWrite.java        |   2 +-
 .../core/network/netty/HeartbeatHandler.java       |   2 +-
 .../core/network/netty/NettyClientFactory.java     |   4 +-
 .../core/network/netty/NettyTransportClient.java   |   2 +-
 .../core/network/netty/NettyTransportServer.java   |   4 +-
 .../core/network/netty/ServerIdleHandler.java      |   2 +-
 .../core/network/netty/codec/FrameDecoder.java     |   2 +-
 .../network/netty/codec/PreciseFrameDecoder.java   |   2 +-
 .../core/network/session/ClientSession.java        |   4 +-
 .../core/network/session/ServerSession.java        |   2 +-
 .../core/output/AbstractComputerOutput.java        |   2 +-
 .../computer/core/output/LimitedLogOutput.java     |   2 +-
 .../hugegraph/computer/core/output/LogOutput.java  |   2 +-
 .../computer/core/output/hdfs/HdfsOutput.java      |   2 +-
 .../computer/core/output/hg/HugeGraphOutput.java   |  14 +--
 .../computer/core/output/hg/metrics/Printer.java   |   4 +-
 .../core/output/hg/task/BatchInsertTask.java       |  10 +-
 .../computer/core/output/hg/task/InsertTask.java   |   4 +-
 .../core/output/hg/task/SingleInsertTask.java      |   6 +-
 .../computer/core/output/hg/task/TaskManager.java  |  10 +-
 .../computer/core/receiver/MessageRecvBuffers.java |   2 +-
 .../computer/core/receiver/MessageRecvManager.java |   4 +-
 .../core/receiver/MessageRecvPartition.java        |   2 +-
 .../computer/core/rpc/MasterRpcManager.java        |   6 +-
 .../computer/core/rpc/WorkerRpcManager.java        |   6 +-
 .../computer/core/sender/MessageQueue.java         |   2 +-
 .../computer/core/sender/MessageSendBuffers.java   |   2 +-
 .../computer/core/sender/MessageSendManager.java   |   2 +-
 .../computer/core/sender/QueuedMessageSender.java  |   6 +-
 .../computer/core/sender/WriteBuffers.java         |   2 +-
 .../core/sort/flusher/CombinableSorterFlusher.java |   2 +-
 .../sort/flusher/CombineSubKvInnerSortFlusher.java |   2 +-
 .../sort/flusher/CombineSubKvOuterSortFlusher.java |   2 +-
 .../core/sort/flusher/KvInnerSortFlusher.java      |   2 +-
 .../core/sort/flusher/KvOuterSortFlusher.java      |   2 +-
 .../core/sort/flusher/PeekableIterator.java        |   2 +-
 .../core/sort/flusher/PeekableIteratorAdaptor.java |   4 +-
 .../computer/core/sort/merge/FileMergerImpl.java   |   2 +-
 .../computer/core/sort/sorter/SubKvSorter.java     |   2 +-
 .../core/sort/sorting/AbstractInputsSorting.java   |   2 +-
 .../computer/core/sort/sorting/SortManager.java    |   4 +-
 .../computer/core/store/EntryIterator.java         |   2 +-
 .../hugegraph/computer/core/store/FileManager.java |   2 +-
 .../store/buffer/KvEntriesWithFirstSubKvInput.java |   4 +-
 .../core/store/file/hgkvfile/HgkvDirImpl.java      |   4 +-
 .../core/store/file/hgkvfile/HgkvFileImpl.java     |   2 +-
 .../file/hgkvfile/builder/HgkvDirBuilderImpl.java  |   2 +-
 .../file/hgkvfile/builder/HgkvFileBuilderImpl.java |   2 +-
 .../hgkvfile/reader/HgkvDir4SubKvReaderImpl.java   |   4 +-
 .../store/file/select/DisperseEvenlySelector.java  |   2 +-
 .../core/store/file/seqfile/ValueFile.java         |   2 +-
 .../core/store/file/seqfile/ValueFileInput.java    |   2 +-
 .../core/store/file/seqfile/ValueFileOutput.java   |   2 +-
 .../hugegraph/computer/core/util/Consumers.java    |   2 +-
 .../hugegraph/computer/core/util/JsonUtil.java     |   2 +-
 .../hugegraph/computer/core/util/ShutdownHook.java |   6 +-
 .../computer/core/util/StringEncoding.java         |   4 +-
 .../computer/core/worker/WorkerService.java        |   4 +-
 .../hugegraph/computer/core/worker/WorkerStat.java |   2 +-
 .../computer/core/worker/load/LoadService.java     |  10 +-
 computer-core/src/main/resources/log4j2.xml        |  45 +++++--
 computer-dist/src/assembly/travis/install-hdfs.sh  |   6 +-
 .../travis/install-hugegraph-from-source.sh        |   2 +-
 .../assembly/travis/load-data-into-hugegraph.sh    |   7 +-
 .../hugegraph/computer/dist/HugeGraphComputer.java |   8 +-
 computer-driver/pom.xml                            |   7 ++
 .../computer/driver/config/ComputerOptions.java    |  12 +-
 .../computer/driver/config/DriverConfigOption.java |   2 +-
 .../hugegraph/computer/driver/util/JsonUtil.java   |   2 +-
 .../computer/k8s/operator/OperatorEntrypoint.java  |  13 +-
 .../k8s/operator/common/AbstractController.java    |   6 +-
 .../k8s/operator/common/OperatorRequest.java       |   2 +-
 .../k8s/operator/config/OperatorOptions.java       |  10 +-
 .../operator/controller/ComputerJobController.java |   4 +-
 .../operator/controller/ComputerJobDeployer.java   |  24 ++--
 .../src/main/resources/log4j2.xml                  |   4 +-
 .../computer/k8s/config/KubeDriverOptions.java     |  10 +-
 .../computer/k8s/config/KubeSpecOptions.java       |  12 +-
 .../computer/k8s/driver/KubernetesDriver.java      |  10 +-
 .../hugegraph/computer/k8s/util/KubeUtil.java      |   2 +-
 computer-test/pom.xml                              |   2 +-
 .../computer/algorithm/AlgorithmTestBase.java      |  10 +-
 .../computer/algorithm/AlgorithmTestSuite.java     |   4 +-
 .../betweenness/BetweennessCentralityTest.java     |  37 +++---
 .../closeness/ClosenessCentralityTest.java         |  28 ++---
 .../centrality/degree/DegreeCentralityTest.java    |  17 ++-
 .../community/trianglecount/TriangleCountTest.java |  32 ++---
 .../algorithm/path/rings/RingsDetectionTest.java   |  22 ++--
 .../path/rings/RingsDetectionWithFilterTest.java   |  20 +--
 .../core/allocator/DefaultAllocatorTest.java       |   2 +-
 .../computer/core/allocator/RecyclersTest.java     |   2 +-
 .../hugegraph/computer/core/bsp/BspEventTest.java  |   2 +-
 .../hugegraph/computer/core/bsp/EtcdBspTest.java   |   2 +-
 .../computer/core/bsp/EtcdClientTest.java          |   2 +-
 .../core/combiner/DoubleValueSumCombinerTest.java  |   2 +-
 .../core/combiner/FloatValueSumCombinerTest.java   |   2 +-
 .../core/combiner/IntValueSumCombinerTest.java     |   2 +-
 .../core/combiner/LongValueSumCombinerTest.java    |   2 +-
 .../combiner/MergeNewPropertiesCombinerTest.java   |   2 +-
 .../combiner/MergeOldPropertiesCombinerTest.java   |   2 +-
 .../core/combiner/OverwriteCombinerTest.java       |   2 +-
 .../core/combiner/PointerCombinerTest.java         |   2 +-
 .../core/combiner/ValueMaxCombinerTest.java        |   2 +-
 .../core/combiner/ValueMinCombinerTest.java        |   2 +-
 .../computer/core/common/ContainerInfoTest.java    |   2 +-
 .../computer/core/common/ExceptionTest.java        |   2 +-
 .../computer/core/compute/ComputeManagerTest.java  |   2 +-
 .../core/compute/input/EdgesInputTest.java         |   4 +-
 .../core/compute/input/MessageInputTest.java       |   2 +-
 .../core/compute/input/ResuablePointerTest.java    |   2 +-
 .../computer/core/config/DefaultConfigTest.java    |   2 +-
 .../core/graph/BuiltinGraphFactoryTest.java        |   2 +-
 .../computer/core/graph/DefaultEdgeTest.java       |   2 +-
 .../computer/core/graph/DefaultPropertiesTest.java |   2 +-
 .../computer/core/graph/SuperstepStatTest.java     |   2 +-
 .../computer/core/graph/id/BytesIdTest.java        |   2 +-
 .../computer/core/graph/id/IdFactoryTest.java      |   2 +-
 .../computer/core/graph/id/IdTypeTest.java         |   2 +-
 .../core/graph/partition/HashPartitionerTest.java  |   4 +-
 .../core/graph/partition/PartitionStatTest.java    |   2 +-
 .../core/graph/value/BooleanValueTest.java         |   2 +-
 .../computer/core/graph/value/DoubleValueTest.java |   2 +-
 .../computer/core/graph/value/FloatValueTest.java  |   2 +-
 .../computer/core/graph/value/IdListListTest.java  |   2 +-
 .../computer/core/graph/value/IdValueListTest.java |   2 +-
 .../computer/core/graph/value/IdValueTest.java     |   2 +-
 .../computer/core/graph/value/IntValueTest.java    |   2 +-
 .../computer/core/graph/value/ListValueTest.java   |   2 +-
 .../computer/core/graph/value/LongValueTest.java   |   2 +-
 .../computer/core/graph/value/NullValueTest.java   |   2 +-
 .../computer/core/graph/value/StringValueTest.java |   2 +-
 .../computer/core/graph/value/ValueTypeTest.java   |   2 +-
 .../computer/core/input/FileInputSplitTest.java    |   6 +-
 .../computer/core/input/HugeConverterTest.java     |   2 +-
 .../computer/core/input/InputSplitDataTest.java    |   2 +-
 .../computer/core/input/InputSplitTest.java        |   2 +-
 .../core/input/MockWorkerInputManager.java         |   6 +-
 .../computer/core/io/BufferedFileTest.java         |   4 +-
 .../computer/core/io/BufferedStreamTest.java       |   2 +-
 .../computer/core/io/CsvStructGraphOutputTest.java |   2 +-
 .../core/io/JsonStructGraphOutputTest.java         |   2 +-
 .../computer/core/io/OptimizedUnsafeBytesTest.java |   2 +-
 .../core/io/StreamGraphOutputInputTest.java        |   2 +-
 .../core/io/StructRandomAccessOutputTest.java      |   2 +-
 .../computer/core/io/UnsafeBytesTest.java          |   2 +-
 .../computer/core/network/ConnectionIdTest.java    |   2 +-
 .../core/network/DataServerManagerTest.java        |   4 +-
 .../computer/core/network/MockClientHandler.java   |   2 +-
 .../computer/core/network/MockMessageHandler.java  |   2 +-
 .../computer/core/network/TransportUtilTest.java   |   2 +-
 .../core/network/buffer/NetworkBufferTest.java     |   2 +-
 .../network/connection/ConnectionManagerTest.java  |   2 +-
 .../core/network/netty/AbstractNetworkTest.java    |   6 +-
 .../core/network/netty/NettyClientFactoryTest.java |   4 +-
 .../netty/NettyEncodeDecodeHandlerTest.java        |   2 +-
 .../network/netty/NettyTransportClientTest.java    |   6 +-
 .../network/netty/NettyTransportServerTest.java    |   2 +-
 .../core/network/session/TransportSessionTest.java |   8 +-
 .../core/receiver/MessageRecvBuffersTest.java      |   2 +-
 .../core/receiver/MessageRecvManagerTest.java      |   2 +-
 .../edge/EdgeMessageRecvPartitionTest.java         |   2 +-
 .../message/ComputeMessageRecvPartitionTest.java   |   2 +-
 .../vertex/VertexMessageRecvPartitionTest.java     |   2 +-
 .../computer/core/sender/MessageQueueTest.java     |   4 +-
 .../core/sender/MessageSendBuffersTest.java        |   2 +-
 .../computer/core/sender/MultiQueueTest.java       |   2 +-
 .../core/sender/QueuedMessageSenderTest.java       |   8 +-
 .../computer/core/sender/QueuedMessageTest.java    |   2 +-
 .../computer/core/sender/WriteBufferTest.java      |   2 +-
 .../computer/core/sender/WriteBuffersTest.java     |   4 +-
 .../computer/core/sort/SorterTestUtil.java         |   2 +-
 .../core/sort/sorter/EmptyFlusherTest.java         |   2 +-
 .../computer/core/sort/sorter/FlusherTest.java     |   2 +-
 .../core/sort/sorter/SortLargeDataTest.java        |   6 +-
 .../computer/core/sort/sorter/SorterTest.java      |   4 +-
 .../computer/core/sort/sorting/TestData.java       |   2 +-
 .../hugegraph/computer/core/store/BitFileTest.java |   2 +-
 .../computer/core/store/EntriesUtilTest.java       |   2 +-
 .../computer/core/store/FileManagerTest.java       |   2 +-
 .../hugegraph/computer/core/store/HgkvDirTest.java |   2 +-
 .../computer/core/store/HgkvFileTest.java          |   2 +-
 .../computer/core/store/StoreTestUtil.java         |   2 +-
 .../computer/core/store/ValueFileTest.java         |   6 +-
 .../core/util/ComputerContextUtilTest.java         |   2 +-
 .../hugegraph/computer/core/util/JsonUtilTest.java |   2 +-
 .../computer/core/util/SerializeUtilTest.java      |   2 +-
 .../computer/core/worker/MockComputation.java      |   2 +-
 .../computer/core/worker/MockComputation2.java     |   2 +-
 .../core/worker/MockMasterComputation.java         |   2 +-
 .../core/worker/MockMasterComputation2.java        |   2 +-
 .../computer/core/worker/WorkerServiceTest.java    |  12 +-
 .../computer/core/worker/WorkerStatTest.java       |   2 +-
 .../computer/dist/HugeGraphComputerTest.java       |  19 +--
 .../computer/driver/ComputerOptionsTest.java       |  12 +-
 .../hugegraph/computer/driver/DriverTest.java      |   2 +-
 .../hugegraph/computer/driver/DriverTestSuite.java |   2 +-
 .../hugegraph/computer/k8s/AbstractK8sTest.java    |  12 +-
 .../computer/k8s/KubernetesDriverTest.java         |   6 +-
 .../baidu/hugegraph/computer/k8s/MiniKubeTest.java |   6 +-
 .../suite/integrate/IntegrateTestSuite.java        |  11 +-
 .../suite/integrate/SenderIntegrateTest.java       | 140 ++++++++++++---------
 .../computer/suite/unit/UnitTestBase.java          |  84 +++++++++++--
 .../computer/suite/unit/UnitTestSuite.java         |  70 +----------
 .../src/main/resources/computer-worker1.properties |   2 -
 pom.xml                                            |  53 ++++----
 300 files changed, 861 insertions(+), 783 deletions(-)
 rename .github/{workflows => outdated}/release.yml (100%)