Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clickhouse v2 #225

Closed
wants to merge 8 commits into from
Closed

Clickhouse v2 #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e1195c
升级到2，结果只支持natvie.
yinay Dec 4, 2022
b675ab1
有些数据读出来还是有问题
yinay Dec 8, 2022
1636f7d
开始解决Datetime64问题
yinay Dec 8, 2022
253d1b0
DateTime64是ok的，不过00000这种时间不对了
yinay Dec 8, 2022
3cc1531
解决时间快的问题.
yinay Dec 9, 2022
6d15c67
解决时间快的问题.
yinay Dec 9, 2022
ff56397
测试用例通过
yinay Dec 9, 2022
91e8bae
提并
yinay Dec 9, 2022
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
224 changes: 112 additions & 112 deletions config/etc_init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ limitations under the License.
package config

import (
"strconv"
"log"
"os"
"path/filepath"
"runtime"
"strconv"
)

func LoadConf(BifrostConfigFile string) {
func LoadConf(BifrostConfigFile string) {
if BifrostConfigFile == "" {
BifrostConfigFile = BifrostDir+"/etc/Bifrost.ini"
BifrostConfigFile = BifrostDir + "/etc/Bifrost.ini"
//log.Println("BifrostConfigFile:",BifrostConfigFile)
}else {
} else {
if runtime.GOOS != "windows" {
if BifrostConfigFile[0:1] != "/" {
BifrostConfigFile = BifrostDir + BifrostConfigFile
Expand All @@ -40,63 +40,63 @@ func LoadConf(BifrostConfigFile string) {
DoLoadConf(BifrostConfigFile)
}

func InitParam(){
func InitParam() {

// 监听端口
Listen = GetConfigVal("Bifrostd","listen")
if Listen == ""{
Listen = GetConfigVal("Bifrostd", "listen")
if Listen == "" {
Listen = "0.0.0.0:21036"
}
//从 map中清除，为了省内存
DelConfig("Bifrostd","listen")
DelConfig("Bifrostd", "listen")

// 数据存储目录
DataDir = GetConfigVal("Bifrostd","data_dir")
DataDir = GetConfigVal("Bifrostd", "data_dir")

if DataDir == "" {
DataDir = BifrostDir+"/data"
DataDir = BifrostDir + "/data"
}

if runtime.GOOS != "windows"{
if runtime.GOOS != "windows" {
if DataDir[0:1] != "/" {
DataDir = BifrostDir+DataDir
DataDir = BifrostDir + DataDir
}
}
DelConfig("Bifrostd","data_dir")
DelConfig("Bifrostd", "data_dir")

if runtime.GOOS != "windows"{
BifrostPidFile = GetConfigVal("Bifrostd","pid")
if BifrostPidFile == ""{
BifrostPidFile = DataDir+"/Bifrost.pid"
if runtime.GOOS != "windows" {
BifrostPidFile = GetConfigVal("Bifrostd", "pid")
if BifrostPidFile == "" {
BifrostPidFile = DataDir + "/Bifrost.pid"
}
}
DelConfig("Bifrostd","pid")
DelConfig("Bifrostd", "pid")

BifrostLogDir = GetConfigVal("Bifrostd","log_dir")
BifrostLogDir = GetConfigVal("Bifrostd", "log_dir")
if BifrostLogDir == "" {
log.Println("no config [ Bifrostd log_dir ] ")
BifrostLogDir = BifrostDir+"/logs"
log.Println("log_dir default:",BifrostLogDir)
BifrostLogDir = BifrostDir + "logs"
log.Println("log_dir default:", BifrostLogDir)
}
if runtime.GOOS != "windows" {
if BifrostLogDir[0:1] != "/" {
BifrostLogDir = BifrostDir + BifrostLogDir
}
}
DelConfig("Bifrostd","log_dir")
DelConfig("Bifrostd", "log_dir")

BifrostAdminTemplateDir = GetConfigVal("Bifrostd","admin_template_dir")
BifrostAdminTemplateDir = GetConfigVal("Bifrostd", "admin_template_dir")
if BifrostAdminTemplateDir == "" {
BifrostAdminTemplateDir = BifrostDir+"/admin/view"
BifrostAdminTemplateDir = BifrostDir + "/admin/view"
}
if runtime.GOOS != "windows" {
if BifrostAdminTemplateDir[0:1] != "/" {
BifrostAdminTemplateDir = BifrostDir + BifrostAdminTemplateDir
}
}
DelConfig("Bifrostd","admin_template_dir")
DelConfig("Bifrostd", "admin_template_dir")

BifrostPluginTemplateDir = GetConfigVal("Bifrostd","plugin_template_dir")
BifrostPluginTemplateDir = GetConfigVal("Bifrostd", "plugin_template_dir")
if BifrostPluginTemplateDir == "" {
BifrostPluginTemplateDir = BifrostDir
}
Expand All @@ -105,182 +105,182 @@ func InitParam(){
BifrostPluginTemplateDir = BifrostDir + BifrostPluginTemplateDir
}
}
DelConfig("Bifrostd","plugin_template_dir")
DelConfig("Bifrostd", "plugin_template_dir")

var tmp string
tmp = GetConfigVal("Bifrostd","toserver_queue_size")
if tmp != ""{
tmp = GetConfigVal("Bifrostd", "toserver_queue_size")
if tmp != "" {
intA, err := strconv.Atoi(tmp)
if err == nil && intA > 0{
if err == nil && intA > 0 {
ToServerQueueSize = intA
}else{
log.Println("Bifrost.ini Bifrostd.toserver_queue_size type conversion to int err:",err)
} else {
log.Println("Bifrost.ini Bifrostd.toserver_queue_size type conversion to int err:", err)
}
}
DelConfig("Bifrostd","toserver_queue_size")
DelConfig("Bifrostd", "toserver_queue_size")

if GetConfigVal("Bifrostd","dynamic_plugin") == "true"{
if GetConfigVal("Bifrostd", "dynamic_plugin") == "true" {
DynamicPlugin = true
return
}
DelConfig("Bifrostd","dynamic_plugin")
DelConfig("Bifrostd", "dynamic_plugin")

tmp = GetConfigVal("Bifrostd","channel_queue_size")
if tmp != ""{
tmp = GetConfigVal("Bifrostd", "channel_queue_size")
if tmp != "" {
intA, err := strconv.Atoi(tmp)
if err == nil && intA > 0{
if err == nil && intA > 0 {
ChannelQueueSize = intA
}else{
log.Println("Bifrost.ini Bifrostd.channel_queue_size type conversion to int err:",err)
} else {
log.Println("Bifrost.ini Bifrostd.channel_queue_size type conversion to int err:", err)
}
}
DelConfig("Bifrostd","channel_queue_size")
DelConfig("Bifrostd", "channel_queue_size")

tmp = GetConfigVal("Bifrostd","count_queue_size")
if tmp != ""{
tmp = GetConfigVal("Bifrostd", "count_queue_size")
if tmp != "" {
intA, err := strconv.Atoi(tmp)
if err == nil && intA > 0{
if err == nil && intA > 0 {
CountQueueSize = intA
}else{
log.Println("Bifrost.ini Bifrostd.count_queue_size type conversion to int err:",err)
} else {
log.Println("Bifrost.ini Bifrostd.count_queue_size type conversion to int err:", err)
}
}
DelConfig("Bifrostd","count_queue_size")
DelConfig("Bifrostd", "count_queue_size")

tmp = GetConfigVal("Bifrostd","key_cache_pool_size")
if tmp != ""{
tmp = GetConfigVal("Bifrostd", "key_cache_pool_size")
if tmp != "" {
intA, err := strconv.Atoi(tmp)
if err == nil && intA > 0{
if err == nil && intA > 0 {
KeyCachePoolSize = intA
}else{
log.Println("Bifrost.ini Bifrostd.key_cache_pool_size type conversion to int err:",err)
} else {
log.Println("Bifrost.ini Bifrostd.key_cache_pool_size type conversion to int err:", err)
}
}
DelConfig("Bifrostd","key_cache_pool_size")
DelConfig("Bifrostd", "key_cache_pool_size")

if GetConfigVal("Bifrostd","file_queue_usable") == "false"{
if GetConfigVal("Bifrostd", "file_queue_usable") == "false" {
FileQueueUsable = false
}
DelConfig("Bifrostd","file_queue_usable")
DelConfig("Bifrostd", "file_queue_usable")

tmp = GetConfigVal("Bifrostd","file_queue_usable_count")
if tmp != ""{
intA, err := strconv.ParseUint(tmp,10,32)
if err == nil && intA > 0{
tmp = GetConfigVal("Bifrostd", "file_queue_usable_count")
if tmp != "" {
intA, err := strconv.ParseUint(tmp, 10, 32)
if err == nil && intA > 0 {
FileQueueUsableCount = uint32(intA)
}else{
log.Println("Bifrost.ini Bifrostd.file_queue_usable_count type conversion to uint32 err:",err)
} else {
log.Println("Bifrost.ini Bifrostd.file_queue_usable_count type conversion to uint32 err:", err)
}
}
DelConfig("Bifrostd","file_queue_usable_count")
DelConfig("Bifrostd", "file_queue_usable_count")

tmp = GetConfigVal("Bifrostd","file_queue_usable_count_time_diff")
if tmp != ""{
intA, err := strconv.ParseInt(tmp,10,64)
if err == nil && intA > 0{
tmp = GetConfigVal("Bifrostd", "file_queue_usable_count_time_diff")
if tmp != "" {
intA, err := strconv.ParseInt(tmp, 10, 64)
if err == nil && intA > 0 {
FileQueueUsableCountTimeDiff = intA
}else{
log.Println("Bifrost.ini Bifrostd.file_queue_usable_count_time_diff type conversion to int64 err:",err)
} else {
log.Println("Bifrost.ini Bifrostd.file_queue_usable_count_time_diff type conversion to int64 err:", err)
}
}
DelConfig("Bifrostd","file_queue_usable_count_time_diff")
DelConfig("Bifrostd", "file_queue_usable_count_time_diff")

tmp = GetConfigVal("Bifrostd","plugin_commit_timeout")
if tmp != ""{
tmp = GetConfigVal("Bifrostd", "plugin_commit_timeout")
if tmp != "" {
intA, err := strconv.Atoi(tmp)
if err == nil && intA > 0{
if err == nil && intA > 0 {
PluginCommitTimeOut = intA
}else{
log.Println("Bifrost.ini Bifrostd.plugin_commit_timeout type conversion to int err:",err)
} else {
log.Println("Bifrost.ini Bifrostd.plugin_commit_timeout type conversion to int err:", err)
}
}
DelConfig("Bifrostd","plugin_commit_timeout")
DelConfig("Bifrostd", "plugin_commit_timeout")

tmp = GetConfigVal("Bifrostd","plugin_sync_retry_time")
if tmp != ""{
tmp = GetConfigVal("Bifrostd", "plugin_sync_retry_time")
if tmp != "" {
intA, err := strconv.Atoi(tmp)
if err == nil && intA > 0{
if err == nil && intA > 0 {
PluginSyncRetrycTime = intA
}else{
log.Println("Bifrost.ini Bifrostd.plugin_sync_retry_time type conversion to int err:",err)
} else {
log.Println("Bifrost.ini Bifrostd.plugin_sync_retry_time type conversion to int err:", err)
}
}
DelConfig("Bifrostd","plugin_sync_retry_time")
DelConfig("Bifrostd", "plugin_sync_retry_time")

tmp = GetConfigVal("Bifrostd","refuse_ip_login_failed_count")
if tmp != ""{
tmp = GetConfigVal("Bifrostd", "refuse_ip_login_failed_count")
if tmp != "" {
intA, err := strconv.Atoi(tmp)
if err == nil && intA >= 0{
if err == nil && intA >= 0 {
RefuseIpLoginFailedCount = intA
}else{
log.Println("Bifrost.ini Bifrostd.refuse_ip_login_failed_count type conversion to int err:",err)
} else {
log.Println("Bifrost.ini Bifrostd.refuse_ip_login_failed_count type conversion to int err:", err)
}
}
DelConfig("Bifrostd","refuse_ip_login_failed_count")
DelConfig("Bifrostd", "refuse_ip_login_failed_count")

tmp = GetConfigVal("Bifrostd","refuse_ip_timeout")
if tmp != ""{
intA, err := strconv.ParseInt(tmp,10,64)
if err == nil && intA >= 0{
tmp = GetConfigVal("Bifrostd", "refuse_ip_timeout")
if tmp != "" {
intA, err := strconv.ParseInt(tmp, 10, 64)
if err == nil && intA >= 0 {
RefuseIpTimeOut = intA
}else{
log.Println("Bifrost.ini Bifrostd.refuse_ip_timeout type conversion to int64 err:",err)
} else {
log.Println("Bifrost.ini Bifrostd.refuse_ip_timeout type conversion to int64 err:", err)
}
}
DelConfig("Bifrostd","refuse_ip_timeout")
DelConfig("Bifrostd", "refuse_ip_timeout")

initTLSParam()
}

func initTLSParam(){
func initTLSParam() {
var path string
var tlsKeyFile string = GetConfigVal("Bifrostd","tls_key_file")
var tlsCrtFile string = GetConfigVal("Bifrostd","tls_crt_file")
var tlsKeyFile string = GetConfigVal("Bifrostd", "tls_key_file")
var tlsCrtFile string = GetConfigVal("Bifrostd", "tls_crt_file")

var checkFileStat = func(pathDir,file string) error{
_, err := os.Stat(pathDir+"/"+file)
var checkFileStat = func(pathDir, file string) error {
_, err := os.Stat(pathDir + "/" + file)
return err
}

var setTLSConfig = func() {
TLSServerKeyFile = path+"/"+tlsKeyFile
TLSServerCrtFile = path+"/"+tlsCrtFile
TLSServerKeyFile = path + "/" + tlsKeyFile
TLSServerCrtFile = path + "/" + tlsCrtFile
TLS = true
}

if GetConfigVal("Bifrostd","tls") == "true"{
if GetConfigVal("Bifrostd", "tls") == "true" {
for {
// 相对于 Bifrost 二进制可执行文件的路径
path,_ = filepath.Abs(filepath.Dir(os.Args[0]))
if checkFileStat(path,tlsKeyFile) == nil && checkFileStat(path,tlsCrtFile) == nil {
path, _ = filepath.Abs(filepath.Dir(os.Args[0]))
if checkFileStat(path, tlsKeyFile) == nil && checkFileStat(path, tlsCrtFile) == nil {
setTLSConfig()
break
}
// 相对于 Bifost 二进制可执行文件的父目录的路径
path = filepath.Dir(path)
if checkFileStat(path,tlsKeyFile) == nil && checkFileStat(path,tlsCrtFile) == nil {
if checkFileStat(path, tlsKeyFile) == nil && checkFileStat(path, tlsCrtFile) == nil {
setTLSConfig()
break
}
// 相对于 Bifrost.ini 配置文件的路径
path,_ = filepath.Abs(filepath.Dir(BifrostConfigFile))
path, _ = filepath.Abs(filepath.Dir(BifrostConfigFile))
BifrostConfigFilePath := path
if checkFileStat(path,tlsKeyFile) == nil && checkFileStat(path,tlsCrtFile) == nil {
if checkFileStat(path, tlsKeyFile) == nil && checkFileStat(path, tlsCrtFile) == nil {
setTLSConfig()
break
}
// 绝对路径
path = ""
if checkFileStat(path,tlsKeyFile) == nil && checkFileStat(path,tlsCrtFile) == nil {
if checkFileStat(path, tlsKeyFile) == nil && checkFileStat(path, tlsCrtFile) == nil {
setTLSConfig()
break
}
log.Println("tls_key_file:",BifrostConfigFilePath+"/"+tlsKeyFile," or tls_crt_file: ",BifrostConfigFilePath+"/"+tlsCrtFile, " not exsit")
log.Println("tls_key_file:", BifrostConfigFilePath+"/"+tlsKeyFile, " or tls_crt_file: ", BifrostConfigFilePath+"/"+tlsCrtFile, " not exsit")
break
}
}

DelConfig("Bifrostd","tls_key_file")
DelConfig("Bifrostd","tls_crt_file")
DelConfig("Bifrostd","tls")
DelConfig("Bifrostd", "tls_key_file")
DelConfig("Bifrostd", "tls_crt_file")
DelConfig("Bifrostd", "tls")
}
Loading