Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change Scottys GroupId #55

Merged
merged 5 commits into from
Mar 19, 2023
Merged

Change Scottys GroupId #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89ba94e
change groupId to registered groupId for publishing to maven central …
julianev Feb 14, 2023
b844767
change artifact Id and add requirements to pom
julianev Feb 28, 2023
198700f
sign pom file with gpg
julianev Feb 28, 2023
c4e557b
add gpg plugin and nexus staging plugin
julianev Feb 28, 2023
3a04a17
remove duplicate dependency
julianev Mar 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Then you can use the library in your maven project.

```xml
<dependency>
<groupId>de.tub.dima.scotty</groupId>
<groupId>stream.scotty</groupId>
<artifactId>flink-connector</artifactId>
<version>0.4</version>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions beam-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
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">
<parent>
<artifactId>parent</artifactId>
<groupId>de.tub.dima.scotty</groupId>
<artifactId>scotty</artifactId>
<groupId>stream.scotty</groupId>
<version>0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -36,17 +36,17 @@
<version>1.2</version>
</dependency>
<dependency>
<groupId>de.tub.dima.scotty</groupId>
<groupId>stream.scotty</groupId>
<artifactId>core</artifactId>
<version>${scotty.version}</version>
</dependency>
<dependency>
<groupId>de.tub.dima.scotty</groupId>
<groupId>stream.scotty</groupId>
<artifactId>slicing</artifactId>
<version>${scotty.version}</version>
</dependency>
<dependency>
<groupId>de.tub.dima.scotty</groupId>
<groupId>stream.scotty</groupId>
<artifactId>state</artifactId>
<version>${scotty.version}</version>
</dependency>
Expand Down
16 changes: 8 additions & 8 deletions ...mconnector/KeyedScottyWindowOperator.java → ...mconnector/KeyedScottyWindowOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package de.tub.dima.scotty.beamconnector;
package stream.scotty.beamconnector;

import de.tub.dima.scotty.core.AggregateWindow;
import de.tub.dima.scotty.core.windowFunction.AggregateFunction;
import de.tub.dima.scotty.core.windowType.SlidingWindow;
import de.tub.dima.scotty.core.windowType.TumblingWindow;
import de.tub.dima.scotty.core.windowType.Window;
import de.tub.dima.scotty.slicing.SlicingWindowOperator;
import de.tub.dima.scotty.state.memory.MemoryStateFactory;
import stream.scotty.core.AggregateWindow;
import stream.scotty.core.windowFunction.AggregateFunction;
import stream.scotty.core.windowType.SlidingWindow;
import stream.scotty.core.windowType.TumblingWindow;
import stream.scotty.core.windowType.Window;
import stream.scotty.slicing.SlicingWindowOperator;
import stream.scotty.state.memory.MemoryStateFactory;
import org.apache.beam.sdk.transforms.DoFn;
import org.apache.beam.sdk.values.KV;
import org.joda.time.Instant;
Expand Down
8 changes: 4 additions & 4 deletions benchmark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
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">
<parent>
<artifactId>parent</artifactId>
<groupId>de.tub.dima.scotty</groupId>
<artifactId>scotty</artifactId>
<groupId>stream.scotty</groupId>
<version>0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -13,12 +13,12 @@
<packaging>pom</packaging>
<dependencies>
<dependency>
<groupId>de.tub.dima.scotty</groupId>
<groupId>stream.scotty</groupId>
<artifactId>slicing</artifactId>
<version>0.4</version>
</dependency>
<dependency>
<groupId>de.tub.dima.scotty</groupId>
<groupId>stream.scotty</groupId>
<artifactId>flink-connector</artifactId>
<version>0.4</version>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...ma/scotty/flinkBenchmark/AnalyzeTool.java → ...am/scotty/flinkBenchmark/AnalyzeTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.tub.dima.scotty.flinkBenchmark;
package stream.scotty.flinkBenchmark;

import org.apache.commons.math3.stat.descriptive.SummaryStatistics;

Expand Down
2 changes: 1 addition & 1 deletion ...cotty/flinkBenchmark/BenchmarkConfig.java → ...cotty/flinkBenchmark/BenchmarkConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.tub.dima.scotty.flinkBenchmark;
package stream.scotty.flinkBenchmark;

import java.util.List;

Expand Down
12 changes: 6 additions & 6 deletions ...a/scotty/flinkBenchmark/BenchmarkJob.java → ...m/scotty/flinkBenchmark/BenchmarkJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package de.tub.dima.scotty.flinkBenchmark;
package stream.scotty.flinkBenchmark;

import de.tub.dima.scotty.core.windowType.*;
import de.tub.dima.scotty.flinkBenchmark.aggregations.SumAggregation;
import de.tub.dima.scotty.flinkconnector.*;
import stream.scotty.core.windowType.*;
import stream.scotty.flinkBenchmark.aggregations.SumAggregation;
import stream.scotty.flinkconnector.*;
import org.apache.flink.api.java.tuple.*;
import org.apache.flink.api.java.utils.ParameterTool;
import org.apache.flink.streaming.api.TimeCharacteristic;
Expand Down Expand Up @@ -47,9 +47,9 @@ public BenchmarkJob(List<Window> assigner, StreamExecutionEnvironment env, final


DataStream<Tuple4<String, Integer, Long, Long>> messageStream = env
.addSource(new de.tub.dima.scotty.flinkBenchmark.LoadGeneratorSource(runtime, throughput, gaps));
.addSource(new stream.scotty.flinkBenchmark.LoadGeneratorSource(runtime, throughput, gaps));

messageStream.flatMap(new de.tub.dima.scotty.flinkBenchmark.ThroughputLogger<>(200, throughput));
messageStream.flatMap(new stream.scotty.flinkBenchmark.ThroughputLogger<>(200, throughput));



Expand Down
8 changes: 4 additions & 4 deletions ...cotty/flinkBenchmark/BenchmarkRunner.java → ...cotty/flinkBenchmark/BenchmarkRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package de.tub.dima.scotty.flinkBenchmark;
package stream.scotty.flinkBenchmark;

import com.google.gson.*;
import de.tub.dima.scotty.core.*;
import de.tub.dima.scotty.core.windowType.*;
import de.tub.dima.scotty.core.*;
import stream.scotty.core.*;
import stream.scotty.core.windowType.*;
import stream.scotty.core.*;
import org.apache.flink.api.java.tuple.*;
import org.apache.flink.configuration.*;
import org.apache.flink.streaming.api.environment.*;
Expand Down
6 changes: 3 additions & 3 deletions ...tty/flinkBenchmark/FlinkBenchmarkJob.java → ...tty/flinkBenchmark/FlinkBenchmarkJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package de.tub.dima.scotty.flinkBenchmark;
package stream.scotty.flinkBenchmark;

import de.tub.dima.scotty.core.windowType.*;
import de.tub.dima.scotty.core.windowType.Window;
import stream.scotty.core.windowType.*;
import stream.scotty.core.windowType.Window;
import org.apache.flink.api.java.tuple.*;
import org.apache.flink.api.java.utils.*;
import org.apache.flink.streaming.api.*;
Expand Down
2 changes: 1 addition & 1 deletion ...y/flinkBenchmark/LoadGeneratorSource.java → ...y/flinkBenchmark/LoadGeneratorSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.tub.dima.scotty.flinkBenchmark;
package stream.scotty.flinkBenchmark;

import org.apache.flink.api.java.tuple.*;
import org.apache.flink.streaming.api.functions.source.*;
Expand Down
2 changes: 1 addition & 1 deletion ...otty/flinkBenchmark/ThroughputLogger.java → ...otty/flinkBenchmark/ThroughputLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.tub.dima.scotty.flinkBenchmark;
package stream.scotty.flinkBenchmark;

import org.apache.flink.api.common.functions.FlatMapFunction;
import org.apache.flink.util.Collector;
Expand Down
2 changes: 1 addition & 1 deletion .../flinkBenchmark/ThroughputStatistics.java → .../flinkBenchmark/ThroughputStatistics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.tub.dima.scotty.flinkBenchmark;
package stream.scotty.flinkBenchmark;

public class ThroughputStatistics {

Expand Down
4 changes: 2 additions & 2 deletions ...enchmark/aggregations/SumAggregation.java → ...enchmark/aggregations/SumAggregation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.tub.dima.scotty.flinkBenchmark.aggregations;
package stream.scotty.flinkBenchmark.aggregations;

import de.tub.dima.scotty.core.windowFunction.*;
import stream.scotty.core.windowFunction.*;
import org.apache.flink.api.java.tuple.*;

import java.io.*;
Expand Down
6 changes: 3 additions & 3 deletions ...icrobenchmark/AggregationStateInline.java → ...icrobenchmark/AggregationStateInline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package de.tub.dima.scotty.microbenchmark;
package stream.scotty.microbenchmark;

import de.tub.dima.scotty.state.StateFactory;
import de.tub.dima.scotty.state.ValueState;
import stream.scotty.state.StateFactory;
import stream.scotty.state.ValueState;

import java.util.ArrayList;

Expand Down
8 changes: 4 additions & 4 deletions ...obenchmark/AggregationStoreBenchmark.java → ...obenchmark/AggregationStoreBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package de.tub.dima.scotty.microbenchmark;
package stream.scotty.microbenchmark;

import de.tub.dima.scotty.slicing.state.AggregateState;
import de.tub.dima.scotty.state.memory.MemoryStateFactory;
import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction;
import stream.scotty.slicing.state.AggregateState;
import stream.scotty.state.memory.MemoryStateFactory;
import stream.scotty.core.windowFunction.ReduceAggregateFunction;
import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.runner.Runner;
import org.openjdk.jmh.runner.RunnerException;
Expand Down
12 changes: 6 additions & 6 deletions ...hmark/SlicingWindowOperatorBenchmark.java → ...hmark/SlicingWindowOperatorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package de.tub.dima.scotty.microbenchmark;
package stream.scotty.microbenchmark;

import de.tub.dima.scotty.slicing.SlicingWindowOperator;
import de.tub.dima.scotty.state.memory.MemoryStateFactory;
import de.tub.dima.scotty.core.windowType.TumblingWindow;
import de.tub.dima.scotty.core.windowType.WindowMeasure;
import de.tub.dima.scotty.core.windowFunction.ReduceAggregateFunction;
import stream.scotty.slicing.SlicingWindowOperator;
import stream.scotty.state.memory.MemoryStateFactory;
import stream.scotty.core.windowType.TumblingWindow;
import stream.scotty.core.windowType.WindowMeasure;
import stream.scotty.core.windowFunction.ReduceAggregateFunction;
import org.openjdk.jmh.annotations.*;
import org.openjdk.jmh.runner.Runner;
import org.openjdk.jmh.runner.RunnerException;
Expand Down
9 changes: 2 additions & 7 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
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">
<parent>
<artifactId>parent</artifactId>
<groupId>de.tub.dima.scotty</groupId>
<artifactId>scotty</artifactId>
<groupId>stream.scotty</groupId>
<version>0.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -18,11 +18,6 @@
<version>1.9.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>1.9.2</version>
</dependency>
</dependencies>

</project>
9 changes: 0 additions & 9 deletions core/src/main/java/de/tub/dima/scotty/core/windowType/ForwardContextAware.java
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions core/src/main/java/de/tub/dima/scotty/core/windowType/ForwardContextFree.java
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions core/src/main/java/de/tub/dima/scotty/core/windowType/windowContext/WindowModifications.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...tub/dima/scotty/core/AggregateWindow.java → ...a/stream/scotty/core/AggregateWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.tub.dima.scotty.core;
package stream.scotty.core;

import de.tub.dima.scotty.core.windowType.*;
import stream.scotty.core.windowType.*;

import java.io.*;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion .../de/tub/dima/scotty/core/TimeMeasure.java → .../java/stream/scotty/core/TimeMeasure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package de.tub.dima.scotty.core;
package stream.scotty.core;

import java.util.concurrent.TimeUnit;
/**
Expand Down
4 changes: 2 additions & 2 deletions ...tub/dima/scotty/core/WindowCollector.java → ...a/stream/scotty/core/WindowCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.tub.dima.scotty.core;
package stream.scotty.core;

import de.tub.dima.scotty.core.windowType.*;
import stream.scotty.core.windowType.*;

public interface WindowCollector {

Expand Down
6 changes: 3 additions & 3 deletions .../tub/dima/scotty/core/WindowOperator.java → ...va/stream/scotty/core/WindowOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package de.tub.dima.scotty.core;
package stream.scotty.core;

import de.tub.dima.scotty.core.windowType.*;
import de.tub.dima.scotty.core.windowFunction.AggregateFunction;
import stream.scotty.core.windowType.*;
import stream.scotty.core.windowFunction.AggregateFunction;

import java.io.*;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...ore/windowFunction/AggregateFunction.java → ...ore/windowFunction/AggregateFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.tub.dima.scotty.core.windowFunction;
package stream.scotty.core.windowFunction;


import java.io.*;
Expand Down
2 changes: 1 addition & 1 deletion ...nction/CloneablePartialStateFunction.java → ...nction/CloneablePartialStateFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.tub.dima.scotty.core.windowFunction;
package stream.scotty.core.windowFunction;

public interface CloneablePartialStateFunction<PartialAggregateType> {

Expand Down
2 changes: 1 addition & 1 deletion ...unction/CommutativeAggregateFunction.java → ...unction/CommutativeAggregateFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.tub.dima.scotty.core.windowFunction;
package stream.scotty.core.windowFunction;

public interface CommutativeAggregateFunction<InputType, PartialAggregateType, FinalAggregateType> extends AggregateFunction<InputType, PartialAggregateType, FinalAggregateType> {
}
2 changes: 1 addition & 1 deletion ...Function/InvertibleAggregateFunction.java → ...Function/InvertibleAggregateFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.tub.dima.scotty.core.windowFunction;
package stream.scotty.core.windowFunction;

public interface InvertibleAggregateFunction<InputType, PartialAggregateType, FinalAggregateType> extends AggregateFunction<InputType, PartialAggregateType, FinalAggregateType> {
/**
Expand Down
2 changes: 1 addition & 1 deletion ...on/InvertibleReduceAggregateFunction.java → ...on/InvertibleReduceAggregateFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.tub.dima.scotty.core.windowFunction;
package stream.scotty.core.windowFunction;

public interface InvertibleReduceAggregateFunction<Input> extends ReduceAggregateFunction<Input>, InvertibleAggregateFunction<Input, Input, Input> {

Expand Down
2 changes: 1 addition & 1 deletion ...ndowFunction/ReduceAggregateFunction.java → ...ndowFunction/ReduceAggregateFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.tub.dima.scotty.core.windowFunction;
package stream.scotty.core.windowFunction;


@FunctionalInterface
Expand Down
6 changes: 3 additions & 3 deletions ...ty/core/windowType/ContextFreeWindow.java → ...ty/core/windowType/ContextFreeWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package de.tub.dima.scotty.core.windowType;
package stream.scotty.core.windowType;

import de.tub.dima.scotty.core.*;
import de.tub.dima.scotty.core.*;
import stream.scotty.core.*;
import stream.scotty.core.*;

public interface ContextFreeWindow extends Window {

Expand Down
4 changes: 2 additions & 2 deletions ...otty/core/windowType/FixedBandWindow.java → ...otty/core/windowType/FixedBandWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package de.tub.dima.scotty.core.windowType;
package stream.scotty.core.windowType;

import de.tub.dima.scotty.core.WindowCollector;
import stream.scotty.core.WindowCollector;

public class FixedBandWindow implements ContextFreeWindow {
/**
Expand Down
9 changes: 9 additions & 0 deletions core/src/main/java/stream/scotty/core/windowType/ForwardContextAware.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package stream.scotty.core.windowType;

import stream.scotty.core.windowType.windowContext.*;
import stream.scotty.core.windowType.windowContext.*;

public interface ForwardContextAware extends Window {

WindowContext createContext();
}
8 changes: 8 additions & 0 deletions core/src/main/java/stream/scotty/core/windowType/ForwardContextFree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package stream.scotty.core.windowType;

import stream.scotty.core.windowType.windowContext.*;

public interface ForwardContextFree extends Window {

WindowContext createContext();
}
Loading