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.

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

Moved TableCommitMetaStoreWorker to nessie-services #10

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions servers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@
<module>services</module>
<module>quarkus-server</module>
<module>lambda</module>
<module>server</module>
</modules>
</project>
24 changes: 5 additions & 19 deletions servers/quarkus-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
<artifactId>nessie-services</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.projectnessie</groupId>
<artifactId>nessie-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.projectnessie</groupId>
<artifactId>nessie-versioned-jgit</artifactId>
Expand Down Expand Up @@ -199,25 +204,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
<protoSourceRoot>${basedir}/src/main/proto</protoSourceRoot>
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources/protobuf</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

import com.dremio.nessie.model.CommitMeta;
import com.dremio.nessie.model.Contents;
import com.dremio.nessie.server.TableCommitMetaStoreWorker;
import com.dremio.nessie.server.config.ApplicationConfig;
import com.dremio.nessie.server.config.ApplicationConfig.VersionStoreDynamoConfig;
import com.dremio.nessie.server.config.converters.VersionStoreType;
Expand Down
80 changes: 80 additions & 0 deletions servers/server/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (C) 2020 Dremio

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.

-->
<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.projectnessie</groupId>
<artifactId>nessie-server-parent</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>

<artifactId>nessie-server</artifactId>

<name>Nessie - Server</name>

<dependencies>
<dependency>
<groupId>org.projectnessie</groupId>
<artifactId>nessie-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.projectnessie</groupId>
<artifactId>nessie-versioned-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
<protoSourceRoot>${basedir}/src/main/proto</protoSourceRoot>
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
</configuration>
<executions>
<execution>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources/protobuf</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.dremio.nessie.server.providers;
package com.dremio.nessie.server;

import java.io.IOException;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import javax.inject.Singleton;

import com.dremio.nessie.jgit.ObjectTypes.PContents;
import com.dremio.nessie.jgit.ObjectTypes.PDeltaLakeTable;
import com.dremio.nessie.jgit.ObjectTypes.PHiveDatabase;
import com.dremio.nessie.jgit.ObjectTypes.PHiveTable;
import com.dremio.nessie.jgit.ObjectTypes.PIcebergTable;
import com.dremio.nessie.jgit.ObjectTypes.PSqlView;
import com.dremio.nessie.model.CommitMeta;
import com.dremio.nessie.model.Contents;
import com.dremio.nessie.model.DeltaLakeTable;
Expand All @@ -42,6 +36,12 @@
import com.dremio.nessie.model.ImmutableSqlView;
import com.dremio.nessie.model.SqlView;
import com.dremio.nessie.model.SqlView.Dialect;
import com.dremio.nessie.server.model.ObjectTypes.PContents;
import com.dremio.nessie.server.model.ObjectTypes.PDeltaLakeTable;
import com.dremio.nessie.server.model.ObjectTypes.PHiveDatabase;
import com.dremio.nessie.server.model.ObjectTypes.PHiveTable;
import com.dremio.nessie.server.model.ObjectTypes.PIcebergTable;
import com.dremio.nessie.server.model.ObjectTypes.PSqlView;
import com.dremio.nessie.versioned.AssetKey;
import com.dremio.nessie.versioned.AssetKey.NoOpAssetKey;
import com.dremio.nessie.versioned.Serializer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/
syntax = "proto3";
package com.dremio.plugin.partsyn;
package com.dremio.nessie.model;

option java_package = "com.dremio.nessie.jgit";
option java_package = "com.dremio.nessie.server.model";
option java_outer_classname = "ObjectTypes";
option java_generate_equals_and_hash = true;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
public class TreeResource extends BaseResource implements TreeApi {

@Inject
protected TreeResource(ServerConfig config, Principal principal,
public TreeResource(ServerConfig config, Principal principal,
VersionStore<Contents, CommitMeta> store) {
super(config, principal, store);
}
Expand Down