More renaming & build fixes

apache · Jun 16, 2022 · 6374b80 · 6374b80
1 parent e6f0866
commit 6374b80
Show file tree

Hide file tree

Showing 17 changed files with 126 additions and 119 deletions.
diff --git a/core/src/main/java/org/apache/druid/data/input/InputSource.java b/core/src/main/java/org/apache/druid/data/input/InputSource.java
@@ -19,6 +19,7 @@
 
 package org.apache.druid.data.input;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -60,6 +61,7 @@ public interface InputSource
    * Returns true if this inputSource can be processed in parallel using ParallelIndexSupervisorTask. It must be
    * castable to SplittableInputSource and the various SplittableInputSource methods must work as documented.
    */
+  @JsonIgnore
   boolean isSplittable();
 
   /**

diff --git a/core/src/main/java/org/apache/druid/data/input/impl/InlineInputSource.java b/core/src/main/java/org/apache/druid/data/input/impl/InlineInputSource.java
@@ -20,6 +20,7 @@
 package org.apache.druid.data.input.impl;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 import org.apache.druid.data.input.AbstractInputSource;
@@ -51,6 +52,7 @@ public String getData()
   }
 
   @Override
+  @JsonIgnore
   public boolean isSplittable()
   {
     return false;

diff --git a/server/src/main/java/org/apache/druid/catalog/CachedMetadataCatalog.java b/server/src/main/java/org/apache/druid/catalog/CachedMetadataCatalog.java
@@ -20,7 +20,7 @@
 package org.apache.druid.catalog;
 
 import org.apache.druid.catalog.MetadataCatalog.CatalogListener;
-import org.apache.druid.catalog.SchemaRegistry.SchemaDefn;
+import org.apache.druid.catalog.SchemaRegistry.SchemaSpec;
 
 import javax.inject.Inject;
 
@@ -60,7 +60,7 @@ private static class TableEntry
   {
     private final TableMetadata table;
 
-    protected TableEntry(SchemaDefn schema, TableMetadata table)
+    protected TableEntry(SchemaSpec schema, TableMetadata table)
     {
       this.table = table;
     }
@@ -73,11 +73,11 @@ protected long version()
 
   private class SchemaEntry
   {
-    private final SchemaDefn schema;
+    private final SchemaSpec schema;
     private long version = NOT_FETCHED;
     private final ConcurrentHashMap<String, TableEntry> cache = new ConcurrentHashMap<>();
 
-    protected SchemaEntry(SchemaDefn schema)
+    protected SchemaEntry(SchemaSpec schema)
     {
       this.schema = schema;
     }
@@ -205,7 +205,7 @@ private SchemaEntry entryFor(String schemaName)
     return schemaCache.computeIfAbsent(
         schemaName,
         k -> {
-          SchemaDefn schema = schemaRegistry.schema(k);
+          SchemaSpec schema = schemaRegistry.schema(k);
           return schema == null ? null : new SchemaEntry(schema);
         });
   }

diff --git a/server/src/main/java/org/apache/druid/catalog/CatalogAuthorizer.java b/server/src/main/java/org/apache/druid/catalog/CatalogAuthorizer.java
@@ -19,7 +19,7 @@
 
 package org.apache.druid.catalog;
 
-import org.apache.druid.catalog.SchemaRegistry.SchemaDefn;
+import org.apache.druid.catalog.SchemaRegistry.SchemaSpec;
 import org.apache.druid.server.security.Access;
 import org.apache.druid.server.security.Action;
 import org.apache.druid.server.security.AuthorizationUtils;
@@ -50,7 +50,7 @@ public AuthorizerMapper mapper()
     return authorizerMapper;
   }
 
-  public void authorizeTable(SchemaDefn schema, String name, Action action, HttpServletRequest request)
+  public void authorizeTable(SchemaSpec schema, String name, Action action, HttpServletRequest request)
   {
     if (action == Action.WRITE && !schema.writable()) {
       throw new ForbiddenException(
@@ -82,7 +82,7 @@ public Access authorizeAccess(String resource, String key, Action action, HttpSe
     );
   }
 
-  public ResourceAction resourceAction(SchemaDefn schema, String name, Action action)
+  public ResourceAction resourceAction(SchemaSpec schema, String name, Action action)
   {
     return new ResourceAction(new Resource(name, schema.securityResource()), action);
   }

diff --git a/server/src/main/java/org/apache/druid/catalog/CatalogStorage.java b/server/src/main/java/org/apache/druid/catalog/CatalogStorage.java
@@ -22,7 +22,7 @@
 import org.apache.druid.catalog.MetadataCatalog.CatalogListener;
 import org.apache.druid.catalog.MetadataCatalog.CatalogSource;
 import org.apache.druid.catalog.MetadataCatalog.CatalogUpdateProvider;
-import org.apache.druid.catalog.SchemaRegistry.SchemaDefn;
+import org.apache.druid.catalog.SchemaRegistry.SchemaSpec;
 import org.apache.druid.metadata.catalog.CatalogManager;
 import org.apache.druid.server.security.AuthorizerMapper;
 
@@ -94,7 +94,7 @@ public SchemaRegistry schemaRegistry()
     return schemaRegistry;
   }
 
-  public SchemaDefn resolveSchema(String dbSchema)
+  public SchemaSpec resolveSchema(String dbSchema)
   {
     return schemaRegistry.schema(dbSchema);
   }

diff --git a/server/src/main/java/org/apache/druid/catalog/SchemaRegistry.java b/server/src/main/java/org/apache/druid/catalog/SchemaRegistry.java
@@ -31,15 +31,15 @@
  */
 public interface SchemaRegistry
 {
-  interface SchemaDefn
+  interface SchemaSpec
   {
     String name();
     String securityResource();
     boolean writable();
-    boolean accepts(TableSpec defn);
+    boolean accepts(TableSpec spec);
     TableType tableType();
   }
 
-  SchemaDefn schema(String name);
+  SchemaSpec schema(String name);
   Set<String> names();
 }
diff --git a/server/src/main/java/org/apache/druid/catalog/SchemaRegistryImpl.java b/server/src/main/java/org/apache/druid/catalog/SchemaRegistryImpl.java
@@ -38,7 +38,7 @@ public class SchemaRegistryImpl implements SchemaRegistry
   // TODO: Change this when ExternalOperatorConvertion changes
   private String EXTERNAL_RESOURCE = "EXTERNAL";
 
-  public static class SchemaDefnImpl implements SchemaDefn
+  public static class SchemaDefnImpl implements SchemaSpec
   {
     private final String name;
     private final String resource;
@@ -76,15 +76,15 @@ public boolean writable()
     }
 
     @Override
-    public boolean accepts(TableSpec defn)
+    public boolean accepts(TableSpec spec)
     {
       if (acceptedClass == null) {
         return false;
       }
-      if (defn == null) {
+      if (spec == null) {
         return false;
       }
-      return acceptedClass.isAssignableFrom(defn.getClass());
+      return acceptedClass.isAssignableFrom(spec.getClass());
     }
 
     @Override
@@ -94,7 +94,7 @@ public TableType tableType()
     }
   }
 
-  private final Map<String, SchemaDefn> builtIns;
+  private final Map<String, SchemaSpec> builtIns;
 
   public SchemaRegistryImpl()
   {
@@ -131,13 +131,13 @@ public SchemaRegistryImpl()
         null)); // TODO
   }
 
-  private void register(SchemaDefn schemaDefn)
+  private void register(SchemaSpec schemaDefn)
   {
     builtIns.put(schemaDefn.name(), schemaDefn);
   }
 
   @Override
-  public SchemaDefn schema(String name)
+  public SchemaSpec schema(String name)
   {
     return builtIns.get(name);
   }

diff --git a/server/src/main/java/org/apache/druid/catalog/TableMetadata.java b/server/src/main/java/org/apache/druid/catalog/TableMetadata.java
@@ -193,7 +193,7 @@ public long updateTime()
   }
 
   @JsonProperty("defn")
-  public TableSpec defn()
+  public TableSpec spec()
   {
     return defn;
   }

diff --git a/server/src/main/java/org/apache/druid/metadata/catalog/CatalogManager.java b/server/src/main/java/org/apache/druid/metadata/catalog/CatalogManager.java
@@ -134,7 +134,7 @@ interface Listener
    * Update a table definition, but only if the database entry is at
    * the given {@code oldVersion}.
    */
-  long updateDefn(TableId id, TableSpec defn, long oldVersion) throws OutOfDateException;
+  long updateSpec(TableId id, TableSpec defn, long oldVersion) throws OutOfDateException;
 
   /**
    * Update a table definition, overwriting any current content.

diff --git a/server/src/main/java/org/apache/druid/metadata/catalog/SQLCatalogManager.java b/server/src/main/java/org/apache/druid/metadata/catalog/SQLCatalogManager.java
@@ -161,7 +161,7 @@ public Long withHandle(Handle handle) throws DuplicateKeyException
                   .bind("creationTime", updateTime)
                   .bind("updateTime", updateTime)
                   .bind("state", TableState.ACTIVE.code())
-                  .bind("payload", table.defn().toBytes(jsonMapper));
+                  .bind("payload", table.spec().toBytes(jsonMapper));
               try {
                 stmt.execute();
               }
@@ -225,7 +225,7 @@ public TableMetadata withHandle(Handle handle)
   }
 
   @Override
-  public long updateDefn(TableId id, TableSpec defn, long oldVersion) throws OutOfDateException
+  public long updateSpec(TableId id, TableSpec defn, long oldVersion) throws OutOfDateException
   {
     try {
       return dbi.withHandle(

diff --git a/server/src/main/java/org/apache/druid/server/http/CatalogListenerResource.java b/server/src/main/java/org/apache/druid/server/http/CatalogListenerResource.java
@@ -92,7 +92,7 @@ public Response syncTable(
     catch (IOException e) {
       return Response.serverError().entity(e.getMessage()).build();
     }
-    TableSpec defn = tableSpec.defn();
+    TableSpec defn = tableSpec.spec();
     if (defn instanceof TableSpec.Tombstone) {
       listener.deleted(tableSpec.id());
     } else {