Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,8 @@
public class AuthorizationException extends UserException {

public ErrorCode errorCode = ErrorCode.ERR_COMMON_ERROR;
public Object[] msgs;

public AuthorizationException(String msg, Throwable cause) {
super(msg, cause);
}

public AuthorizationException(String msg) {
super(msg);
}

public AuthorizationException(ErrorCode code, Object... msgs) {
super(code.formatErrorMsg(msgs));
this.errorCode = code;
this.msgs = msgs;
}

public String formatErrMsg() {
return errorCode.formatErrorMsg(msgs);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,4 @@ public class ConnectionException extends IOException {
public ConnectionException(String message) {
super(message);
}

public ConnectionException(String message, Throwable cause) {
super(message, cause);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
// specific language governing permissions and limitations
// under the License.

package org.apache.doris.common.logger;
package org.apache.doris.common;

/**
* Modify these tag key name to suit your log format and collector.
* MaterializedViewException
*/
public class TagKey {
public class MaterializedViewException extends UserException {

public static final String QUERY_ID = "query_id";
public MaterializedViewException(String msg) {
super(msg);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ public class JsonUtil {
.configure(MapperFeature.REQUIRE_SETTERS_FOR_GETTERS, true).setTimeZone(TimeZone.getDefault())
.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));

public static JsonNode toJsonNode(Object obj) {
return objectMapper.valueToTree(obj);
}

public static JsonNode readTree(String str) {
try {
return objectMapper.readTree(str);
Expand Down
21 changes: 0 additions & 21 deletions fe/fe-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -949,27 +949,6 @@ under the License.
<skip>${skip.plugin}</skip>
</configuration>
</execution>
<!--execution>
<id>doc</id>
<phase>process-classes</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>org.apache.doris.common.util.DocGenerator</mainClass>
<arguments>
<argument>${doris.home}/docs/en/docs/admin-manual/config/fe-config-template.md</argument>
<argument>${doris.home}/docs/zh-CN/docs/admin-manual/config/fe-config-template.md</argument>
<argument>${doris.home}/docs/en/docs/admin-manual/config/fe-config.md</argument>
<argument>${doris.home}/docs/zh-CN/docs/admin-manual/config/fe-config.md</argument>
<argument>${doris.home}/docs/en/docs/advanced/variables-template.md</argument>
<argument>${doris.home}/docs/zh-CN/docs/advanced/variables-template.md</argument>
<argument>${doris.home}/docs/en/docs/advanced/variables.md</argument>
<argument>${doris.home}/docs/zh-CN/docs/advanced/variables.md</argument>
</arguments>
<skip>${skip.doc}</skip>
</configuration>
</execution-->
</executions>
</plugin>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import org.apache.doris.common.ErrorReport;
import org.apache.doris.common.FeConstants;
import org.apache.doris.common.MetaNotFoundException;
import org.apache.doris.common.util.IdGeneratorUtil;
import org.apache.doris.common.util.BufferSizeUtil;
import org.apache.doris.common.util.ListComparator;
import org.apache.doris.common.util.PropertyAnalyzer;
import org.apache.doris.common.util.Util;
Expand Down Expand Up @@ -414,7 +414,7 @@ private RollupJobV2 createMaterializedViewJob(String rawSql, String mvName, Stri
long tableId = olapTable.getId();
int baseSchemaHash = olapTable.getSchemaHashByIndexId(baseIndexId);
Env env = Env.getCurrentEnv();
long bufferSize = IdGeneratorUtil.getBufferSizeForAlterTable(olapTable, Sets.newHashSet(baseIndexId));
long bufferSize = BufferSizeUtil.getBufferSizeForAlterTable(olapTable, Sets.newHashSet(baseIndexId));
IdGeneratorBuffer idGeneratorBuffer = env.getIdGeneratorBuffer(bufferSize);
long jobId = idGeneratorBuffer.getNextId();
long mvIndexId = idGeneratorBuffer.getNextId();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
import org.apache.doris.common.Pair;
import org.apache.doris.common.ThreadPoolManager;
import org.apache.doris.common.UserException;
import org.apache.doris.common.util.BufferSizeUtil;
import org.apache.doris.common.util.DbUtil;
import org.apache.doris.common.util.DynamicPartitionUtil;
import org.apache.doris.common.util.IdGeneratorUtil;
import org.apache.doris.common.util.ListComparator;
import org.apache.doris.common.util.PropertyAnalyzer;
import org.apache.doris.common.util.TimeUtils;
Expand Down Expand Up @@ -1809,7 +1809,7 @@ private void createJob(String rawSql, long dbId, OlapTable olapTable, Map<Long,
}

// create job
long bufferSize = IdGeneratorUtil.getBufferSizeForAlterTable(olapTable, changedIndexIdToSchema.keySet());
long bufferSize = BufferSizeUtil.getBufferSizeForAlterTable(olapTable, changedIndexIdToSchema.keySet());
IdGeneratorBuffer idGeneratorBuffer = Env.getCurrentEnv().getIdGeneratorBuffer(bufferSize);
long jobId = idGeneratorBuffer.getNextId();
SchemaChangeJobV2 schemaChangeJob =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.doris.analysis;

import org.apache.doris.common.util.ToSqlContext;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.StmtExecutor;

Expand Down Expand Up @@ -183,7 +182,7 @@ public String visitSlotRef(SlotRef expr, ToSqlParams context) {
} else if (expr.desc == null) {
return "`" + expr.getCol() + "`";
} else if (expr.desc.getSourceExprs() != null) {
if (!context.disableTableName && (ToSqlContext.get() == null || ToSqlContext.get().isNeedSlotRefId())) {
if (!context.disableTableName) {
if (expr.desc.getId().asInt() != 1) {
sb.append("<slot ").append(expr.desc.getId().asInt()).append(">");
}
Expand Down
4 changes: 0 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
Original file line number Diff line number Diff line change
Expand Up @@ -860,10 +860,6 @@ public Env(boolean isCheckpointCatalog) {
}
}

public static Map<String, Long> getSessionReportTimeMap() {
return sessionReportTimeMap;
}

public void registerTempTableAndSession(Table table) {
if (ConnectContext.get() != null) {
ConnectContext.get().addTempTableToDB(table.getQualifiedDbName(), table.getName());
Expand Down
12 changes: 0 additions & 12 deletions fe/fe-core/src/main/java/org/apache/doris/common/CacheFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,6 @@ public <K, V> LoadingCache<K, V> buildCacheWithSyncRemovalListener(CacheLoader<K
return builder.build(cacheLoader);
}

// Build cache with async removal listener. Use with caution if listener may trigger nested operations
public <K, V> LoadingCache<K, V> buildCacheWithAsyncRemovalListener(CacheLoader<K, V> cacheLoader,
RemovalListener<K, V> removalListener,
ExecutorService executor) {
Caffeine<Object, Object> builder = buildWithParams();
builder.executor(executor);
if (removalListener != null) {
builder.removalListener(removalListener);
}
return builder.build(cacheLoader);
}

// Build an async loading cache
public <K, V> AsyncLoadingCache<K, V> buildAsyncCache(AsyncCacheLoader<K, V> cacheLoader,
ExecutorService executor) {
Expand Down
65 changes: 0 additions & 65 deletions fe/fe-core/src/main/java/org/apache/doris/common/CheckedMath.java

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ public boolean isVersion() {
return isVersion;
}

public String getHelperNode() {
return helperNode;
}

public boolean runBdbTools() {
return runBdbTools;
}
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading