Skip to content
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import io.dropwizard.auth.AuthDynamicFeature
import io.dropwizard.configuration.{EnvironmentVariableSubstitutor, SubstitutingSourceProvider}
import io.dropwizard.core.Application
import io.dropwizard.core.setup.{Bootstrap, Environment}
import org.apache.texera.amber.config.StorageConfig
import org.apache.texera.common.config.StorageConfig
import org.apache.texera.auth.{
JwtAuthFilter,
RequestLoggingFilter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import jakarta.ws.rs.{Consumes, DELETE, GET, POST, PUT, Path, Produces}
import org.apache.texera.auth.JwtParser.parseToken
import org.apache.texera.auth.SessionUser
import org.apache.texera.auth.util.{ComputingUnitAccess, HeaderField}
import org.apache.texera.config.{GuiConfig, KubernetesConfig, LLMConfig}
import org.apache.texera.common.config.{GuiConfig, KubernetesConfig, LLMConfig}
import org.apache.texera.dao.jooq.generated.enums.PrivilegeEnum

import java.net.URLDecoder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import org.apache.pekko.cluster.ClusterEvent._
import com.google.protobuf.timestamp.Timestamp
import com.twitter.util.{Await, Future}
import org.apache.texera.amber.clustering.ClusterListener.numWorkerNodesInCluster
import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
import org.apache.texera.amber.core.workflowruntimestate.FatalErrorType.EXECUTION_FAILURE
import org.apache.texera.amber.core.workflowruntimestate.WorkflowFatalError
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.apache.texera.amber.engine.architecture.common

import org.apache.pekko.actor.Cancellable
import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage
import org.apache.texera.amber.engine.architecture.messaginglayer.{CongestionControl, FlowControl}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package org.apache.texera.amber.engine.architecture.controller
import org.apache.pekko.actor.SupervisorStrategy.Stop
import org.apache.pekko.actor.{AllForOneStrategy, Props, SupervisorStrategy}
import org.apache.texera.web.model.websocket.response.RegionUpdateEvent
import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.virtualidentity.ChannelIdentity
import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext}
import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkAck
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.apache.texera.amber.engine.architecture.controller.promisehandlers

import com.twitter.util.Future
import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.virtualidentity.PhysicalOpIdentity
import org.apache.texera.amber.engine.architecture.controller.{
ControllerAsyncRPCHandlerInitializer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.apache.texera.amber.engine.architecture.logreplay

import com.google.common.collect.Queues
import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.engine.architecture.worker.WorkflowWorker.MainThreadDelegateMessage
import org.apache.texera.amber.engine.common.ambermessage.WorkflowFIFOMessage
import org.apache.texera.amber.engine.common.storage.SequentialRecordStorage.SequentialRecordWriter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.texera.amber.engine.architecture.messaginglayer

import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage
import org.apache.texera.amber.engine.common.ambermessage.WorkflowMessage.getInMemSize

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.apache.texera.amber.engine.architecture.messaginglayer

import org.apache.pekko.actor.Cancellable
import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.engine.architecture.common.PekkoActorService
import org.apache.texera.amber.engine.architecture.rpc.controlcommands.{
AsyncRPCContext,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package org.apache.texera.amber.engine.architecture.pythonworker

import org.apache.pekko.actor.Props
import com.twitter.util.Promise
import org.apache.texera.amber.config.{PythonUtils, StorageConfig, UdfConfig}
import org.apache.texera.common.config.{PythonUtils, StorageConfig, UdfConfig}
import org.apache.texera.amber.core.virtualidentity.ChannelIdentity
import org.apache.texera.amber.engine.architecture.common.WorkflowActor
import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkAck
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.texera.amber.engine.architecture.scheduling

import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.storage.VFSURIFactory.createPortBaseURI
import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, PhysicalOpIdentity}
import org.apache.texera.amber.core.workflow._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.texera.amber.engine.architecture.scheduling

import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.workflow._
import org.apache.texera.amber.engine.architecture.scheduling.resourcePolicies.{
DefaultResourceAllocator,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.texera.amber.engine.architecture.scheduling.config

import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
import org.apache.texera.amber.core.workflow.PhysicalOp
import org.apache.texera.amber.util.VirtualIdentityUtils
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners

import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.state.State
import org.apache.texera.amber.core.tuple.Tuple
import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.apache.texera.amber.engine.architecture.worker.managers

import io.grpc.MethodDescriptor
import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.state.State
import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory}
import org.apache.texera.amber.core.storage.model.VirtualDocument
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import org.apache.pekko.actor.{ActorSystem, Address, Cancellable, DeadLetter, Pr
import org.apache.pekko.serialization.{Serialization, SerializationExtension}
import com.typesafe.config.{Config, ConfigFactory}
import org.apache.texera.amber.clustering.ClusterListener
import org.apache.texera.amber.config.PekkoConfig
import org.apache.texera.common.config.PekkoConfig
import org.apache.texera.amber.engine.architecture.messaginglayer.DeadLetterMonitorActor

import java.io.{BufferedReader, InputStreamReader}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import io.dropwizard.Configuration
import io.dropwizard.configuration.{EnvironmentVariableSubstitutor, SubstitutingSourceProvider}
import io.dropwizard.setup.{Bootstrap, Environment}
import io.dropwizard.websockets.WebsocketBundle
import org.apache.texera.amber.config.{ApplicationConfig, StorageConfig}
import org.apache.texera.common.config.{ApplicationConfig, StorageConfig}
import org.apache.texera.amber.core.storage.DocumentFactory
import org.apache.texera.amber.core.virtualidentity.ExecutionIdentity
import org.apache.texera.amber.core.workflow.{PhysicalPlan, WorkflowContext}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import io.dropwizard.auth.AuthValueFactoryProvider
import io.dropwizard.configuration.{EnvironmentVariableSubstitutor, SubstitutingSourceProvider}
import io.dropwizard.setup.{Bootstrap, Environment}
import io.dropwizard.websockets.WebsocketBundle
import org.apache.texera.amber.config.StorageConfig
import org.apache.texera.common.config.StorageConfig
import org.apache.texera.amber.engine.common.Utils
import org.apache.texera.amber.util.ObjectMapperUtils
import org.apache.texera.auth.SessionUser
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.texera.web.resource

import org.apache.texera.config.UserSystemConfig
import org.apache.texera.common.config.UserSystemConfig
import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package org.apache.texera.web.resource

import io.dropwizard.auth.Auth
import org.apache.texera.auth.SessionUser
import org.apache.texera.config.UserSystemConfig
import org.apache.texera.common.config.UserSystemConfig
import org.apache.texera.dao.SqlServer
import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
import org.apache.texera.dao.jooq.generated.tables.daos.UserDao
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package org.apache.texera.web.resource
import com.fasterxml.jackson.databind.node.ObjectNode
import com.typesafe.scalalogging.LazyLogging
import io.dropwizard.auth.Auth
import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.storage.DocumentFactory
import org.apache.texera.amber.operator.LogicalOp
import org.apache.texera.amber.core.storage.model.VirtualDocument
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.apache.texera.web.resource.aiassistant

import com.typesafe.config.Config
import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig

import java.net.{HttpURLConnection, URL}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package org.apache.texera.web.resource.auth

import org.apache.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims, jwtToken}
import org.apache.texera.config.UserSystemConfig
import org.apache.texera.common.config.UserSystemConfig
import org.apache.texera.dao.SqlServer
import org.apache.texera.dao.jooq.generated.Tables.USER
import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier
import com.google.api.client.http.javanet.NetHttpTransport
import com.google.api.client.json.gson.GsonFactory
import org.apache.texera.auth.JwtAuth.{TOKEN_EXPIRE_TIME_IN_MINUTES, jwtClaims, jwtToken}
import org.apache.texera.config.UserSystemConfig
import org.apache.texera.common.config.UserSystemConfig
import org.apache.texera.dao.SqlServer
import org.apache.texera.dao.jooq.generated.enums.UserRoleEnum
import org.apache.texera.dao.jooq.generated.tables.daos.UserDao
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package org.apache.texera.web.resource.dashboard.admin.settings
import com.fasterxml.jackson.annotation.JsonProperty
import io.dropwizard.auth.Auth
import org.apache.texera.auth.SessionUser
import org.apache.texera.config.DefaultsConfig
import org.apache.texera.common.config.DefaultsConfig
import org.apache.texera.dao.SqlServer
import org.jooq.impl.DSL

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import com.flipkart.zjsonpatch.{JsonDiff, JsonPatch}
import io.dropwizard.auth.Auth
import org.apache.texera.amber.util.JSONUtils.objectMapper
import org.apache.texera.auth.SessionUser
import org.apache.texera.config.UserSystemConfig
import org.apache.texera.common.config.UserSystemConfig
import org.apache.texera.dao.SqlServer
import org.apache.texera.dao.jooq.generated.Tables.WORKFLOW_VERSION
import org.apache.texera.dao.jooq.generated.tables.daos.{WorkflowDao, WorkflowVersionDao}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import scala.collection.mutable.Map
import scala.jdk.CollectionConverters._
import scala.sys.process._
import java.util.Comparator
import org.apache.texera.amber.config.PythonUtils
import org.apache.texera.common.config.PythonUtils
import org.apache.texera.dao.SqlServer
import org.apache.texera.dao.jooq.generated.tables.daos.VirtualEnvironmentsDao
import org.apache.texera.dao.jooq.generated.tables.pojos.VirtualEnvironments
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import com.fasterxml.jackson.module.scala.DefaultScalaModule
import com.typesafe.scalalogging.LazyLogging
import io.dropwizard.auth.Auth
import org.apache.texera.auth.SessionUser
import org.apache.texera.config.KubernetesConfig
import org.apache.texera.common.config.KubernetesConfig
import org.jooq.exception.DataAccessException

import javax.ws.rs._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.texera.web.resource.pythonvirtualenvironment

import org.apache.texera.config.KubernetesConfig
import org.apache.texera.common.config.KubernetesConfig

import javax.websocket._
import javax.websocket.server.ServerEndpoint
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package org.apache.texera.web.service
import com.google.protobuf.timestamp.Timestamp
import com.twitter.util.{Await, Duration}
import com.typesafe.scalalogging.LazyLogging
import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.storage.model.BufferedItemWriter
import org.apache.texera.amber.core.storage.result.ResultSchema
import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import org.apache.pekko.actor.Cancellable
import com.fasterxml.jackson.annotation.{JsonTypeInfo, JsonTypeName}
import com.fasterxml.jackson.databind.node.ObjectNode
import com.typesafe.scalalogging.LazyLogging
import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.storage.model.VirtualDocument
import org.apache.texera.amber.core.storage.result._
import org.apache.texera.amber.core.storage.{DocumentFactory, VFSURIFactory}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import com.fasterxml.jackson.core.`type`.TypeReference
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.module.scala.DefaultScalaModule
import com.github.tototoshi.csv.CSVWriter
import org.apache.texera.amber.config.EnvironmentalVariable
import org.apache.texera.common.config.EnvironmentalVariable
import org.apache.texera.amber.core.storage.DocumentFactory
import org.apache.texera.amber.core.storage.model.VirtualDocument
import org.apache.texera.amber.core.tuple.Tuple
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import com.google.protobuf.timestamp.Timestamp
import com.typesafe.scalalogging.LazyLogging
import io.reactivex.rxjava3.disposables.{CompositeDisposable, Disposable}
import io.reactivex.rxjava3.subjects.BehaviorSubject
import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.WorkflowRuntimeException
import org.apache.texera.amber.core.storage.DocumentFactory
import org.apache.texera.amber.core.storage.result.iceberg.OnIceberg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package org.apache.texera.amber.storage.iceberg
import org.apache.iceberg.catalog.TableIdentifier
import org.apache.iceberg.exceptions.NoSuchTableException
import org.apache.iceberg.rest.RESTCatalog
import org.apache.texera.amber.config.StorageConfig
import org.apache.texera.common.config.StorageConfig
import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema}
import org.apache.texera.amber.tags.IntegrationTest
import org.apache.texera.amber.util.IcebergUtil
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.texera.amber.engine.architecture.messaginglayer

import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.virtualidentity.{ActorVirtualIdentity, ChannelIdentity}
import org.apache.texera.amber.engine.architecture.common.WorkflowActor.NetworkMessage
import org.apache.texera.amber.engine.common.ambermessage.{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.texera.amber.engine.architecture.scheduling.config

import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.executor.OpExecInitInfo
import org.apache.texera.amber.core.virtualidentity.{
ActorVirtualIdentity,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class ResourcePoliciesSpec extends AnyFlatSpec {
if (!op.parallelizable) 1
else
op.suggestedWorkerNum.getOrElse(
org.apache.texera.amber.config.ApplicationConfig.numWorkerPerOperatorByDefault
org.apache.texera.common.config.ApplicationConfig.numWorkerPerOperatorByDefault
)
assert(workers == expected, s"unexpected worker count for ${op.id}")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.texera.amber.engine.architecture.sendsemantics.partitioners

import org.apache.texera.amber.config.ApplicationConfig
import org.apache.texera.common.config.ApplicationConfig
import org.apache.texera.amber.core.state.State
import org.apache.texera.amber.core.tuple.{Attribute, AttributeType, Schema, Tuple}
import org.apache.texera.amber.core.virtualidentity.ActorVirtualIdentity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package org.apache.texera.amber.engine.e2e

import com.twitter.util.{Await, Duration, Promise, Return}
import org.apache.pekko.actor.ActorSystem
import org.apache.texera.amber.config.StorageConfig
import org.apache.texera.common.config.StorageConfig
import org.apache.texera.amber.core.executor.OpExecInitInfo
import org.apache.texera.amber.core.storage.DocumentFactory
import org.apache.texera.amber.core.storage.model.VirtualDocument
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package org.apache.texera.auth

import org.apache.texera.config.AuthConfig
import org.apache.texera.common.config.AuthConfig
import org.apache.texera.dao.jooq.generated.tables.pojos.User
import org.jose4j.jws.AlgorithmIdentifiers.HMAC_SHA256
import org.jose4j.jws.JsonWebSignature
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.texera.amber.config
package org.apache.texera.common.config

import com.typesafe.config.{Config, ConfigFactory}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.texera.config
package org.apache.texera.common.config

import com.typesafe.config.{Config, ConfigFactory}
import java.security.SecureRandom
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.texera.config
package org.apache.texera.common.config

import com.typesafe.config.{Config, ConfigFactory}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.texera.config
package org.apache.texera.common.config

import com.typesafe.config.{ConfigFactory, ConfigRenderOptions, ConfigValueType}

Expand Down
Loading
Loading