-
Notifications
You must be signed in to change notification settings - Fork 311
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of github.com:datastrato/graviton into issue_5139
- Loading branch information
Showing
94 changed files
with
1,779 additions
and
199 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
api/src/main/java/org/apache/gravitino/exceptions/CatalogInUseException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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.apache.gravitino.exceptions; | ||
|
|
||
| import com.google.errorprone.annotations.FormatMethod; | ||
| import com.google.errorprone.annotations.FormatString; | ||
|
|
||
| /** Exception thrown when a catalog is in use and cannot be deleted. */ | ||
| public class CatalogInUseException extends InUseException { | ||
| /** | ||
| * Constructs a new exception with the specified detail message. | ||
| * | ||
| * @param message the detail message. | ||
| * @param args the arguments to the message. | ||
| */ | ||
| @FormatMethod | ||
| public CatalogInUseException(@FormatString String message, Object... args) { | ||
| super(message, args); | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
api/src/main/java/org/apache/gravitino/exceptions/CatalogNotInUseException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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.apache.gravitino.exceptions; | ||
|
|
||
| import com.google.errorprone.annotations.FormatMethod; | ||
| import com.google.errorprone.annotations.FormatString; | ||
|
|
||
| /** An exception thrown when operating on a catalog that is not in use. */ | ||
| public class CatalogNotInUseException extends NotInUseException { | ||
| /** | ||
| * Constructs a new exception with the specified detail message. | ||
| * | ||
| * @param message the detail message. | ||
| * @param args the arguments to the message. | ||
| */ | ||
| @FormatMethod | ||
| public CatalogNotInUseException(@FormatString String message, Object... args) { | ||
| super(message, args); | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
api/src/main/java/org/apache/gravitino/exceptions/InUseException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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.apache.gravitino.exceptions; | ||
|
|
||
| import com.google.errorprone.annotations.FormatMethod; | ||
| import com.google.errorprone.annotations.FormatString; | ||
|
|
||
| /** Exception thrown when a resource is in use and cannot be deleted. */ | ||
| public class InUseException extends GravitinoRuntimeException { | ||
| /** | ||
| * Constructs a new exception with the specified detail message. | ||
| * | ||
| * @param message the detail message. | ||
| * @param args the arguments to the message. | ||
| */ | ||
| @FormatMethod | ||
| public InUseException(@FormatString String message, Object... args) { | ||
| super(message, args); | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
api/src/main/java/org/apache/gravitino/exceptions/NotInUseException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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.apache.gravitino.exceptions; | ||
|
|
||
| import com.google.errorprone.annotations.FormatMethod; | ||
| import com.google.errorprone.annotations.FormatString; | ||
|
|
||
| /** An exception thrown when operating on a resource that is not in use. */ | ||
| public class NotInUseException extends GravitinoRuntimeException { | ||
| /** | ||
| * Constructs a new exception with the specified detail message. | ||
| * | ||
| * @param message the detail message. | ||
| * @param args the arguments to the message. | ||
| */ | ||
| @FormatMethod | ||
| public NotInUseException(@FormatString String message, Object... args) { | ||
| super(message, args); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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. | ||
| */ | ||
| import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar | ||
|
|
||
| plugins { | ||
| `maven-publish` | ||
| id("java") | ||
| alias(libs.plugins.shadow) | ||
| } | ||
|
|
||
| dependencies { | ||
| compileOnly(project(":catalogs:catalog-hadoop")) | ||
| compileOnly(libs.hadoop3.common) | ||
| implementation(libs.hadoop3.oss) | ||
|
|
||
| // oss needs StringUtils from commons-lang or the following error will occur in 3.1.0 | ||
| // java.lang.NoClassDefFoundError: org/apache/commons/lang/StringUtils | ||
| // org.apache.hadoop.fs.aliyun.oss.AliyunOSSFileSystemStore.initialize(AliyunOSSFileSystemStore.java:111) | ||
| // org.apache.hadoop.fs.aliyun.oss.AliyunOSSFileSystem.initialize(AliyunOSSFileSystem.java:323) | ||
| // org.apache.hadoop.fs.FileSystem.createFileSystem(FileSystem.java:3611) | ||
| implementation(libs.commons.lang) | ||
| } | ||
|
|
||
| tasks.withType(ShadowJar::class.java) { | ||
| isZip64 = true | ||
| configurations = listOf(project.configurations.runtimeClasspath.get()) | ||
| archiveClassifier.set("") | ||
| mergeServiceFiles() | ||
|
|
||
| // Relocate dependencies to avoid conflicts | ||
| relocate("org.jdom", "org.apache.gravitino.shaded.org.jdom") | ||
| relocate("org.apache.commons.lang", "org.apache.gravitino.shaded.org.apache.commons.lang") | ||
| } | ||
|
|
||
| tasks.jar { | ||
| dependsOn(tasks.named("shadowJar")) | ||
| archiveClassifier.set("empty") | ||
| } | ||
|
|
||
| tasks.compileJava { | ||
| dependsOn(":catalogs:catalog-hadoop:runtimeJars") | ||
| } |
Oops, something went wrong.