Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/stage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ fluss-flink/fluss-flink-common,\
fluss-flink/fluss-flink-1.20,\
fluss-flink/fluss-flink-1.19,\
fluss-flink/fluss-flink-1.18,\
fluss-lakehouse,\
fluss-lakehouse/fluss-lakehouse-cli,\
fluss-lakehouse/fluss-lakehouse-paimon,\
fluss-lake,\
fluss-lake/fluss-lake-paimon
"
Expand Down
4 changes: 0 additions & 4 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -361,10 +361,6 @@ Apache Kafka
Apache Paimon
./fluss-common/src/main/java/com/alibaba/fluss/row/encode/paimon/PaimonBinaryRowWriter.java
./fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/lakehouse/paimon/reader/PaimonSnapshotScanner.java
./fluss-lakehouse/fluss-lakehouse-paimon/src/main/java/com/alibaba/fluss/lakehouse/paimon/sink/PaimonMultiTableSink.java
./fluss-lakehouse/fluss-lakehouse-paimon/src/main/java/com/alibaba/fluss/lakehouse/paimon/sink/committable/PaimonMultiTableCommittableSerializer.java
./fluss-lakehouse/fluss-lakehouse-paimon/src/main/java/com/alibaba/fluss/lakehouse/paimon/sink/committer/PaimonStoreMultiCommitter.java
./fluss-lakehouse/fluss-lakehouse-paimon/src/main/java/com/alibaba/fluss/lakehouse/paimon/sink/operator/PaimonMultiWriterOperator.java

Apache Spark
./fluss-rpc/src/main/java/com/alibaba/fluss/rpc/netty/NettyLogger.java
Expand Down
27 changes: 0 additions & 27 deletions fluss-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,6 @@
<scope>provided</scope>
</dependency>


<dependency>
<groupId>com.alibaba.fluss</groupId>
<artifactId>fluss-lakehouse-paimon</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.alibaba.fluss</groupId>
<artifactId>fluss-lakehouse-cli</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.alibaba.fluss</groupId>
<artifactId>fluss-lake-paimon</artifactId>
Expand Down Expand Up @@ -286,18 +271,6 @@
</descriptors>
</configuration>
</execution>
<execution>
<id>opt</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assemblies/opt.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>tgz</id>
<phase>package</phase>
Expand Down
45 changes: 0 additions & 45 deletions fluss-dist/src/main/assemblies/opt.xml

This file was deleted.

66 changes: 0 additions & 66 deletions fluss-dist/src/main/resources/bin/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,32 +46,6 @@ constructFlussClassPath() {
echo "$FLUSS_CLASSPATH""$FLUSS_SERVER"
}

constructPluginJars() {
plugin="$1"
local PLUGIN_JARS=()
while read -d '' -r jarfile ; do
if [[ "$jarfile" =~ .*/$plugin/[^/]*.jar$ ]]; then
PLUGIN_JARS+=("file://$jarfile")
fi
done < <(find "$FLUSS_PLUGINS_DIR" ! -type d -name '*.jar' -print0 | sort -z)

if [ ${#PLUGIN_JARS[@]} -gt 0 ]; then
IFS=';'
echo "${PLUGIN_JARS[*]}"
fi
}

constructLogClassClassPath() {
local LOG_CLASSPATH
while read -d '' -r jarfile ; do
if [[ "$jarfile" =~ .*/log4j[^/]*.jar$ ]]; then
LOG_CLASSPATH="$LOG_CLASSPATH":"$jarfile"
fi
done < <(find "$FLUSS_LIB_DIR" ! -type d -name '*.jar' -print0 | sort -z)

echo "$LOG_CLASSPATH"
}

# These are used to mangle paths that are passed to java when using
# cygwin. Cygwin paths are like linux paths, i.e. /path/to/somewhere
# but the windows java version expects them in Windows Format, i.e. C:\bla\blub.
Expand Down Expand Up @@ -126,46 +100,6 @@ is_jdk_version_ge_17() {
fi
}

findLakehouseCliJar() {
local DATA_LAKEHOUSE_CLI
DATA_LAKEHOUSE_CLI="$(find "$FLUSS_OPT_DIR" -name 'fluss-lakehouse-cli-*.jar')"
local DATA_LAKEHOUSE_CLI_COUNT
DATA_LAKEHOUSE_CLI_COUNT="$(echo "$DATA_LAKEHOUSE_CLI" | wc -l)"

# lakehouse-cli-*.jar cannot be resolved write error messages to stderr since stdout is stored
# as the classpath and exit function with empty classpath to force process failure
if [[ "$DATA_LAKEHOUSE_CLI" == "" ]]; then
(>&2 echo "[ERROR] Lakehouse cli jar not found in $FLUSS_OPT_DIR.")
exit 1
elif [[ "$DATA_LAKEHOUSE_CLI_COUNT" -gt 1 ]]; then
(>&2 echo "[ERROR] Multiple lakehouse-cli-*.jar found in $FLUSS_OPT_DIR. Please resolve.")
exit 1
fi

echo "$DATA_LAKEHOUSE_CLI"
}

findLakehousePaimonJar() {
local LAKEHOUSE_PAIMON
LAKEHOUSE_PAIMON="$(find "$FLUSS_OPT_DIR" -name 'fluss-lakehouse-paimon-*.jar')"
local LAKEHOUSE_PAIMON_COUNT
LAKEHOUSE_PAIMON_COUNT="$(echo "$LAKEHOUSE_PAIMON" | wc -l)"

# lakehouse-paimon-*.jar cannot be resolved write error messages to stderr since stdout is stored
# as the classpath and exit function with empty classpath to force process failure
if [[ "$LAKEHOUSE_PAIMON" == "" ]]; then
(>&2 echo "[ERROR] lakehouse-paimon-*.jar not found in $FLUSS_OPT_DIR.")
exit 1
elif [[ "$LAKEHOUSE_PAIMON_COUNT" -gt 1 ]]; then
(>&2 echo "[ERROR] Multiple lakehouse-paimon-*.jar found in $FLUSS_OPT_DIR. Please resolve.")
exit 1
fi

echo "$LAKEHOUSE_PAIMON"
}




# WARNING !!! , these values are only used if there is nothing else is specified in
# conf/server.yaml
Expand Down
71 changes: 0 additions & 71 deletions fluss-dist/src/main/resources/bin/lakehouse.sh

This file was deleted.

4 changes: 0 additions & 4 deletions fluss-dist/src/main/resources/server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
# limitations under the License.
################################################################################

# These parameters are required to run ./bin/lakehouse.sh for Java 17 support.
# They can be safely removed when using Java 8/11.
env.java.opts.all: --add-opens=java.base/java.util=ALL-UNNAMED

#==============================================================================
# Zookeeper
#==============================================================================
Expand Down
117 changes: 0 additions & 117 deletions fluss-lakehouse/fluss-lakehouse-cli/pom.xml

This file was deleted.

Loading