Skip to content

Commit

Permalink
Merge pull request #1228 from dbs-leipzig/develop
Browse files Browse the repository at this point in the history
[release] v0.4.5
  • Loading branch information
ChrizZz110 authored Apr 18, 2019
2 parents 9aa43c7 + ea3bbf5 commit c169694
Show file tree
Hide file tree
Showing 504 changed files with 12,435 additions and 3,081 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ os:
matrix:
allow_failures:
- os: windows
- os: osx

cache:
directories:
Expand Down
19 changes: 0 additions & 19 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -199,22 +199,3 @@
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.

=======================================================================

Gradoop subcomponents:

The gradoop project contains subcomponents in the source code
release with separate copyright notices and license terms. Your use of
the source code for these subcomponents is subject to the terms and
conditions of their respective licenses.


-----------------------------------------------------------------------
The Apache License 2.0
-----------------------------------------------------------------------

- Flink 1.5.0
- Hbase 1.3.1
- Accumulo 1.9.0
- MongoDB 3.6.3
25 changes: 20 additions & 5 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,25 @@ Copyright 2014-2019 Leipzig University (Database Research Group)
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

=======================================================================
This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)

Gradoop contains subcomponents with separate copyright notices and
license terms. Your use of the source code for these subcomponents
is subject to the terms and conditions of their respective licenses.
- com.github.s1ck:gdl:0.3
- commons-cli:commons-cli:1.4
- log4j:log4j:1.2.17
- me.lemire.integercompression:JavaFastPFOR:0.1.10
- org.apache.accumulo:accumulo-core:1.9.0
- org.apache.flink:flink-clients_2.11:1.7.2
- org.apache.flink:flink-core:1.7.2
- org.apache.flink:flink-gelly_2.11:1.7.2
- org.apache.flink:flink-hadoop-compatibility_2.11:1.7.2
- org.apache.flink:flink-hbase_2.11:1.7.2
- org.apache.flink:flink-java:1.7.2
- org.apache.flink:flink-shaded-hadoop2:1.7.2
- org.apache.hbase:hbase-hadoop-compat:1.4.3
- org.apache.hbase:hbase-server:1.4.3
- org.codehaus.jettison:jettison:1.3.7

See the LICENSE file for a list of subcomponents respective licenses.
This project bundles the following dependencies under the BSD license.
See bundled license files for details.

- com.esotericsoftware:kryo:4.0.2
24 changes: 24 additions & 0 deletions NOTICE-binary
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// ------------------------------------------------------------------
// NOTICE file corresponding to the section 4d of The Apache License,
// Version 2.0, in this case for Gradoop
// ------------------------------------------------------------------

gradoop-accumulo
Copyright 2014-2019 Leipzig University (Database Research Group)

This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)

- com.github.s1ck:gdl:0.3
- com.google.guava:guava
- commons-cli:commons-cli:1.4
- log4j:log4j:1.2.17
- me.lemire.integercompression:JavaFastPFOR:0.1.10
- org.codehaus.jettison:jettison:1.3.7
- org.objenesis:objenesis:2.5.1

This project bundles the following dependencies under the BSD license.
See bundled license files for details.

- com.esotericsoftware:kryo:4.0.2
- com.esotericsoftware:minlog:1.3.0
- org.antlr:antlr4-runtime
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)](https://www.apache.org/licenses/LICENSE-2.0)
[![Maven Central](https://img.shields.io/badge/Maven_Central-0.4.4-blue.svg?label=Maven%20Central)](http://search.maven.org/#search%7Cga%7C1%7Cgradoop)
[![Maven Central](https://img.shields.io/badge/Maven_Central-0.4.5-blue.svg?label=Maven%20Central)](http://search.maven.org/#search%7Cga%7C1%7Cgradoop)
[![Build Status](https://travis-ci.org/dbs-leipzig/gradoop.svg?branch=master)](https://travis-ci.org/dbs-leipzig/gradoop)
[![Code Quality: Java](https://img.shields.io/lgtm/grade/java/g/dbs-leipzig/gradoop.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/dbs-leipzig/gradoop/context:java)
[![Total Alerts](https://img.shields.io/lgtm/alerts/g/dbs-leipzig/gradoop.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/dbs-leipzig/gradoop/alerts)
Expand Down Expand Up @@ -111,7 +111,7 @@ Stable:
<dependency>
<groupId>org.gradoop</groupId>
<artifactId>gradoop-flink</artifactId>
<version>0.4.4</version>
<version>0.4.5</version>
</dependency>
```

Expand All @@ -134,17 +134,17 @@ Latest nightly build (additional repository is required):
</dependency>
```
In any case you also need Apache Flink (version 1.6.0):
In any case you also need Apache Flink (version 1.7.2):
```
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>1.7.0</version>
<version>1.7.2</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients_2.11</artifactId>
<version>1.7.0</version>
<version>1.7.2</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion gradoop-checkstyle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.gradoop</groupId>
<artifactId>gradoop-parent</artifactId>
<version>0.4.4</version>
<version>0.4.5</version>
</parent>

<artifactId>gradoop-checkstyle</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<suppress checks="IllegalCatch"
files="GradoopGellyAlgorithm.java"
lines="70-77"/>
<suppress checks="IllegalCatch"
files="PrintTableSink"
lines="90-100"/>

<!-- less restrictive checkstyle for tests -->
<suppress checks="JavadocMethod"
Expand All @@ -40,4 +43,4 @@
files="[/\\]src[/\\]test[/\\]java[/\\]"/>
<suppress checks="StaticVariableName"
files="[/\\]src[/\\]test[/\\]java[/\\]"/>
</suppressions>
</suppressions>
5 changes: 3 additions & 2 deletions gradoop-common/pom.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.gradoop</groupId>
<artifactId>gradoop-parent</artifactId>
<version>0.4.4</version>
<version>0.4.5</version>
</parent>

<artifactId>gradoop-common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/*
* Copyright © 2014 - 2019 Leipzig University (Database Research Group)
*
* Licensed 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.gradoop.common.model.api.strategies;

import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.DataOutputView;
import org.gradoop.common.model.impl.properties.PropertyValue;

import java.io.IOException;

/**
* Interface defining the methods necessary to handle the (de-) serialization of a
* {@link PropertyValue}'s value.
*
* @param <T> The property value type.
*/
public interface PropertyValueStrategy<T> {

/**
* Writes the given value to the provided {@link DataOutputView}.
* The argument {@code value} can not be {@code null}.
*
* @param value to be written to the {@link DataOutputView}.
* @param outputView that the value is written to.
* @throws IOException if write process fails.
*/
void write(T value, DataOutputView outputView) throws IOException;

/**
* Reads raw bytes from the given {@link DataInputView} and deserializes the contained object.
*
* @param inputView containing serialized object.
* @param typeByte byte needed to indicate whether serialized object has a variable length.
* @return deserialized object.
* @throws IOException when reading or deserialization of the object fails.
*/
T read(DataInputView inputView, byte typeByte) throws IOException;

/**
* Compares two objects.
*
* @param value first object.
* @param other second object.
* @return a negative integer, zero, or a positive integer as first object is less than, equal to,
* or greater than the second object.
* @throws IllegalArgumentException when {@code other} is not comparable to {@code value}.
*/
int compare(T value, Object other);

/**
* Checks if given object is an instance of the data type the specific strategy handles.
*
* @param value to be checked.
* @return true if {@code value} is an instance of the data type this strategy handles.
* False otherwise.
*/
boolean is(Object value);

/**
* Gets the class of the data type the specific strategy handles.
*
* @return class of the type handled by this strategy.
*/
Class<T> getType();

/**
* Deserializes an object from the provided byte array.
*
* @param bytes representing a serialized object.
* @return an instance of the type handled by this strategy.
* @throws IOException on failure
*/
T get(byte[] bytes) throws IOException;

/**
* Gets a byte which represents the data type the specific strategy handles.
*
* @return a byte.
*/
byte getRawType();

/**
* Serializes the given object.
* The argument {@code value} can not be {@code null}.
*
* @param value the object to be serialized.
* @return byte array representation of the provided object.
* @throws IOException on failure
*/
byte[] getRawBytes(T value) throws IOException;
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
* limitations under the License.
*/
/**
* Contains sampling statistics functions
* Contains interfaces that are related to property value strategies.
*/
package org.gradoop.flink.model.impl.operators.sampling.statistics.functions;
package org.gradoop.common.model.api.strategies;
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,6 @@ public boolean isEmpty() {
return ids.isEmpty();
}

/**
* {@inheritDoc}
*/
@Override
public Iterator<GradoopId> iterator() {
return ids.iterator();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,43 +59,26 @@ public Edge(final GradoopId id, final String label, final GradoopId sourceId,
this.targetId = targetId;
}

/**
* {@inheritDoc}
*/
@Override
public GradoopId getSourceId() {
return sourceId;
}

/**
* {@inheritDoc}
* @param sourceId
*/
@Override
public void setSourceId(GradoopId sourceId) {
this.sourceId = sourceId;
}

/**
* {@inheritDoc}
*/
@Override
public GradoopId getTargetId() {
return targetId;
}

/**
* {@inheritDoc}
* @param targetId
*/
@Override
public void setTargetId(GradoopId targetId) {
this.targetId = targetId;
}

/**
* {@inheritDoc}
*/
@Override
public String toString() {
return String.format("(%s)-[%s]->(%s)",
Expand Down
Loading

0 comments on commit c169694

Please sign in to comment.