MCOL-1532 Added accessors columnstore uses.10.2-w-columnstore

5 files changed, 15 insertions, 0 deletions

diff --git a/.gitmodules b/.gitmodules
index 6419657e501..36e6501e06b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,7 @@
 [submodule "storage/rocksdb/rocksdb"]
 	path = storage/rocksdb/rocksdb
 	url = https://github.com/facebook/rocksdb.git
+[submodule "columnstore"]
+	path = columnstore
+	url = https://github.com/drrtuy/mariadb-columnstore-engine
+	branch = MCOL-1532
diff --git a/columnstore b/columnstore
new file mode 160000
+Subproject cb1b66d02bf65943c4a66edd3d5d58fbd5dd4b2
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 78a9e384b55..b1c2cae6608 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -1593,6 +1593,7 @@ public:
     }
     return clone;
   } 
+  int get_first_expr_num() { return first_expr_num; }
 };
 
 /*
@@ -1997,6 +1998,7 @@ public:
   
   Item *get_copy(THD *thd, MEM_ROOT *mem_root)
   { return get_item_copy<Item_func_like>(thd, mem_root, this); }
+  bool is_negated() { return negated; }
 };
 
 
diff --git a/sql/item_sum.h b/sql/item_sum.h
index 5c446e5779d..19d9268868c 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -579,6 +579,7 @@ public:
   void mark_as_window_func_sum_expr() { window_func_sum_expr_flag= true; }
   bool is_window_func_sum_expr() { return window_func_sum_expr_flag; }
   virtual void setup_caches(THD *thd) {};
+  Item **get_orig_args() { return orig_args; }
 };
 
 
@@ -1687,6 +1688,11 @@ public:
     { context= (Name_resolution_context *)cntx; return FALSE; }
   Item *get_copy(THD *thd, MEM_ROOT *mem_root)
   { return get_item_copy<Item_func_group_concat>(thd, mem_root, this); }
+  bool is_distinct() { return distinct; }
+  uint count_field() { return arg_count_field; }
+  uint order_field() { return arg_count_order; }
+  String* str_separator() { return separator; }
+  ORDER** get_order() { return order; }
 };
 
 #endif /* ITEM_SUM_INCLUDED */
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 354a54a5c1a..e3a9158c25c 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -1068,6 +1068,7 @@ public:
   bool need_parentheses_in_default() { return true; }
   Item *get_copy(THD *thd, MEM_ROOT *mem_root)
   { return get_item_copy<Item_char_typecast>(thd, mem_root, this); }
+  uint get_cast_length() { return cast_length; }
 };
 
 
@@ -1154,6 +1155,7 @@ public:
   const char *func_name() const { return "add_time"; }
   Item *get_copy(THD *thd, MEM_ROOT *mem_root)
   { return get_item_copy<Item_func_add_time>(thd, mem_root, this); }
+  int get_sign() { return sign; }
 };
 
 class Item_func_timediff :public Item_timefunc
@@ -1228,6 +1230,7 @@ public:
   virtual void print(String *str, enum_query_type query_type);
   Item *get_copy(THD *thd, MEM_ROOT *mem_root)
   { return get_item_copy<Item_func_timestamp_diff>(thd, mem_root, this); }
+  const interval_type get_int_type() { return int_type; };
 };