TD-4088

src/common/inc/tdataformat.h

@@ -15,10 +15,7 @@
 #ifndef _TD_DATA_FORMAT_H_
 #define _TD_DATA_FORMAT_H_
 
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "os.h"
 #include "talgo.h"
 #include "ttype.h"
 #include "tutil.h"

src/inc/taosdef.h

@@ -22,7 +22,6 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "osDef.h"
 #include "taos.h"
 
 #define TSDB__packed

src/inc/ttype.h

@@ -5,6 +5,8 @@
 extern "C" {
 #endif
 
+#include <stdbool.h>
+#include <stdint.h>
 #include "taosdef.h"
 
 // ----------------- For variable data types such as TSDB_DATA_TYPE_BINARY and TSDB_DATA_TYPE_NCHAR

src/os/inc/osInc.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_LINUX64_H
-#define TDENGINE_OS_LINUX64_H
+#ifndef TDENGINE_OS_INC_H
+#define TDENGINE_OS_INC_H
 
 #ifdef __cplusplus
 extern "C" {

src/util/src/exception.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "os.h"
 #include "exception.h"
 
-
 static threadlocal SExceptionNode* expList;
 
 void exceptionPushNode( SExceptionNode* node ) {

src/util/src/tarray.c

@@ -13,6 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "os.h"
 #include "tarray.h"
 
 void* taosArrayInit(size_t size, size_t elemSize) {

src/util/src/tbase64.c

-/**
- * Copyright (c) 2006-2008 Apple Inc. All rights reserved.
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "os.h"
 
 // deprecated this file for bug prone
 // base64 encode

src/util/src/tbuffer.c

@@ -14,12 +14,9 @@
  */
 
 #include "os.h"
-#include <stdlib.h>
-#include <memory.h>
-#include <assert.h>
 #include "tbuffer.h"
 #include "exception.h"
-#include <taoserror.h>
+#include "taoserror.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // reader functions

src/util/src/tcompare.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "os.h"
 #include "ttype.h"
 #include "tcompare.h"
 #include "tarray.h"

src/util/src/tcompression.c

@@ -47,8 +47,8 @@
  *
  */
 
-#include "lz4.h"
 #include "os.h"
+#include "lz4.h"
 #include "taosdef.h"
 #include "tscompression.h"
 #include "tulog.h"

src/util/src/tcrc32c.c

@@ -17,6 +17,7 @@
 	  misrepresented as being the original software.
 	  3. This notice may not be removed or altered from any source distribution.
 	*/
+
 #ifndef _TD_ARM_
 #include <nmmintrin.h>
 #endif

src/util/src/tdes.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "os.h"
 #include "tkey.h"

src/util/src/terror.c

 /*
- * Copyright (c) 2020 TAOS Data, Inc. <jhtao@taosdata.com>
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
  *
  * This program is free software: you can use, redistribute, and/or modify
  * it under the terms of the GNU Affero General Public License, version 3
@@ -13,10 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
+#include "os.h"
 
 #define TAOS_ERROR_C
  

src/util/src/thashutil.c

-/**
- * MurmurHash3 by Austin Appleby
- * @ref
- * https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
  *
- * Plese refers to the link above for the complete implementation of
- * MurmurHash algorithm
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
  *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include "os.h"
 #include "hashfunc.h"
 #include "tutil.h"
 

src/util/src/tidpool.c

@@ -15,7 +15,6 @@
 
 #include "os.h"
 #include "tulog.h"
-#include <stdbool.h>
 
 typedef struct {
   int             maxId;

src/util/src/tlist.c

@@ -12,9 +12,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdlib.h>
-#include <string.h>
 
+#include "os.h"
 #include "tlist.h"
 
 SList *tdListNew(int eleSize) {

src/util/src/tlockfree.c

@@ -12,9 +12,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-// #define _GNU_SOURCE
-// #include <pthread.h>
 
+#include "os.h"
 #include "tlockfree.h"
 
 #define TD_RWLATCH_WRITE_FLAG 0x40000000

src/util/src/tlosertree.c

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tlosertree.h"
 #include "os.h"
+#include "tlosertree.h"
 #include "taosmsg.h"
 #include "tulog.h"
 

src/util/src/tmd5.c

@@ -33,10 +33,8 @@
  ***********************************************************************
  */
 
+#include "os.h"
 #include "tmd5.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "taosdef.h"
 
 /* forward declaration */