From 3cf5b7697b50a9986df2d8c4be27a3a809c65342 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Mon, 20 Jul 2020 00:02:51 +0800 Subject: [PATCH] [td-225] source files rename. --- src/client/inc/tscLocalMerge.h | 4 ++-- src/client/inc/tscUtil.h | 6 +++--- src/client/inc/tsclient.h | 4 ++-- src/client/src/tscFunctionImpl.c | 14 +++++++------- src/client/src/tscLocal.c | 10 +++++----- src/client/src/tscSQLParser.c | 2 +- src/client/src/tscSql.c | 2 +- src/client/src/tscSubquery.c | 4 ++-- src/client/src/tscUtil.c | 6 +++--- src/query/inc/{qast.h => qAst.h} | 0 src/query/inc/{qexecutor.h => qExecutor.h} | 6 +++--- src/query/inc/{qextbuffer.h => qExtbuffer.h} | 2 +- src/query/inc/{qfill.h => qFill.h} | 2 +- src/query/inc/{qhistogram.h => qHistogram.h} | 0 src/query/inc/{qpercentile.h => qPercentile.h} | 2 +- src/query/inc/{qresultbuf.h => qResultbuf.h} | 4 ++-- ...qsyntaxtreefunction.h => qSyntaxtreefunction.h} | 0 src/query/inc/{qtsbuf.h => qTsbuf.h} | 0 src/query/inc/{qutil.h => qUtil.h} | 0 src/query/src/{qast.c => qAst.c} | 8 ++++---- src/query/src/{qexecutor.c => qExecutor.c} | 12 ++++++------ src/query/src/{qextbuffer.c => qExtbuffer.c} | 7 +++---- src/query/src/{qfill.c => qFill.c} | 4 ++-- src/query/src/{qfilterfunc.c => qFilterfunc.c} | 2 +- src/query/src/{qhistogram.c => qHistogram.c} | 2 +- src/query/src/{qparserImpl.c => qParserImpl.c} | 0 src/query/src/{qpercentile.c => qPercentile.c} | 6 +++--- src/query/src/{qresultbuf.c => qResultbuf.c} | 4 ++-- ...qsyntaxtreefunction.c => qSyntaxtreefunction.c} | 2 +- src/query/src/{qtokenizer.c => qTokenizer.c} | 0 src/query/src/{qtsbuf.c => qTsbuf.c} | 4 ++-- src/query/src/{qutil.c => qUtil.c} | 4 ++-- src/query/tests/astTest.cpp | 2 +- src/query/tests/histogramTest.cpp | 2 +- src/query/tests/resultBufferTest.cpp | 2 +- src/query/tests/tsBufTest.cpp | 2 +- 36 files changed, 65 insertions(+), 66 deletions(-) rename src/query/inc/{qast.h => qAst.h} (100%) rename src/query/inc/{qexecutor.h => qExecutor.h} (99%) rename src/query/inc/{qextbuffer.h => qExtbuffer.h} (98%) rename src/query/inc/{qfill.h => qFill.h} (99%) rename src/query/inc/{qhistogram.h => qHistogram.h} (100%) rename src/query/inc/{qpercentile.h => qPercentile.h} (98%) rename src/query/inc/{qresultbuf.h => qResultbuf.h} (99%) rename src/query/inc/{qsyntaxtreefunction.h => qSyntaxtreefunction.h} (100%) rename src/query/inc/{qtsbuf.h => qTsbuf.h} (100%) rename src/query/inc/{qutil.h => qUtil.h} (100%) rename src/query/src/{qast.c => qAst.c} (99%) rename src/query/src/{qexecutor.c => qExecutor.c} (99%) rename src/query/src/{qextbuffer.c => qExtbuffer.c} (99%) rename src/query/src/{qfill.c => qFill.c} (99%) rename src/query/src/{qfilterfunc.c => qFilterfunc.c} (99%) rename src/query/src/{qhistogram.c => qHistogram.c} (99%) rename src/query/src/{qparserImpl.c => qParserImpl.c} (100%) rename src/query/src/{qpercentile.c => qPercentile.c} (99%) rename src/query/src/{qresultbuf.c => qResultbuf.c} (99%) rename src/query/src/{qsyntaxtreefunction.c => qSyntaxtreefunction.c} (99%) rename src/query/src/{qtokenizer.c => qTokenizer.c} (100%) rename src/query/src/{qtsbuf.c => qTsbuf.c} (99%) rename src/query/src/{qutil.c => qUtil.c} (99%) diff --git a/src/client/inc/tscLocalMerge.h b/src/client/inc/tscLocalMerge.h index d38885ab2e..397a60d140 100644 --- a/src/client/inc/tscLocalMerge.h +++ b/src/client/inc/tscLocalMerge.h @@ -20,8 +20,8 @@ extern "C" { #endif -#include "qextbuffer.h" -#include "qfill.h" +#include "qExtbuffer.h" +#include "qFill.h" #include "taosmsg.h" #include "tlosertree.h" #include "tsclient.h" diff --git a/src/client/inc/tscUtil.h b/src/client/inc/tscUtil.h index 786133a8f3..590f205e1d 100644 --- a/src/client/inc/tscUtil.h +++ b/src/client/inc/tscUtil.h @@ -23,11 +23,11 @@ extern "C" { /* * @date 2018/09/30 */ -#include "os.h" -#include "tbuffer.h" #include "exception.h" -#include "qextbuffer.h" +#include "os.h" +#include "qExtbuffer.h" #include "taosdef.h" +#include "tbuffer.h" #include "tscLocalMerge.h" #include "tsclient.h" diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h index 3f548c18ca..3b19a475dc 100644 --- a/src/client/inc/tsclient.h +++ b/src/client/inc/tsclient.h @@ -30,9 +30,9 @@ extern "C" { #include "tsqlfunction.h" #include "tutil.h" -#include "qexecutor.h" +#include "qExecutor.h" +#include "qTsbuf.h" #include "qsqlparser.h" -#include "qtsbuf.h" #include "tcmdtype.h" // forward declaration diff --git a/src/client/src/tscFunctionImpl.c b/src/client/src/tscFunctionImpl.c index fb15e4efd5..72ccd5adc6 100644 --- a/src/client/src/tscFunctionImpl.c +++ b/src/client/src/tscFunctionImpl.c @@ -14,15 +14,15 @@ */ #include "os.h" -#include "qextbuffer.h" -#include "qfill.h" -#include "qhistogram.h" -#include "qpercentile.h" -#include "qsyntaxtreefunction.h" -#include "qtsbuf.h" +#include "qAst.h" +#include "qExtbuffer.h" +#include "qFill.h" +#include "qHistogram.h" +#include "qPercentile.h" +#include "qSyntaxtreefunction.h" +#include "qTsbuf.h" #include "taosdef.h" #include "taosmsg.h" -#include "qast.h" #include "tscLog.h" #include "tscSubquery.h" #include "tscompression.h" diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c index 83700ce0a5..7f336daa91 100644 --- a/src/client/src/tscLocal.c +++ b/src/client/src/tscLocal.c @@ -16,14 +16,14 @@ #include "os.h" #include "taosmsg.h" -#include "tcache.h" -#include "tscUtil.h" -#include "tsclient.h" +#include "qExtbuffer.h" #include "taosdef.h" +#include "tcache.h" +#include "tname.h" #include "tscLog.h" -#include "qextbuffer.h" +#include "tscUtil.h" #include "tschemautil.h" -#include "tname.h" +#include "tsclient.h" static void tscSetLocalQueryResult(SSqlObj *pSql, const char *val, const char *columnName, int16_t type, size_t valueLength); diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index b97e486449..09db65a105 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -18,9 +18,9 @@ #define _DEFAULT_SOURCE #include "os.h" +#include "qAst.h" #include "taos.h" #include "taosmsg.h" -#include "qast.h" #include "tcompare.h" #include "tname.h" #include "tscLog.h" diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c index 6a14d3a65e..77584f168c 100644 --- a/src/client/src/tscSql.c +++ b/src/client/src/tscSql.c @@ -15,7 +15,7 @@ #include "hash.h" #include "os.h" -#include "qast.h" +#include "qAst.h" #include "tcache.h" #include "tnote.h" #include "trpc.h" diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c index 1dbc52efb0..5d26d09fae 100644 --- a/src/client/src/tscSubquery.c +++ b/src/client/src/tscSubquery.c @@ -14,8 +14,8 @@ */ #include "os.h" -#include "qtsbuf.h" -#include "qast.h" +#include "qAst.h" +#include "qTsbuf.h" #include "tcompare.h" #include "tscLog.h" #include "tscSubquery.h" diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c index 4e6133663e..27f6727339 100644 --- a/src/client/src/tscUtil.c +++ b/src/client/src/tscUtil.c @@ -13,11 +13,11 @@ * along with this program. If not, see . */ -#include "os.h" -#include "hash.h" #include "tscUtil.h" +#include "hash.h" +#include "os.h" +#include "qAst.h" #include "taosmsg.h" -#include "qast.h" #include "tcache.h" #include "tkey.h" #include "tmd5.h" diff --git a/src/query/inc/qast.h b/src/query/inc/qAst.h similarity index 100% rename from src/query/inc/qast.h rename to src/query/inc/qAst.h diff --git a/src/query/inc/qexecutor.h b/src/query/inc/qExecutor.h similarity index 99% rename from src/query/inc/qexecutor.h rename to src/query/inc/qExecutor.h index 97a7565de8..127c38a6f8 100644 --- a/src/query/inc/qexecutor.h +++ b/src/query/inc/qExecutor.h @@ -18,10 +18,10 @@ #include "os.h" #include "hash.h" -#include "qfill.h" -#include "qresultbuf.h" +#include "qFill.h" +#include "qResultbuf.h" +#include "qTsbuf.h" #include "qsqlparser.h" -#include "qtsbuf.h" #include "query.h" #include "taosdef.h" #include "tarray.h" diff --git a/src/query/inc/qextbuffer.h b/src/query/inc/qExtbuffer.h similarity index 98% rename from src/query/inc/qextbuffer.h rename to src/query/inc/qExtbuffer.h index 2cbef2b1be..b57c48933f 100644 --- a/src/query/inc/qextbuffer.h +++ b/src/query/inc/qExtbuffer.h @@ -28,7 +28,7 @@ extern "C" { #include "tdataformat.h" #include "talgo.h" -#define DEFAULT_PAGE_SIZE (1024L*64) // 16k larger than the SHistoInfo +#define DEFAULT_PAGE_SIZE (1024L*4) // 16k larger than the SHistoInfo #define MAX_TMPFILE_PATH_LENGTH PATH_MAX #define INITIAL_ALLOCATION_BUFFER_SIZE 64 diff --git a/src/query/inc/qfill.h b/src/query/inc/qFill.h similarity index 99% rename from src/query/inc/qfill.h rename to src/query/inc/qFill.h index ee5974708a..db6a69c2c5 100644 --- a/src/query/inc/qfill.h +++ b/src/query/inc/qFill.h @@ -21,8 +21,8 @@ extern "C" { #endif #include "os.h" +#include "qExtbuffer.h" #include "taosdef.h" -#include "qextbuffer.h" typedef struct { STColumn col; // column info diff --git a/src/query/inc/qhistogram.h b/src/query/inc/qHistogram.h similarity index 100% rename from src/query/inc/qhistogram.h rename to src/query/inc/qHistogram.h diff --git a/src/query/inc/qpercentile.h b/src/query/inc/qPercentile.h similarity index 98% rename from src/query/inc/qpercentile.h rename to src/query/inc/qPercentile.h index c1227dad77..52f666c338 100644 --- a/src/query/inc/qpercentile.h +++ b/src/query/inc/qPercentile.h @@ -16,7 +16,7 @@ #ifndef TDENGINE_QPERCENTILE_H #define TDENGINE_QPERCENTILE_H -#include "qextbuffer.h" +#include "qExtbuffer.h" typedef struct MinMaxEntry { union { diff --git a/src/query/inc/qresultbuf.h b/src/query/inc/qResultbuf.h similarity index 99% rename from src/query/inc/qresultbuf.h rename to src/query/inc/qResultbuf.h index f901474cc1..41fccd177d 100644 --- a/src/query/inc/qresultbuf.h +++ b/src/query/inc/qResultbuf.h @@ -20,9 +20,9 @@ extern "C" { #endif -#include "os.h" -#include "qextbuffer.h" #include "hash.h" +#include "os.h" +#include "qExtbuffer.h" typedef struct SArray* SIDList; diff --git a/src/query/inc/qsyntaxtreefunction.h b/src/query/inc/qSyntaxtreefunction.h similarity index 100% rename from src/query/inc/qsyntaxtreefunction.h rename to src/query/inc/qSyntaxtreefunction.h diff --git a/src/query/inc/qtsbuf.h b/src/query/inc/qTsbuf.h similarity index 100% rename from src/query/inc/qtsbuf.h rename to src/query/inc/qTsbuf.h diff --git a/src/query/inc/qutil.h b/src/query/inc/qUtil.h similarity index 100% rename from src/query/inc/qutil.h rename to src/query/inc/qUtil.h diff --git a/src/query/src/qast.c b/src/query/src/qAst.c similarity index 99% rename from src/query/src/qast.c rename to src/query/src/qAst.c index 42f9f214f5..c2578c15c0 100644 --- a/src/query/src/qast.c +++ b/src/query/src/qAst.c @@ -16,17 +16,17 @@ #include "os.h" -#include "tname.h" -#include "qast.h" -#include "tsdb.h" #include "exception.h" +#include "qAst.h" +#include "qSyntaxtreefunction.h" #include "qsqlparser.h" -#include "qsyntaxtreefunction.h" #include "taosdef.h" #include "taosmsg.h" #include "tarray.h" #include "tbuffer.h" #include "tcompare.h" +#include "tname.h" +#include "tsdb.h" #include "tskiplist.h" #include "tsqlfunction.h" #include "tstoken.h" diff --git a/src/query/src/qexecutor.c b/src/query/src/qExecutor.c similarity index 99% rename from src/query/src/qexecutor.c rename to src/query/src/qExecutor.c index 9348f702d0..b4f825a7c2 100644 --- a/src/query/src/qexecutor.c +++ b/src/query/src/qExecutor.c @@ -13,19 +13,19 @@ * along with this program. If not, see . */ #include "os.h" +#include "qFill.h" +#include "taosmsg.h" #include "tcache.h" #include "tglobal.h" -#include "qfill.h" -#include "taosmsg.h" #include "exception.h" #include "hash.h" -#include "qast.h" -#include "qexecutor.h" -#include "qresultbuf.h" +#include "qAst.h" +#include "qExecutor.h" +#include "qResultbuf.h" +#include "qUtil.h" #include "query.h" #include "queryLog.h" -#include "qutil.h" #include "tlosertree.h" #include "tscompression.h" #include "ttime.h" diff --git a/src/query/src/qextbuffer.c b/src/query/src/qExtbuffer.c similarity index 99% rename from src/query/src/qextbuffer.c rename to src/query/src/qExtbuffer.c index afcf902123..69c5f0e24f 100644 --- a/src/query/src/qextbuffer.c +++ b/src/query/src/qExtbuffer.c @@ -12,16 +12,15 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ +#include "qExtbuffer.h" #include "os.h" -#include "tulog.h" -#include "qextbuffer.h" +#include "queryLog.h" #include "taos.h" #include "taosdef.h" #include "taosmsg.h" #include "tsqlfunction.h" -#include "ttime.h" +#include "tulog.h" #include "tutil.h" -#include "queryLog.h" #define COLMODEL_GET_VAL(data, schema, allrow, rowId, colId) \ (data + (schema)->pFields[colId].offset * (allrow) + (rowId) * (schema)->pFields[colId].field.bytes) diff --git a/src/query/src/qfill.c b/src/query/src/qFill.c similarity index 99% rename from src/query/src/qfill.c rename to src/query/src/qFill.c index 65951a5b9e..9dec2598bc 100644 --- a/src/query/src/qfill.c +++ b/src/query/src/qFill.c @@ -13,9 +13,9 @@ * along with this program. If not, see . */ +#include "qFill.h" #include "os.h" -#include "qfill.h" -#include "qextbuffer.h" +#include "qExtbuffer.h" #include "taosdef.h" #include "taosmsg.h" #include "tsqlfunction.h" diff --git a/src/query/src/qfilterfunc.c b/src/query/src/qFilterfunc.c similarity index 99% rename from src/query/src/qfilterfunc.c rename to src/query/src/qFilterfunc.c index 6f336434e1..7e9f5c7da5 100644 --- a/src/query/src/qfilterfunc.c +++ b/src/query/src/qFilterfunc.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "os.h" -#include "qexecutor.h" +#include "qExecutor.h" #include "taosmsg.h" #include "tcompare.h" #include "tsqlfunction.h" diff --git a/src/query/src/qhistogram.c b/src/query/src/qHistogram.c similarity index 99% rename from src/query/src/qhistogram.c rename to src/query/src/qHistogram.c index 26482e9f14..7835d82469 100644 --- a/src/query/src/qhistogram.c +++ b/src/query/src/qHistogram.c @@ -14,7 +14,7 @@ */ #include "os.h" -#include "qhistogram.h" +#include "qHistogram.h" #include "taosdef.h" #include "taosmsg.h" #include "tlosertree.h" diff --git a/src/query/src/qparserImpl.c b/src/query/src/qParserImpl.c similarity index 100% rename from src/query/src/qparserImpl.c rename to src/query/src/qParserImpl.c diff --git a/src/query/src/qpercentile.c b/src/query/src/qPercentile.c similarity index 99% rename from src/query/src/qpercentile.c rename to src/query/src/qPercentile.c index dc5ecb796a..c4490a01e7 100644 --- a/src/query/src/qpercentile.c +++ b/src/query/src/qPercentile.c @@ -13,12 +13,12 @@ * along with this program. If not, see . */ +#include "qPercentile.h" #include "os.h" -#include "tulog.h" -#include "qpercentile.h" +#include "queryLog.h" #include "taosdef.h" #include "taosmsg.h" -#include "queryLog.h" +#include "tulog.h" tExtMemBuffer *releaseBucketsExceptFor(tMemBucket *pMemBucket, int16_t segIdx, int16_t slotIdx) { tExtMemBuffer *pBuffer = NULL; diff --git a/src/query/src/qresultbuf.c b/src/query/src/qResultbuf.c similarity index 99% rename from src/query/src/qresultbuf.c rename to src/query/src/qResultbuf.c index 646d8b7986..f2194bbfb5 100644 --- a/src/query/src/qresultbuf.c +++ b/src/query/src/qResultbuf.c @@ -1,6 +1,6 @@ -#include "qresultbuf.h" +#include "qResultbuf.h" #include "hash.h" -#include "qextbuffer.h" +#include "qExtbuffer.h" #include "queryLog.h" #include "taoserror.h" diff --git a/src/query/src/qsyntaxtreefunction.c b/src/query/src/qSyntaxtreefunction.c similarity index 99% rename from src/query/src/qsyntaxtreefunction.c rename to src/query/src/qSyntaxtreefunction.c index 5719bb0188..2104edfd91 100644 --- a/src/query/src/qsyntaxtreefunction.c +++ b/src/query/src/qSyntaxtreefunction.c @@ -15,7 +15,7 @@ #include "os.h" -#include "qsyntaxtreefunction.h" +#include "qSyntaxtreefunction.h" #include "taosdef.h" #include "tutil.h" diff --git a/src/query/src/qtokenizer.c b/src/query/src/qTokenizer.c similarity index 100% rename from src/query/src/qtokenizer.c rename to src/query/src/qTokenizer.c diff --git a/src/query/src/qtsbuf.c b/src/query/src/qTsbuf.c similarity index 99% rename from src/query/src/qtsbuf.c rename to src/query/src/qTsbuf.c index b84fbded38..20b29107f5 100644 --- a/src/query/src/qtsbuf.c +++ b/src/query/src/qTsbuf.c @@ -1,7 +1,7 @@ -#include "qtsbuf.h" +#include "qTsbuf.h" +#include "taoserror.h" #include "tscompression.h" #include "tutil.h" -#include "taoserror.h" static int32_t getDataStartOffset(); static void TSBufUpdateVnodeInfo(STSBuf* pTSBuf, int32_t index, STSVnodeBlockInfo* pBlockInfo); diff --git a/src/query/src/qutil.c b/src/query/src/qUtil.c similarity index 99% rename from src/query/src/qutil.c rename to src/query/src/qUtil.c index 4c3595b0be..be84471493 100644 --- a/src/query/src/qutil.c +++ b/src/query/src/qUtil.c @@ -19,8 +19,8 @@ #include "taosmsg.h" #include "ttime.h" -#include "qexecutor.h" -#include "qutil.h" +#include "qExecutor.h" +#include "qUtil.h" int32_t getOutputInterResultBufSize(SQuery* pQuery) { int32_t size = 0; diff --git a/src/query/tests/astTest.cpp b/src/query/tests/astTest.cpp index df27087216..99f03a7ff8 100644 --- a/src/query/tests/astTest.cpp +++ b/src/query/tests/astTest.cpp @@ -3,8 +3,8 @@ #include #include +#include "qAst.h" #include "taosmsg.h" -#include "qast.h" #include "tsdb.h" #include "tskiplist.h" diff --git a/src/query/tests/histogramTest.cpp b/src/query/tests/histogramTest.cpp index c23f0f5924..4a5f7fbbbe 100644 --- a/src/query/tests/histogramTest.cpp +++ b/src/query/tests/histogramTest.cpp @@ -9,7 +9,7 @@ #include "tstoken.h" #include "tutil.h" -#include "qhistogram.h" +#include "qHistogram.h" /* test validate the names for table/database */ TEST(testCase, histogram_binary_search) { diff --git a/src/query/tests/resultBufferTest.cpp b/src/query/tests/resultBufferTest.cpp index bf6f3bb50f..f822deeb73 100644 --- a/src/query/tests/resultBufferTest.cpp +++ b/src/query/tests/resultBufferTest.cpp @@ -2,7 +2,7 @@ #include #include -#include "qresultbuf.h" +#include "qResultbuf.h" #include "taos.h" #include "tsdb.h" diff --git a/src/query/tests/tsBufTest.cpp b/src/query/tests/tsBufTest.cpp index f813261957..e9827518e1 100644 --- a/src/query/tests/tsBufTest.cpp +++ b/src/query/tests/tsBufTest.cpp @@ -5,10 +5,10 @@ #include "taos.h" #include "tsdb.h" +#include "qTsbuf.h" #include "tstoken.h" #include "ttime.h" #include "tutil.h" -#include "qtsbuf.h" namespace { /** -- GitLab