resolve conflicts

apache · Aug 9, 2024 · bedf9a9 · bedf9a9
1 parent 8475af8
commit bedf9a9
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 21 deletions.
diff --git a/polaris-core/src/main/java/io/polaris/core/catalog/PolarisCatalogHelpers.java b/polaris-core/src/main/java/io/polaris/core/catalog/PolarisCatalogHelpers.java
@@ -29,11 +29,6 @@
  * different Polaris components.
  */
 public class PolarisCatalogHelpers {
-<<<<<<< HEAD
-  private static final Logger LOGGER = LoggerFactory.getLogger(PolarisCatalogHelpers.class);
-
-=======
->>>>>>> be5c29af3332e2a77a3432661626cd3f443d5f4a
   /** Not intended for instantiation. */
   private PolarisCatalogHelpers() {}
 

diff --git a/polaris-core/src/main/java/io/polaris/core/entity/CatalogEntity.java b/polaris-core/src/main/java/io/polaris/core/entity/CatalogEntity.java
@@ -47,12 +47,6 @@
  * Catalog} model to the persistent entity model.
  */
 public class CatalogEntity extends PolarisEntity {
-<<<<<<< HEAD
-  private static final Logger LOGGER = LoggerFactory.getLogger(CatalogEntity.class);
-
-  public static final long ROOT_CATALOG_ID = 0;
-=======
->>>>>>> be5c29af3332e2a77a3432661626cd3f443d5f4a
   public static final String CATALOG_TYPE_PROPERTY = "catalogType";
 
   // Specifies the object-store base location used for all Table file locations under the

diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisEntityManager.java b/polaris-core/src/main/java/io/polaris/core/persistence/PolarisEntityManager.java
@@ -38,11 +38,6 @@
  * id and name resolution mechanics around PolarisEntities.
  */
 public class PolarisEntityManager {
-<<<<<<< HEAD
-  private static final Logger LOGGER = LoggerFactory.getLogger(PolarisEntityManager.class);
-
-=======
->>>>>>> be5c29af3332e2a77a3432661626cd3f443d5f4a
   private final PolarisMetaStoreManager metaStoreManager;
   private final Supplier<PolarisMetaStoreSession> sessionSupplier;
   private final EntityCache entityCache;

diff --git a/...is-service/src/main/java/io/polaris/service/context/SqlliteCallContextCatalogFactory.java b/...is-service/src/main/java/io/polaris/service/context/SqlliteCallContextCatalogFactory.java
@@ -84,11 +84,7 @@ public Catalog createCallContextCatalog(
       String catalogFile = Paths.get(realmDir, catalogName).toString();
 
       // Ensure parent directories of metastore-state base directory exists.
-<<<<<<< HEAD
-      LOGGER.info("Creating metastore state directory: " + realmDir);
-=======
-      LOG.info("Creating metastore state directory: {}", realmDir);
->>>>>>> be5c29af3332e2a77a3432661626cd3f443d5f4a
+      LOGGER.info("Creating metastore state directory: {}", realmDir);
       try {
         Path result = Files.createDirectories(FileSystems.getDefault().getPath(realmDir));
       } catch (IOException ioe) {