From 102d667253646d5b710090a9ec8cbecc4e800501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 20:21:27 +0800
Subject: [PATCH 01/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90111=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/misc.xml | 1 +
.idea/workspace.xml | 298 ++++++------------
.../edu/hust/conf/ConfigurationManager.java | 2 +-
3 files changed, 93 insertions(+), 208 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 344f653..a48fac4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,6 +6,7 @@
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f042c63..c99b438 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,14 +1,13 @@
+
+
+
-
-
+
+
-
-
-
-
@@ -136,27 +135,22 @@
true
DEFINITION_ORDER
-
-
-
-
-
-
-
+
+
+ {
+ "associatedIndex": 8
+}
+
@@ -278,17 +272,26 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -299,19 +302,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -319,219 +310,133 @@
+
+
+
+
+
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
@@ -551,6 +456,9 @@
+
+
+
1529592741848
@@ -669,47 +577,23 @@
-
+
-
-
-
-
-
-
-
-
-
diff --git a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
index dbae85b..bf8915a 100644
--- a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
+++ b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
@@ -3,7 +3,7 @@ package cn.edu.hust.conf;
import java.io.InputStream;
import java.util.Properties;
-/**
+/**111
* 配置文件管理类
* 主要的功能:从特定的properties文件中读取相应的key/value
*/
From 584f1db48f1c29359e388d787212801bfec86bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=B0=8F=E5=A8=9C?= <1253094786@qq.com>
Date: Mon, 16 Dec 2024 20:35:09 +0800
Subject: [PATCH 02/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=9011?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/compiler.xml | 2 +-
.idea/libraries/Maven__antlr_antlr_2_7_7.xml | 13 -
.idea/libraries/Maven__asm_asm_3_1.xml | 13 -
.../Maven__com_101tec_zkclient_0_3.xml | 13 -
.../Maven__com_alibaba_fastjson_1_1_41.xml | 13 -
...com_clearspring_analytics_stream_2_7_0.xml | 13 -
...n__com_esotericsoftware_kryo_kryo_2_21.xml | 13 -
...com_esotericsoftware_minlog_minlog_1_2.xml | 13 -
...ware_reflectasm_reflectasm_shaded_1_07.xml | 13 -
...jackson_core_jackson_annotations_2_4_3.xml | 13 -
...terxml_jackson_core_jackson_core_2_4_3.xml | 13 -
...ml_jackson_core_jackson_databind_2_4_3.xml | 13 -
...module_jackson_module_scala_2_10_2_4_4.xml | 13 -
..._com_google_code_findbugs_jsr305_1_3_9.xml | 13 -
...Maven__com_google_code_gson_gson_2_2_4.xml | 13 -
.../Maven__com_google_guava_guava_14_0_1.xml | 13 -
...om_google_protobuf_protobuf_java_2_5_0.xml | 13 -
...com_googlecode_javaewah_JavaEWAH_0_3_2.xml | 13 -
...Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml | 13 -
.../Maven__com_ning_compress_lzf_1_0_3.xml | 13 -
...aven__com_sun_jersey_jersey_client_1_9.xml | 13 -
.../Maven__com_sun_jersey_jersey_core_1_9.xml | 13 -
...aven__com_sun_jersey_jersey_server_1_9.xml | 13 -
...m_thoughtworks_paranamer_paranamer_2_6.xml | 13 -
.../Maven__com_twitter_chill_2_10_0_5_0.xml | 13 -
.../Maven__com_twitter_chill_java_0_5_0.xml | 13 -
...om_twitter_parquet_hadoop_bundle_1_6_0.xml | 13 -
...m_typesafe_akka_akka_actor_2_10_2_3_11.xml | 13 -
..._typesafe_akka_akka_remote_2_10_2_3_11.xml | 13 -
...m_typesafe_akka_akka_slf4j_2_10_2_3_11.xml | 13 -
.../Maven__com_typesafe_config_1_2_1.xml | 13 -
..._com_yammer_metrics_metrics_core_2_2_0.xml | 13 -
...mons_beanutils_commons_beanutils_1_7_0.xml | 13 -
...beanutils_commons_beanutils_core_1_8_0.xml | 13 -
.../Maven__commons_cli_commons_cli_1_2.xml | 13 -
...aven__commons_codec_commons_codec_1_10.xml | 13 -
..._collections_commons_collections_3_2_2.xml | 13 -
...onfiguration_commons_configuration_1_6.xml | 13 -
.../Maven__commons_dbcp_commons_dbcp_1_4.xml | 13 -
..._commons_digester_commons_digester_1_8.xml | 13 -
...mons_httpclient_commons_httpclient_3_1.xml | 13 -
.../Maven__commons_io_commons_io_2_4.xml | 13 -
.../Maven__commons_lang_commons_lang_2_4.xml | 13 -
..._commons_logging_commons_logging_1_1_3.xml | 13 -
.../Maven__commons_net_commons_net_2_2.xml | 13 -
...Maven__commons_pool_commons_pool_1_5_4.xml | 13 -
..._dropwizard_metrics_metrics_core_3_1_2.xml | 13 -
...pwizard_metrics_metrics_graphite_3_1_2.xml | 13 -
..._dropwizard_metrics_metrics_json_3_1_2.xml | 13 -
...o_dropwizard_metrics_metrics_jvm_3_1_2.xml | 13 -
.../Maven__io_netty_netty_3_8_0_Final.xml | 13 -
...Maven__io_netty_netty_all_4_0_29_Final.xml | 13 -
...Maven__javax_activation_activation_1_1.xml | 13 -
.../Maven__javax_jdo_jdo_api_3_0_1.xml | 13 -
.../Maven__javax_servlet_servlet_api_2_5.xml | 13 -
.../Maven__javax_transaction_jta_1_1.xml | 13 -
.../Maven__javax_xml_bind_jaxb_api_2_2_2.xml | 13 -
...Maven__javax_xml_stream_stax_api_1_0_2.xml | 13 -
.../Maven__javolution_javolution_5_5_1.xml | 13 -
.idea/libraries/Maven__jline_jline_2_12.xml | 13 -
.../Maven__joda_time_joda_time_2_5.xml | 13 -
.idea/libraries/Maven__junit_junit_4_12.xml | 13 -
...aven__log4j_apache_log4j_extras_1_2_17.xml | 13 -
.idea/libraries/Maven__log4j_log4j_1_2_17.xml | 13 -
...aven__mysql_mysql_connector_java_5_1_6.xml | 13 -
..._hydromatic_eigenbase_properties_1_1_5.xml | 13 -
...aven__net_java_dev_jets3t_jets3t_0_7_1.xml | 13 -
.../Maven__net_jpountz_lz4_lz4_1_3_0.xml | 13 -
.../Maven__net_razorvine_pyrolite_4_4.xml | 13 -
.../Maven__net_sf_opencsv_opencsv_2_3.xml | 13 -
.../Maven__net_sf_py4j_py4j_0_8_2_1.xml | 13 -
.../libraries/Maven__org_antlr_ST4_4_0_4.xml | 13 -
.../Maven__org_antlr_antlr_runtime_3_4.xml | 13 -
.../Maven__org_antlr_stringtemplate_3_2_1.xml | 13 -
.../Maven__org_apache_avro_avro_1_7_7.xml | 13 -
.../Maven__org_apache_avro_avro_ipc_1_7_7.xml | 13 -
...__org_apache_avro_avro_ipc_tests_1_7_7.xml | 13 -
..._apache_avro_avro_mapred_hadoop2_1_7_7.xml | 13 -
...lcite_calcite_avatica_1_2_0_incubating.xml | 13 -
..._calcite_calcite_core_1_2_0_incubating.xml | 13 -
...alcite_calcite_linq4j_1_2_0_incubating.xml | 13 -
..._apache_commons_commons_compress_1_4_1.xml | 13 -
...org_apache_commons_commons_lang3_3_3_2.xml | 13 -
...org_apache_commons_commons_math3_3_4_1.xml | 13 -
...urator_curator_client_2_1_0_incubating.xml | 13 -
...apache_curator_curator_framework_2_4_0.xml | 13 -
...g_apache_curator_curator_recipes_2_4_0.xml | 13 -
...aven__org_apache_derby_derby_10_10_2_0.xml | 13 -
...e_directory_api_api_asn1_api_1_0_0_M20.xml | 13 -
...pache_directory_api_api_util_1_0_0_M20.xml | 13 -
...rectory_server_apacheds_i18n_2_0_0_M15.xml | 13 -
...rver_apacheds_kerberos_codec_2_0_0_M15.xml | 13 -
...apache_hadoop_hadoop_annotations_2_6_4.xml | 13 -
...n__org_apache_hadoop_hadoop_auth_2_6_4.xml | 13 -
..._org_apache_hadoop_hadoop_client_2_6_4.xml | 13 -
..._org_apache_hadoop_hadoop_common_2_6_4.xml | 13 -
...n__org_apache_hadoop_hadoop_hdfs_2_6_4.xml | 13 -
...doop_hadoop_mapreduce_client_app_2_6_4.xml | 13 -
...p_hadoop_mapreduce_client_common_2_6_4.xml | 13 -
...oop_hadoop_mapreduce_client_core_2_6_4.xml | 13 -
...adoop_mapreduce_client_jobclient_2_6_4.xml | 13 -
..._hadoop_mapreduce_client_shuffle_2_6_4.xml | 13 -
...rg_apache_hadoop_hadoop_yarn_api_2_6_4.xml | 13 -
...apache_hadoop_hadoop_yarn_client_2_6_4.xml | 13 -
...apache_hadoop_hadoop_yarn_common_2_6_4.xml | 13 -
...hadoop_hadoop_yarn_server_common_2_6_4.xml | 13 -
...apache_httpcomponents_httpclient_4_3_2.xml | 13 -
...g_apache_httpcomponents_httpcore_4_3_1.xml | 13 -
.../Maven__org_apache_ivy_ivy_2_4_0.xml | 13 -
...n__org_apache_kafka_kafka_2_10_0_8_2_1.xml | 13 -
...org_apache_kafka_kafka_clients_0_8_2_1.xml | 13 -
...che_mesos_mesos_shaded_protobuf_0_21_1.xml | 13 -
...rg_apache_parquet_parquet_column_1_7_0.xml | 13 -
...rg_apache_parquet_parquet_common_1_7_0.xml | 13 -
..._apache_parquet_parquet_encoding_1_7_0.xml | 13 -
...arquet_parquet_format_2_3_0_incubating.xml | 13 -
...apache_parquet_parquet_generator_1_7_0.xml | 13 -
...rg_apache_parquet_parquet_hadoop_1_7_0.xml | 13 -
...g_apache_parquet_parquet_jackson_1_7_0.xml | 13 -
...apache_spark_spark_catalyst_2_10_1_5_1.xml | 13 -
...org_apache_spark_spark_core_2_10_1_5_1.xml | 13 -
...org_apache_spark_spark_hive_2_10_1_5_1.xml | 13 -
...apache_spark_spark_launcher_2_10_1_5_1.xml | 13 -
..._spark_spark_network_common_2_10_1_5_1.xml | 13 -
...spark_spark_network_shuffle_2_10_1_5_1.xml | 13 -
..._org_apache_spark_spark_sql_2_10_1_5_1.xml | 13 -
...pache_spark_spark_streaming_2_10_1_5_1.xml | 13 -
...spark_spark_streaming_kafka_2_10_1_5_1.xml | 13 -
...g_apache_spark_spark_unsafe_2_10_1_5_1.xml | 13 -
...aven__org_apache_thrift_libfb303_0_9_2.xml | 13 -
...ven__org_apache_thrift_libthrift_0_9_2.xml | 13 -
...__org_apache_zookeeper_zookeeper_3_4_5.xml | 13 -
...__org_codehaus_groovy_groovy_all_2_1_6.xml | 13 -
...dehaus_jackson_jackson_core_asl_1_9_13.xml | 13 -
..._codehaus_jackson_jackson_jaxrs_1_9_13.xml | 13 -
...haus_jackson_jackson_mapper_asl_1_9_13.xml | 13 -
...org_codehaus_jackson_jackson_xc_1_9_13.xml | 13 -
...codehaus_janino_commons_compiler_2_7_6.xml | 13 -
...aven__org_codehaus_janino_janino_2_7_8.xml | 13 -
..._datanucleus_datanucleus_api_jdo_3_2_6.xml | 13 -
...rg_datanucleus_datanucleus_core_3_2_10.xml | 13 -
...rg_datanucleus_datanucleus_rdbms_3_2_9.xml | 13 -
...rbit_javax_servlet_3_0_0_v201112011016.xml | 13 -
...sesource_leveldbjni_leveldbjni_all_1_8.xml | 13 -
.../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 -
.../Maven__org_htrace_htrace_core_3_0_4.xml | 13 -
.../Maven__org_iq80_snappy_snappy_0_2.xml | 13 -
.../Maven__org_jodd_jodd_core_3_5_2.xml | 13 -
...ven__org_json4s_json4s_ast_2_10_3_2_10.xml | 13 -
...en__org_json4s_json4s_core_2_10_3_2_10.xml | 13 -
..._org_json4s_json4s_jackson_2_10_3_2_10.xml | 13 -
.../Maven__org_json_json_20090211.xml | 13 -
...n__org_mortbay_jetty_jetty_util_6_1_26.xml | 13 -
.../Maven__org_objenesis_objenesis_1_2.xml | 13 -
..._org_roaringbitmap_RoaringBitmap_0_4_5.xml | 13 -
...__org_scala_lang_scala_compiler_2_10_0.xml | 13 -
...n__org_scala_lang_scala_library_2_10_4.xml | 13 -
...n__org_scala_lang_scala_reflect_2_10_4.xml | 13 -
.../Maven__org_scala_lang_scalap_2_10_0.xml | 13 -
...Maven__org_slf4j_jcl_over_slf4j_1_7_10.xml | 13 -
.../Maven__org_slf4j_jul_to_slf4j_1_7_10.xml | 13 -
.../Maven__org_slf4j_slf4j_api_1_7_10.xml | 13 -
.../Maven__org_slf4j_slf4j_log4j12_1_7_10.xml | 13 -
...ark_project_hive_hive_exec_1_2_1_spark.xml | 13 -
...roject_hive_hive_metastore_1_2_1_spark.xml | 13 -
...__org_spark_project_spark_unused_1_0_0.xml | 13 -
...rg_tachyonproject_tachyon_client_0_7_1.xml | 13 -
...hyonproject_tachyon_underfs_hdfs_0_7_1.xml | 13 -
...yonproject_tachyon_underfs_local_0_7_1.xml | 13 -
.idea/libraries/Maven__org_tukaani_xz_1_0.xml | 13 -
...uncommons_maths_uncommons_maths_1_2_2a.xml | 13 -
..._org_xerial_snappy_snappy_java_1_1_1_7.xml | 13 -
.idea/libraries/Maven__oro_oro_2_0_8.xml | 13 -
.../libraries/Maven__stax_stax_api_1_0_1.xml | 13 -
.../Maven__xerces_xercesImpl_2_9_1.xml | 13 -
.../Maven__xml_apis_xml_apis_1_3_04.xml | 13 -
.idea/libraries/Maven__xmlenc_xmlenc_0_52.xml | 13 -
.idea/workspace.xml | 279 +++++-------------
UserActionAnalyzePlatform.iml | 184 +-----------
src/main/java/cn/edu/hust/util/DateUtils.java | 2 +-
180 files changed, 77 insertions(+), 2678 deletions(-)
delete mode 100644 .idea/libraries/Maven__antlr_antlr_2_7_7.xml
delete mode 100644 .idea/libraries/Maven__asm_asm_3_1.xml
delete mode 100644 .idea/libraries/Maven__com_101tec_zkclient_0_3.xml
delete mode 100644 .idea/libraries/Maven__com_alibaba_fastjson_1_1_41.xml
delete mode 100644 .idea/libraries/Maven__com_clearspring_analytics_stream_2_7_0.xml
delete mode 100644 .idea/libraries/Maven__com_esotericsoftware_kryo_kryo_2_21.xml
delete mode 100644 .idea/libraries/Maven__com_esotericsoftware_minlog_minlog_1_2.xml
delete mode 100644 .idea/libraries/Maven__com_esotericsoftware_reflectasm_reflectasm_shaded_1_07.xml
delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_3.xml
delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_3.xml
delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml
delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_scala_2_10_2_4_4.xml
delete mode 100644 .idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
delete mode 100644 .idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
delete mode 100644 .idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
delete mode 100644 .idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml
delete mode 100644 .idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_3_2.xml
delete mode 100644 .idea/libraries/Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml
delete mode 100644 .idea/libraries/Maven__com_ning_compress_lzf_1_0_3.xml
delete mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml
delete mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml
delete mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml
delete mode 100644 .idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_6.xml
delete mode 100644 .idea/libraries/Maven__com_twitter_chill_2_10_0_5_0.xml
delete mode 100644 .idea/libraries/Maven__com_twitter_chill_java_0_5_0.xml
delete mode 100644 .idea/libraries/Maven__com_twitter_parquet_hadoop_bundle_1_6_0.xml
delete mode 100644 .idea/libraries/Maven__com_typesafe_akka_akka_actor_2_10_2_3_11.xml
delete mode 100644 .idea/libraries/Maven__com_typesafe_akka_akka_remote_2_10_2_3_11.xml
delete mode 100644 .idea/libraries/Maven__com_typesafe_akka_akka_slf4j_2_10_2_3_11.xml
delete mode 100644 .idea/libraries/Maven__com_typesafe_config_1_2_1.xml
delete mode 100644 .idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml
delete mode 100644 .idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml
delete mode 100644 .idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml
delete mode 100644 .idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
delete mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
delete mode 100644 .idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
delete mode 100644 .idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
delete mode 100644 .idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml
delete mode 100644 .idea/libraries/Maven__commons_digester_commons_digester_1_8.xml
delete mode 100644 .idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
delete mode 100644 .idea/libraries/Maven__commons_io_commons_io_2_4.xml
delete mode 100644 .idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
delete mode 100644 .idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
delete mode 100644 .idea/libraries/Maven__commons_net_commons_net_2_2.xml
delete mode 100644 .idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml
delete mode 100644 .idea/libraries/Maven__io_dropwizard_metrics_metrics_core_3_1_2.xml
delete mode 100644 .idea/libraries/Maven__io_dropwizard_metrics_metrics_graphite_3_1_2.xml
delete mode 100644 .idea/libraries/Maven__io_dropwizard_metrics_metrics_json_3_1_2.xml
delete mode 100644 .idea/libraries/Maven__io_dropwizard_metrics_metrics_jvm_3_1_2.xml
delete mode 100644 .idea/libraries/Maven__io_netty_netty_3_8_0_Final.xml
delete mode 100644 .idea/libraries/Maven__io_netty_netty_all_4_0_29_Final.xml
delete mode 100644 .idea/libraries/Maven__javax_activation_activation_1_1.xml
delete mode 100644 .idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml
delete mode 100644 .idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
delete mode 100644 .idea/libraries/Maven__javax_transaction_jta_1_1.xml
delete mode 100644 .idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml
delete mode 100644 .idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
delete mode 100644 .idea/libraries/Maven__javolution_javolution_5_5_1.xml
delete mode 100644 .idea/libraries/Maven__jline_jline_2_12.xml
delete mode 100644 .idea/libraries/Maven__joda_time_joda_time_2_5.xml
delete mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml
delete mode 100644 .idea/libraries/Maven__log4j_apache_log4j_extras_1_2_17.xml
delete mode 100644 .idea/libraries/Maven__log4j_log4j_1_2_17.xml
delete mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml
delete mode 100644 .idea/libraries/Maven__net_hydromatic_eigenbase_properties_1_1_5.xml
delete mode 100644 .idea/libraries/Maven__net_java_dev_jets3t_jets3t_0_7_1.xml
delete mode 100644 .idea/libraries/Maven__net_jpountz_lz4_lz4_1_3_0.xml
delete mode 100644 .idea/libraries/Maven__net_razorvine_pyrolite_4_4.xml
delete mode 100644 .idea/libraries/Maven__net_sf_opencsv_opencsv_2_3.xml
delete mode 100644 .idea/libraries/Maven__net_sf_py4j_py4j_0_8_2_1.xml
delete mode 100644 .idea/libraries/Maven__org_antlr_ST4_4_0_4.xml
delete mode 100644 .idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
delete mode 100644 .idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_avro_avro_1_7_7.xml
delete mode 100644 .idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_7.xml
delete mode 100644 .idea/libraries/Maven__org_apache_avro_avro_ipc_tests_1_7_7.xml
delete mode 100644 .idea/libraries/Maven__org_apache_avro_avro_mapred_hadoop2_1_7_7.xml
delete mode 100644 .idea/libraries/Maven__org_apache_calcite_calcite_avatica_1_2_0_incubating.xml
delete mode 100644 .idea/libraries/Maven__org_apache_calcite_calcite_core_1_2_0_incubating.xml
delete mode 100644 .idea/libraries/Maven__org_apache_calcite_calcite_linq4j_1_2_0_incubating.xml
delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_math3_3_4_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_curator_curator_client_2_1_0_incubating.xml
delete mode 100644 .idea/libraries/Maven__org_apache_curator_curator_framework_2_4_0.xml
delete mode 100644 .idea/libraries/Maven__org_apache_curator_curator_recipes_2_4_0.xml
delete mode 100644 .idea/libraries/Maven__org_apache_derby_derby_10_10_2_0.xml
delete mode 100644 .idea/libraries/Maven__org_apache_directory_api_api_asn1_api_1_0_0_M20.xml
delete mode 100644 .idea/libraries/Maven__org_apache_directory_api_api_util_1_0_0_M20.xml
delete mode 100644 .idea/libraries/Maven__org_apache_directory_server_apacheds_i18n_2_0_0_M15.xml
delete mode 100644 .idea/libraries/Maven__org_apache_directory_server_apacheds_kerberos_codec_2_0_0_M15.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_client_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_app_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_common_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_core_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_jobclient_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_shuffle_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_api_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_client_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_common_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_server_common_2_6_4.xml
delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_2.xml
delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_ivy_ivy_2_4_0.xml
delete mode 100644 .idea/libraries/Maven__org_apache_kafka_kafka_2_10_0_8_2_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_kafka_kafka_clients_0_8_2_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_mesos_mesos_shaded_protobuf_0_21_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_column_1_7_0.xml
delete mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_common_1_7_0.xml
delete mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_encoding_1_7_0.xml
delete mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_format_2_3_0_incubating.xml
delete mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_generator_1_7_0.xml
delete mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_hadoop_1_7_0.xml
delete mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_jackson_1_7_0.xml
delete mode 100644 .idea/libraries/Maven__org_apache_spark_spark_catalyst_2_10_1_5_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_spark_spark_core_2_10_1_5_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_spark_spark_hive_2_10_1_5_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_spark_spark_launcher_2_10_1_5_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_spark_spark_network_common_2_10_1_5_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_spark_spark_network_shuffle_2_10_1_5_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_spark_spark_sql_2_10_1_5_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_spark_spark_streaming_2_10_1_5_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_spark_spark_streaming_kafka_2_10_1_5_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_spark_spark_unsafe_2_10_1_5_1.xml
delete mode 100644 .idea/libraries/Maven__org_apache_thrift_libfb303_0_9_2.xml
delete mode 100644 .idea/libraries/Maven__org_apache_thrift_libthrift_0_9_2.xml
delete mode 100644 .idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_5.xml
delete mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_1_6.xml
delete mode 100644 .idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml
delete mode 100644 .idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_9_13.xml
delete mode 100644 .idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml
delete mode 100644 .idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_9_13.xml
delete mode 100644 .idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml
delete mode 100644 .idea/libraries/Maven__org_codehaus_janino_janino_2_7_8.xml
delete mode 100644 .idea/libraries/Maven__org_datanucleus_datanucleus_api_jdo_3_2_6.xml
delete mode 100644 .idea/libraries/Maven__org_datanucleus_datanucleus_core_3_2_10.xml
delete mode 100644 .idea/libraries/Maven__org_datanucleus_datanucleus_rdbms_3_2_9.xml
delete mode 100644 .idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml
delete mode 100644 .idea/libraries/Maven__org_fusesource_leveldbjni_leveldbjni_all_1_8.xml
delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
delete mode 100644 .idea/libraries/Maven__org_htrace_htrace_core_3_0_4.xml
delete mode 100644 .idea/libraries/Maven__org_iq80_snappy_snappy_0_2.xml
delete mode 100644 .idea/libraries/Maven__org_jodd_jodd_core_3_5_2.xml
delete mode 100644 .idea/libraries/Maven__org_json4s_json4s_ast_2_10_3_2_10.xml
delete mode 100644 .idea/libraries/Maven__org_json4s_json4s_core_2_10_3_2_10.xml
delete mode 100644 .idea/libraries/Maven__org_json4s_json4s_jackson_2_10_3_2_10.xml
delete mode 100644 .idea/libraries/Maven__org_json_json_20090211.xml
delete mode 100644 .idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml
delete mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_1_2.xml
delete mode 100644 .idea/libraries/Maven__org_roaringbitmap_RoaringBitmap_0_4_5.xml
delete mode 100644 .idea/libraries/Maven__org_scala_lang_scala_compiler_2_10_0.xml
delete mode 100644 .idea/libraries/Maven__org_scala_lang_scala_library_2_10_4.xml
delete mode 100644 .idea/libraries/Maven__org_scala_lang_scala_reflect_2_10_4.xml
delete mode 100644 .idea/libraries/Maven__org_scala_lang_scalap_2_10_0.xml
delete mode 100644 .idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_10.xml
delete mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_10.xml
delete mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_10.xml
delete mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_10.xml
delete mode 100644 .idea/libraries/Maven__org_spark_project_hive_hive_exec_1_2_1_spark.xml
delete mode 100644 .idea/libraries/Maven__org_spark_project_hive_hive_metastore_1_2_1_spark.xml
delete mode 100644 .idea/libraries/Maven__org_spark_project_spark_unused_1_0_0.xml
delete mode 100644 .idea/libraries/Maven__org_tachyonproject_tachyon_client_0_7_1.xml
delete mode 100644 .idea/libraries/Maven__org_tachyonproject_tachyon_underfs_hdfs_0_7_1.xml
delete mode 100644 .idea/libraries/Maven__org_tachyonproject_tachyon_underfs_local_0_7_1.xml
delete mode 100644 .idea/libraries/Maven__org_tukaani_xz_1_0.xml
delete mode 100644 .idea/libraries/Maven__org_uncommons_maths_uncommons_maths_1_2_2a.xml
delete mode 100644 .idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_1_7.xml
delete mode 100644 .idea/libraries/Maven__oro_oro_2_0_8.xml
delete mode 100644 .idea/libraries/Maven__stax_stax_api_1_0_1.xml
delete mode 100644 .idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
delete mode 100644 .idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml
delete mode 100644 .idea/libraries/Maven__xmlenc_xmlenc_0_52.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 6e7df1b..dcba7cb 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -10,7 +10,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
deleted file mode 100644
index b8d93d8..0000000
--- a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__asm_asm_3_1.xml b/.idea/libraries/Maven__asm_asm_3_1.xml
deleted file mode 100644
index 3386f10..0000000
--- a/.idea/libraries/Maven__asm_asm_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_101tec_zkclient_0_3.xml b/.idea/libraries/Maven__com_101tec_zkclient_0_3.xml
deleted file mode 100644
index f202d28..0000000
--- a/.idea/libraries/Maven__com_101tec_zkclient_0_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_1_41.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_1_41.xml
deleted file mode 100644
index 08dbed5..0000000
--- a/.idea/libraries/Maven__com_alibaba_fastjson_1_1_41.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_clearspring_analytics_stream_2_7_0.xml b/.idea/libraries/Maven__com_clearspring_analytics_stream_2_7_0.xml
deleted file mode 100644
index 1980df6..0000000
--- a/.idea/libraries/Maven__com_clearspring_analytics_stream_2_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_esotericsoftware_kryo_kryo_2_21.xml b/.idea/libraries/Maven__com_esotericsoftware_kryo_kryo_2_21.xml
deleted file mode 100644
index 517684f..0000000
--- a/.idea/libraries/Maven__com_esotericsoftware_kryo_kryo_2_21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_esotericsoftware_minlog_minlog_1_2.xml b/.idea/libraries/Maven__com_esotericsoftware_minlog_minlog_1_2.xml
deleted file mode 100644
index f926eec..0000000
--- a/.idea/libraries/Maven__com_esotericsoftware_minlog_minlog_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_esotericsoftware_reflectasm_reflectasm_shaded_1_07.xml b/.idea/libraries/Maven__com_esotericsoftware_reflectasm_reflectasm_shaded_1_07.xml
deleted file mode 100644
index 39b43af..0000000
--- a/.idea/libraries/Maven__com_esotericsoftware_reflectasm_reflectasm_shaded_1_07.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_3.xml
deleted file mode 100644
index 42a8d5b..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_3.xml
deleted file mode 100644
index fc3ea3f..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml
deleted file mode 100644
index 567d7e5..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_scala_2_10_2_4_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_scala_2_10_2_4_4.xml
deleted file mode 100644
index 29ba609..0000000
--- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_scala_2_10_2_4_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
deleted file mode 100644
index 0e66824..0000000
--- a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
deleted file mode 100644
index 4533c1b..0000000
--- a/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml b/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
deleted file mode 100644
index b71e220..0000000
--- a/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml
deleted file mode 100644
index c06d3a1..0000000
--- a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_3_2.xml b/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_3_2.xml
deleted file mode 100644
index 061f3a1..0000000
--- a/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_3_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml b/.idea/libraries/Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml
deleted file mode 100644
index c24800a..0000000
--- a/.idea/libraries/Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_ning_compress_lzf_1_0_3.xml b/.idea/libraries/Maven__com_ning_compress_lzf_1_0_3.xml
deleted file mode 100644
index 322a3c2..0000000
--- a/.idea/libraries/Maven__com_ning_compress_lzf_1_0_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml
deleted file mode 100644
index 4c22f08..0000000
--- a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml
deleted file mode 100644
index abd3e5d..0000000
--- a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml
deleted file mode 100644
index 717467f..0000000
--- a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_6.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_6.xml
deleted file mode 100644
index 465a468..0000000
--- a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_twitter_chill_2_10_0_5_0.xml b/.idea/libraries/Maven__com_twitter_chill_2_10_0_5_0.xml
deleted file mode 100644
index 08c3ced..0000000
--- a/.idea/libraries/Maven__com_twitter_chill_2_10_0_5_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_twitter_chill_java_0_5_0.xml b/.idea/libraries/Maven__com_twitter_chill_java_0_5_0.xml
deleted file mode 100644
index 2f68aba..0000000
--- a/.idea/libraries/Maven__com_twitter_chill_java_0_5_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_twitter_parquet_hadoop_bundle_1_6_0.xml b/.idea/libraries/Maven__com_twitter_parquet_hadoop_bundle_1_6_0.xml
deleted file mode 100644
index 7ec1c2f..0000000
--- a/.idea/libraries/Maven__com_twitter_parquet_hadoop_bundle_1_6_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_typesafe_akka_akka_actor_2_10_2_3_11.xml b/.idea/libraries/Maven__com_typesafe_akka_akka_actor_2_10_2_3_11.xml
deleted file mode 100644
index 7036476..0000000
--- a/.idea/libraries/Maven__com_typesafe_akka_akka_actor_2_10_2_3_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_typesafe_akka_akka_remote_2_10_2_3_11.xml b/.idea/libraries/Maven__com_typesafe_akka_akka_remote_2_10_2_3_11.xml
deleted file mode 100644
index dc47d0c..0000000
--- a/.idea/libraries/Maven__com_typesafe_akka_akka_remote_2_10_2_3_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_typesafe_akka_akka_slf4j_2_10_2_3_11.xml b/.idea/libraries/Maven__com_typesafe_akka_akka_slf4j_2_10_2_3_11.xml
deleted file mode 100644
index 4e40647..0000000
--- a/.idea/libraries/Maven__com_typesafe_akka_akka_slf4j_2_10_2_3_11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_typesafe_config_1_2_1.xml b/.idea/libraries/Maven__com_typesafe_config_1_2_1.xml
deleted file mode 100644
index cc78721..0000000
--- a/.idea/libraries/Maven__com_typesafe_config_1_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml b/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml
deleted file mode 100644
index fc159c5..0000000
--- a/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml
deleted file mode 100644
index 1cb64ed..0000000
--- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml
deleted file mode 100644
index 3fda2c0..0000000
--- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
deleted file mode 100644
index cec2493..0000000
--- a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
deleted file mode 100644
index 27424a1..0000000
--- a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
deleted file mode 100644
index 13afda2..0000000
--- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
deleted file mode 100644
index ae96781..0000000
--- a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml
deleted file mode 100644
index 49c39ce..0000000
--- a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml b/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml
deleted file mode 100644
index 49f1def..0000000
--- a/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
deleted file mode 100644
index 66e6537..0000000
--- a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
deleted file mode 100644
index bc2aad0..0000000
--- a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
deleted file mode 100644
index 5e8b8d3..0000000
--- a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
deleted file mode 100644
index 01c7b8e..0000000
--- a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_net_commons_net_2_2.xml b/.idea/libraries/Maven__commons_net_commons_net_2_2.xml
deleted file mode 100644
index cdd400d..0000000
--- a/.idea/libraries/Maven__commons_net_commons_net_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml
deleted file mode 100644
index ab20721..0000000
--- a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_core_3_1_2.xml b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_core_3_1_2.xml
deleted file mode 100644
index e25f69c..0000000
--- a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_core_3_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_graphite_3_1_2.xml b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_graphite_3_1_2.xml
deleted file mode 100644
index fe7ca23..0000000
--- a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_graphite_3_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_json_3_1_2.xml b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_json_3_1_2.xml
deleted file mode 100644
index 8b11059..0000000
--- a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_json_3_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_jvm_3_1_2.xml b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_jvm_3_1_2.xml
deleted file mode 100644
index 32625f0..0000000
--- a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_jvm_3_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_3_8_0_Final.xml b/.idea/libraries/Maven__io_netty_netty_3_8_0_Final.xml
deleted file mode 100644
index d77c5c9..0000000
--- a/.idea/libraries/Maven__io_netty_netty_3_8_0_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_all_4_0_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_0_29_Final.xml
deleted file mode 100644
index eaf53f6..0000000
--- a/.idea/libraries/Maven__io_netty_netty_all_4_0_29_Final.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml
deleted file mode 100644
index 180d587..0000000
--- a/.idea/libraries/Maven__javax_activation_activation_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml b/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml
deleted file mode 100644
index ee6078c..0000000
--- a/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml b/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
deleted file mode 100644
index 679e09a..0000000
--- a/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_transaction_jta_1_1.xml b/.idea/libraries/Maven__javax_transaction_jta_1_1.xml
deleted file mode 100644
index 3047243..0000000
--- a/.idea/libraries/Maven__javax_transaction_jta_1_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml
deleted file mode 100644
index a3054d2..0000000
--- a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
deleted file mode 100644
index 2a4dd7a..0000000
--- a/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javolution_javolution_5_5_1.xml b/.idea/libraries/Maven__javolution_javolution_5_5_1.xml
deleted file mode 100644
index 374563d..0000000
--- a/.idea/libraries/Maven__javolution_javolution_5_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jline_jline_2_12.xml b/.idea/libraries/Maven__jline_jline_2_12.xml
deleted file mode 100644
index eaff5ff..0000000
--- a/.idea/libraries/Maven__jline_jline_2_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_5.xml b/.idea/libraries/Maven__joda_time_joda_time_2_5.xml
deleted file mode 100644
index 7eb240e..0000000
--- a/.idea/libraries/Maven__joda_time_joda_time_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml
deleted file mode 100644
index d411041..0000000
--- a/.idea/libraries/Maven__junit_junit_4_12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__log4j_apache_log4j_extras_1_2_17.xml b/.idea/libraries/Maven__log4j_apache_log4j_extras_1_2_17.xml
deleted file mode 100644
index 170743e..0000000
--- a/.idea/libraries/Maven__log4j_apache_log4j_extras_1_2_17.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
deleted file mode 100644
index e383c1b..0000000
--- a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml
deleted file mode 100644
index 2b062b5..0000000
--- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_hydromatic_eigenbase_properties_1_1_5.xml b/.idea/libraries/Maven__net_hydromatic_eigenbase_properties_1_1_5.xml
deleted file mode 100644
index 388b7eb..0000000
--- a/.idea/libraries/Maven__net_hydromatic_eigenbase_properties_1_1_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_java_dev_jets3t_jets3t_0_7_1.xml b/.idea/libraries/Maven__net_java_dev_jets3t_jets3t_0_7_1.xml
deleted file mode 100644
index a301a5b..0000000
--- a/.idea/libraries/Maven__net_java_dev_jets3t_jets3t_0_7_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_jpountz_lz4_lz4_1_3_0.xml b/.idea/libraries/Maven__net_jpountz_lz4_lz4_1_3_0.xml
deleted file mode 100644
index 7e9fceb..0000000
--- a/.idea/libraries/Maven__net_jpountz_lz4_lz4_1_3_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_razorvine_pyrolite_4_4.xml b/.idea/libraries/Maven__net_razorvine_pyrolite_4_4.xml
deleted file mode 100644
index 84ff505..0000000
--- a/.idea/libraries/Maven__net_razorvine_pyrolite_4_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_3.xml b/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_3.xml
deleted file mode 100644
index 6abe098..0000000
--- a/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_py4j_py4j_0_8_2_1.xml b/.idea/libraries/Maven__net_sf_py4j_py4j_0_8_2_1.xml
deleted file mode 100644
index b771ebc..0000000
--- a/.idea/libraries/Maven__net_sf_py4j_py4j_0_8_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_ST4_4_0_4.xml b/.idea/libraries/Maven__org_antlr_ST4_4_0_4.xml
deleted file mode 100644
index 6633680..0000000
--- a/.idea/libraries/Maven__org_antlr_ST4_4_0_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
deleted file mode 100644
index fd0779a..0000000
--- a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
deleted file mode 100644
index 6998bac..0000000
--- a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_1_7_7.xml b/.idea/libraries/Maven__org_apache_avro_avro_1_7_7.xml
deleted file mode 100644
index 1cef8eb..0000000
--- a/.idea/libraries/Maven__org_apache_avro_avro_1_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_7.xml b/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_7.xml
deleted file mode 100644
index 2d2e5e6..0000000
--- a/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_ipc_tests_1_7_7.xml b/.idea/libraries/Maven__org_apache_avro_avro_ipc_tests_1_7_7.xml
deleted file mode 100644
index 077445c..0000000
--- a/.idea/libraries/Maven__org_apache_avro_avro_ipc_tests_1_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_mapred_hadoop2_1_7_7.xml b/.idea/libraries/Maven__org_apache_avro_avro_mapred_hadoop2_1_7_7.xml
deleted file mode 100644
index 0abd56e..0000000
--- a/.idea/libraries/Maven__org_apache_avro_avro_mapred_hadoop2_1_7_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_calcite_calcite_avatica_1_2_0_incubating.xml b/.idea/libraries/Maven__org_apache_calcite_calcite_avatica_1_2_0_incubating.xml
deleted file mode 100644
index 21ff29c..0000000
--- a/.idea/libraries/Maven__org_apache_calcite_calcite_avatica_1_2_0_incubating.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_calcite_calcite_core_1_2_0_incubating.xml b/.idea/libraries/Maven__org_apache_calcite_calcite_core_1_2_0_incubating.xml
deleted file mode 100644
index 99d56fa..0000000
--- a/.idea/libraries/Maven__org_apache_calcite_calcite_core_1_2_0_incubating.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_calcite_calcite_linq4j_1_2_0_incubating.xml b/.idea/libraries/Maven__org_apache_calcite_calcite_linq4j_1_2_0_incubating.xml
deleted file mode 100644
index 79cca19..0000000
--- a/.idea/libraries/Maven__org_apache_calcite_calcite_linq4j_1_2_0_incubating.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
deleted file mode 100644
index 190209e..0000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
deleted file mode 100644
index 83cba3e..0000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_4_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_4_1.xml
deleted file mode 100644
index 19bf20f..0000000
--- a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_4_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_curator_curator_client_2_1_0_incubating.xml b/.idea/libraries/Maven__org_apache_curator_curator_client_2_1_0_incubating.xml
deleted file mode 100644
index f32bd7d..0000000
--- a/.idea/libraries/Maven__org_apache_curator_curator_client_2_1_0_incubating.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_curator_curator_framework_2_4_0.xml b/.idea/libraries/Maven__org_apache_curator_curator_framework_2_4_0.xml
deleted file mode 100644
index 26704ed..0000000
--- a/.idea/libraries/Maven__org_apache_curator_curator_framework_2_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_curator_curator_recipes_2_4_0.xml b/.idea/libraries/Maven__org_apache_curator_curator_recipes_2_4_0.xml
deleted file mode 100644
index a2a0cb9..0000000
--- a/.idea/libraries/Maven__org_apache_curator_curator_recipes_2_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_derby_derby_10_10_2_0.xml b/.idea/libraries/Maven__org_apache_derby_derby_10_10_2_0.xml
deleted file mode 100644
index c317510..0000000
--- a/.idea/libraries/Maven__org_apache_derby_derby_10_10_2_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_directory_api_api_asn1_api_1_0_0_M20.xml b/.idea/libraries/Maven__org_apache_directory_api_api_asn1_api_1_0_0_M20.xml
deleted file mode 100644
index bd5ac37..0000000
--- a/.idea/libraries/Maven__org_apache_directory_api_api_asn1_api_1_0_0_M20.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_directory_api_api_util_1_0_0_M20.xml b/.idea/libraries/Maven__org_apache_directory_api_api_util_1_0_0_M20.xml
deleted file mode 100644
index b3d86af..0000000
--- a/.idea/libraries/Maven__org_apache_directory_api_api_util_1_0_0_M20.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_i18n_2_0_0_M15.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_i18n_2_0_0_M15.xml
deleted file mode 100644
index 7a73f45..0000000
--- a/.idea/libraries/Maven__org_apache_directory_server_apacheds_i18n_2_0_0_M15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_kerberos_codec_2_0_0_M15.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_kerberos_codec_2_0_0_M15.xml
deleted file mode 100644
index 5378216..0000000
--- a/.idea/libraries/Maven__org_apache_directory_server_apacheds_kerberos_codec_2_0_0_M15.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_4.xml
deleted file mode 100644
index 1c70866..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_4.xml
deleted file mode 100644
index bd259f5..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_client_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_client_2_6_4.xml
deleted file mode 100644
index d878f24..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_client_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_4.xml
deleted file mode 100644
index 7fc38ff..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_4.xml
deleted file mode 100644
index 7e8e8d4..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_app_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_app_2_6_4.xml
deleted file mode 100644
index f76a61b..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_app_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_common_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_common_2_6_4.xml
deleted file mode 100644
index 505bf7b..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_common_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_core_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_core_2_6_4.xml
deleted file mode 100644
index c341de1..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_core_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_jobclient_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_jobclient_2_6_4.xml
deleted file mode 100644
index 8908c24..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_jobclient_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_shuffle_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_shuffle_2_6_4.xml
deleted file mode 100644
index 354c2e8..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_shuffle_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_api_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_api_2_6_4.xml
deleted file mode 100644
index e39cdc3..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_api_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_client_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_client_2_6_4.xml
deleted file mode 100644
index c489e2f..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_client_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_common_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_common_2_6_4.xml
deleted file mode 100644
index a661d98..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_common_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_server_common_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_server_common_2_6_4.xml
deleted file mode 100644
index d1b944c..0000000
--- a/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_server_common_2_6_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_2.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_2.xml
deleted file mode 100644
index 08ee7c0..0000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml
deleted file mode 100644
index 877b5aa..0000000
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_ivy_ivy_2_4_0.xml b/.idea/libraries/Maven__org_apache_ivy_ivy_2_4_0.xml
deleted file mode 100644
index 0d13de2..0000000
--- a/.idea/libraries/Maven__org_apache_ivy_ivy_2_4_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_kafka_kafka_2_10_0_8_2_1.xml b/.idea/libraries/Maven__org_apache_kafka_kafka_2_10_0_8_2_1.xml
deleted file mode 100644
index b04d7b9..0000000
--- a/.idea/libraries/Maven__org_apache_kafka_kafka_2_10_0_8_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_kafka_kafka_clients_0_8_2_1.xml b/.idea/libraries/Maven__org_apache_kafka_kafka_clients_0_8_2_1.xml
deleted file mode 100644
index e902765..0000000
--- a/.idea/libraries/Maven__org_apache_kafka_kafka_clients_0_8_2_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_mesos_mesos_shaded_protobuf_0_21_1.xml b/.idea/libraries/Maven__org_apache_mesos_mesos_shaded_protobuf_0_21_1.xml
deleted file mode 100644
index bad994a..0000000
--- a/.idea/libraries/Maven__org_apache_mesos_mesos_shaded_protobuf_0_21_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_column_1_7_0.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_column_1_7_0.xml
deleted file mode 100644
index 9d9f5ad..0000000
--- a/.idea/libraries/Maven__org_apache_parquet_parquet_column_1_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_common_1_7_0.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_common_1_7_0.xml
deleted file mode 100644
index 8602c2d..0000000
--- a/.idea/libraries/Maven__org_apache_parquet_parquet_common_1_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_encoding_1_7_0.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_encoding_1_7_0.xml
deleted file mode 100644
index 7d52648..0000000
--- a/.idea/libraries/Maven__org_apache_parquet_parquet_encoding_1_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_format_2_3_0_incubating.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_format_2_3_0_incubating.xml
deleted file mode 100644
index 1261e56..0000000
--- a/.idea/libraries/Maven__org_apache_parquet_parquet_format_2_3_0_incubating.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_generator_1_7_0.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_generator_1_7_0.xml
deleted file mode 100644
index 943cb6d..0000000
--- a/.idea/libraries/Maven__org_apache_parquet_parquet_generator_1_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_hadoop_1_7_0.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_hadoop_1_7_0.xml
deleted file mode 100644
index 20a7e2e..0000000
--- a/.idea/libraries/Maven__org_apache_parquet_parquet_hadoop_1_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_jackson_1_7_0.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_jackson_1_7_0.xml
deleted file mode 100644
index 31d6a08..0000000
--- a/.idea/libraries/Maven__org_apache_parquet_parquet_jackson_1_7_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_catalyst_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_catalyst_2_10_1_5_1.xml
deleted file mode 100644
index b157e29..0000000
--- a/.idea/libraries/Maven__org_apache_spark_spark_catalyst_2_10_1_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_core_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_core_2_10_1_5_1.xml
deleted file mode 100644
index f078dfd..0000000
--- a/.idea/libraries/Maven__org_apache_spark_spark_core_2_10_1_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_hive_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_hive_2_10_1_5_1.xml
deleted file mode 100644
index d8dc75e..0000000
--- a/.idea/libraries/Maven__org_apache_spark_spark_hive_2_10_1_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_launcher_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_launcher_2_10_1_5_1.xml
deleted file mode 100644
index 0c6463e..0000000
--- a/.idea/libraries/Maven__org_apache_spark_spark_launcher_2_10_1_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_network_common_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_network_common_2_10_1_5_1.xml
deleted file mode 100644
index 15537c9..0000000
--- a/.idea/libraries/Maven__org_apache_spark_spark_network_common_2_10_1_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_network_shuffle_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_network_shuffle_2_10_1_5_1.xml
deleted file mode 100644
index c7748f6..0000000
--- a/.idea/libraries/Maven__org_apache_spark_spark_network_shuffle_2_10_1_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_sql_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_sql_2_10_1_5_1.xml
deleted file mode 100644
index 05a746e..0000000
--- a/.idea/libraries/Maven__org_apache_spark_spark_sql_2_10_1_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_streaming_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_streaming_2_10_1_5_1.xml
deleted file mode 100644
index 820272a..0000000
--- a/.idea/libraries/Maven__org_apache_spark_spark_streaming_2_10_1_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_streaming_kafka_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_streaming_kafka_2_10_1_5_1.xml
deleted file mode 100644
index 786238b..0000000
--- a/.idea/libraries/Maven__org_apache_spark_spark_streaming_kafka_2_10_1_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_unsafe_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_unsafe_2_10_1_5_1.xml
deleted file mode 100644
index b60a3c0..0000000
--- a/.idea/libraries/Maven__org_apache_spark_spark_unsafe_2_10_1_5_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_thrift_libfb303_0_9_2.xml b/.idea/libraries/Maven__org_apache_thrift_libfb303_0_9_2.xml
deleted file mode 100644
index 9f31c6b..0000000
--- a/.idea/libraries/Maven__org_apache_thrift_libfb303_0_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_thrift_libthrift_0_9_2.xml b/.idea/libraries/Maven__org_apache_thrift_libthrift_0_9_2.xml
deleted file mode 100644
index ac1ee5b..0000000
--- a/.idea/libraries/Maven__org_apache_thrift_libthrift_0_9_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_5.xml b/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_5.xml
deleted file mode 100644
index 3019b0a..0000000
--- a/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_1_6.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_1_6.xml
deleted file mode 100644
index 8b11cf4..0000000
--- a/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_1_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml
deleted file mode 100644
index 98eb549..0000000
--- a/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_9_13.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_9_13.xml
deleted file mode 100644
index 43fc6ed..0000000
--- a/.idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_9_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml
deleted file mode 100644
index 77f3bad..0000000
--- a/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_9_13.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_9_13.xml
deleted file mode 100644
index 107a62f..0000000
--- a/.idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_9_13.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml
deleted file mode 100644
index 2ab4145..0000000
--- a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_8.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_8.xml
deleted file mode 100644
index 0774e41..0000000
--- a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_datanucleus_datanucleus_api_jdo_3_2_6.xml b/.idea/libraries/Maven__org_datanucleus_datanucleus_api_jdo_3_2_6.xml
deleted file mode 100644
index bf61e91..0000000
--- a/.idea/libraries/Maven__org_datanucleus_datanucleus_api_jdo_3_2_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_datanucleus_datanucleus_core_3_2_10.xml b/.idea/libraries/Maven__org_datanucleus_datanucleus_core_3_2_10.xml
deleted file mode 100644
index a2a6cdf..0000000
--- a/.idea/libraries/Maven__org_datanucleus_datanucleus_core_3_2_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_datanucleus_datanucleus_rdbms_3_2_9.xml b/.idea/libraries/Maven__org_datanucleus_datanucleus_rdbms_3_2_9.xml
deleted file mode 100644
index eb3ddf9..0000000
--- a/.idea/libraries/Maven__org_datanucleus_datanucleus_rdbms_3_2_9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml b/.idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml
deleted file mode 100644
index 7dc899a..0000000
--- a/.idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_fusesource_leveldbjni_leveldbjni_all_1_8.xml b/.idea/libraries/Maven__org_fusesource_leveldbjni_leveldbjni_all_1_8.xml
deleted file mode 100644
index 4a829d2..0000000
--- a/.idea/libraries/Maven__org_fusesource_leveldbjni_leveldbjni_all_1_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
deleted file mode 100644
index f58bbc1..0000000
--- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_htrace_htrace_core_3_0_4.xml b/.idea/libraries/Maven__org_htrace_htrace_core_3_0_4.xml
deleted file mode 100644
index db0f8c1..0000000
--- a/.idea/libraries/Maven__org_htrace_htrace_core_3_0_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_iq80_snappy_snappy_0_2.xml b/.idea/libraries/Maven__org_iq80_snappy_snappy_0_2.xml
deleted file mode 100644
index 2a828ac..0000000
--- a/.idea/libraries/Maven__org_iq80_snappy_snappy_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jodd_jodd_core_3_5_2.xml b/.idea/libraries/Maven__org_jodd_jodd_core_3_5_2.xml
deleted file mode 100644
index 825acad..0000000
--- a/.idea/libraries/Maven__org_jodd_jodd_core_3_5_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_json4s_json4s_ast_2_10_3_2_10.xml b/.idea/libraries/Maven__org_json4s_json4s_ast_2_10_3_2_10.xml
deleted file mode 100644
index d4b2d55..0000000
--- a/.idea/libraries/Maven__org_json4s_json4s_ast_2_10_3_2_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_json4s_json4s_core_2_10_3_2_10.xml b/.idea/libraries/Maven__org_json4s_json4s_core_2_10_3_2_10.xml
deleted file mode 100644
index d7ed1d0..0000000
--- a/.idea/libraries/Maven__org_json4s_json4s_core_2_10_3_2_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_json4s_json4s_jackson_2_10_3_2_10.xml b/.idea/libraries/Maven__org_json4s_json4s_jackson_2_10_3_2_10.xml
deleted file mode 100644
index 518a4ef..0000000
--- a/.idea/libraries/Maven__org_json4s_json4s_jackson_2_10_3_2_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_json_json_20090211.xml b/.idea/libraries/Maven__org_json_json_20090211.xml
deleted file mode 100644
index e57dc0a..0000000
--- a/.idea/libraries/Maven__org_json_json_20090211.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml b/.idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml
deleted file mode 100644
index f6ec2b9..0000000
--- a/.idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml
deleted file mode 100644
index 74d2abc..0000000
--- a/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_roaringbitmap_RoaringBitmap_0_4_5.xml b/.idea/libraries/Maven__org_roaringbitmap_RoaringBitmap_0_4_5.xml
deleted file mode 100644
index 171c39e..0000000
--- a/.idea/libraries/Maven__org_roaringbitmap_RoaringBitmap_0_4_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_scala_lang_scala_compiler_2_10_0.xml b/.idea/libraries/Maven__org_scala_lang_scala_compiler_2_10_0.xml
deleted file mode 100644
index 61fd00a..0000000
--- a/.idea/libraries/Maven__org_scala_lang_scala_compiler_2_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_scala_lang_scala_library_2_10_4.xml b/.idea/libraries/Maven__org_scala_lang_scala_library_2_10_4.xml
deleted file mode 100644
index f159907..0000000
--- a/.idea/libraries/Maven__org_scala_lang_scala_library_2_10_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_scala_lang_scala_reflect_2_10_4.xml b/.idea/libraries/Maven__org_scala_lang_scala_reflect_2_10_4.xml
deleted file mode 100644
index 7774384..0000000
--- a/.idea/libraries/Maven__org_scala_lang_scala_reflect_2_10_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_scala_lang_scalap_2_10_0.xml b/.idea/libraries/Maven__org_scala_lang_scalap_2_10_0.xml
deleted file mode 100644
index 55c2916..0000000
--- a/.idea/libraries/Maven__org_scala_lang_scalap_2_10_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_10.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_10.xml
deleted file mode 100644
index 5f42bd6..0000000
--- a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_10.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_10.xml
deleted file mode 100644
index 941ba8b..0000000
--- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_10.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_10.xml
deleted file mode 100644
index 2b13f0f..0000000
--- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_10.xml b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_10.xml
deleted file mode 100644
index fb9c8a4..0000000
--- a/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_spark_project_hive_hive_exec_1_2_1_spark.xml b/.idea/libraries/Maven__org_spark_project_hive_hive_exec_1_2_1_spark.xml
deleted file mode 100644
index 74a2215..0000000
--- a/.idea/libraries/Maven__org_spark_project_hive_hive_exec_1_2_1_spark.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_spark_project_hive_hive_metastore_1_2_1_spark.xml b/.idea/libraries/Maven__org_spark_project_hive_hive_metastore_1_2_1_spark.xml
deleted file mode 100644
index 2c91222..0000000
--- a/.idea/libraries/Maven__org_spark_project_hive_hive_metastore_1_2_1_spark.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_spark_project_spark_unused_1_0_0.xml b/.idea/libraries/Maven__org_spark_project_spark_unused_1_0_0.xml
deleted file mode 100644
index 9fbe28c..0000000
--- a/.idea/libraries/Maven__org_spark_project_spark_unused_1_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_tachyonproject_tachyon_client_0_7_1.xml b/.idea/libraries/Maven__org_tachyonproject_tachyon_client_0_7_1.xml
deleted file mode 100644
index e14969f..0000000
--- a/.idea/libraries/Maven__org_tachyonproject_tachyon_client_0_7_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_tachyonproject_tachyon_underfs_hdfs_0_7_1.xml b/.idea/libraries/Maven__org_tachyonproject_tachyon_underfs_hdfs_0_7_1.xml
deleted file mode 100644
index cd16342..0000000
--- a/.idea/libraries/Maven__org_tachyonproject_tachyon_underfs_hdfs_0_7_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_tachyonproject_tachyon_underfs_local_0_7_1.xml b/.idea/libraries/Maven__org_tachyonproject_tachyon_underfs_local_0_7_1.xml
deleted file mode 100644
index 845d2cb..0000000
--- a/.idea/libraries/Maven__org_tachyonproject_tachyon_underfs_local_0_7_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_tukaani_xz_1_0.xml b/.idea/libraries/Maven__org_tukaani_xz_1_0.xml
deleted file mode 100644
index 8b8042f..0000000
--- a/.idea/libraries/Maven__org_tukaani_xz_1_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_uncommons_maths_uncommons_maths_1_2_2a.xml b/.idea/libraries/Maven__org_uncommons_maths_uncommons_maths_1_2_2a.xml
deleted file mode 100644
index 26568be..0000000
--- a/.idea/libraries/Maven__org_uncommons_maths_uncommons_maths_1_2_2a.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_1_7.xml b/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_1_7.xml
deleted file mode 100644
index 61c0f2b..0000000
--- a/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_1_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__oro_oro_2_0_8.xml b/.idea/libraries/Maven__oro_oro_2_0_8.xml
deleted file mode 100644
index 25203a0..0000000
--- a/.idea/libraries/Maven__oro_oro_2_0_8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
deleted file mode 100644
index 0b13335..0000000
--- a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml b/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
deleted file mode 100644
index 19d39db..0000000
--- a/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml
deleted file mode 100644
index 891caa2..0000000
--- a/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xmlenc_xmlenc_0_52.xml b/.idea/libraries/Maven__xmlenc_xmlenc_0_52.xml
deleted file mode 100644
index 59d176d..0000000
--- a/.idea/libraries/Maven__xmlenc_xmlenc_0_52.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f042c63..2edfa9b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,58 +1,17 @@
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -69,6 +28,11 @@
+
+
+
@@ -142,11 +106,6 @@
-
-
-
-
-
@@ -157,6 +116,7 @@
+
@@ -278,6 +238,10 @@
+
+
+
+
@@ -299,18 +263,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -320,218 +272,135 @@
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
@@ -551,6 +420,7 @@
+
1529592741848
@@ -669,7 +539,7 @@
-
+
@@ -697,19 +567,10 @@
-
-
-
-
-
-
-
-
-
diff --git a/UserActionAnalyzePlatform.iml b/UserActionAnalyzePlatform.iml
index 6e9857d..1cd9bcc 100644
--- a/UserActionAnalyzePlatform.iml
+++ b/UserActionAnalyzePlatform.iml
@@ -1,192 +1,18 @@
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/util/DateUtils.java b/src/main/java/cn/edu/hust/util/DateUtils.java
index 7883fdf..e5f32bb 100644
--- a/src/main/java/cn/edu/hust/util/DateUtils.java
+++ b/src/main/java/cn/edu/hust/util/DateUtils.java
@@ -7,7 +7,7 @@ import java.util.Date;
/**
* 日期时间工具类
- * @author Administrator
+ * @author Administrator111
*
*/
public class DateUtils {
From 793988e4771780c826774af724ee76934ea90833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 20:42:49 +0800
Subject: [PATCH 03/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90111=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90111?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 54 ++++++++++++++++++++++++++++-----------------
1 file changed, 34 insertions(+), 20 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c99b438..05ced1e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,7 @@
-
-
+
@@ -68,6 +67,11 @@
+
+
+
@@ -276,22 +280,22 @@
- {
+ "keyToString": {
+ "JUnit.ParamUtilsTest.test2.executor": "Run",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "git-widget-placeholder": "zxr",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "D:/git/project/UserActionAnalyzePlatform",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "vue.rearranger.settings.migration": "true"
}
-}]]>
+}
@@ -458,7 +462,8 @@
-
+
+
1529592741848
@@ -474,7 +479,15 @@
1529593229553
-
+
+
+ 1734351693404
+
+
+
+ 1734351693404
+
+
@@ -592,7 +605,8 @@
-
+
+
From 66286d90e7d9e54af65407ee75db6aab81271da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 20:46:27 +0800
Subject: [PATCH 04/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90111=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90111?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/cn/edu/hust/conf/ConfigurationManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
index bf8915a..9120172 100644
--- a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
+++ b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
@@ -3,7 +3,7 @@ package cn.edu.hust.conf;
import java.io.InputStream;
import java.util.Properties;
-/**111
+/**1111
* 配置文件管理类
* 主要的功能:从特定的properties文件中读取相应的key/value
*/
From 428c873613f309f972c81d64052a1e2139ac6207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 20:47:32 +0800
Subject: [PATCH 05/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90111=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=901111?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/cn/edu/hust/conf/ConfigurationManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
index 9120172..7fc1bee 100644
--- a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
+++ b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
@@ -3,7 +3,7 @@ package cn.edu.hust.conf;
import java.io.InputStream;
import java.util.Properties;
-/**1111
+/**11111
* 配置文件管理类
* 主要的功能:从特定的properties文件中读取相应的key/value
*/
From f6d8d34c1541ab7c83c701e3acef7519c5777473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 21:12:51 +0800
Subject: [PATCH 06/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 48 +++++++++++++++++--
.../edu/hust/conf/ConfigurationManager.java | 2 +-
.../java/cn/edu/hust/json/FastJsonTest.java | 22 +++++++--
3 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 05ced1e..6fa5d46 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,14 +4,19 @@
-
+
+
+
+
+
+
@@ -293,6 +298,7 @@
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
+ "settings.editor.selected.configurable": "reference.settings.project.maven.repository.indices",
"vue.rearranger.settings.migration": "true"
}
}
@@ -440,6 +446,13 @@
+
+
+
+
+
+
+
@@ -463,7 +476,8 @@
-
+
+
1529592741848
@@ -487,7 +501,31 @@
1734351693404
-
+
+
+ 1734352975106
+
+
+
+ 1734352975106
+
+
+
+ 1734353193141
+
+
+
+ 1734353193141
+
+
+
+ 1734353269426
+
+
+
+ 1734353269426
+
+
@@ -606,7 +644,9 @@
-
+
+
+
diff --git a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
index 7fc1bee..dbae85b 100644
--- a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
+++ b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
@@ -3,7 +3,7 @@ package cn.edu.hust.conf;
import java.io.InputStream;
import java.util.Properties;
-/**11111
+/**
* 配置文件管理类
* 主要的功能:从特定的properties文件中读取相应的key/value
*/
diff --git a/src/test/java/cn/edu/hust/json/FastJsonTest.java b/src/test/java/cn/edu/hust/json/FastJsonTest.java
index e532d22..c177f2c 100644
--- a/src/test/java/cn/edu/hust/json/FastJsonTest.java
+++ b/src/test/java/cn/edu/hust/json/FastJsonTest.java
@@ -1,17 +1,33 @@
+//这行代码定义了当前类所在的包名。包名用于组织和管理类。
package cn.edu.hust.json;
+//这行代码导入了 com.alibaba.fastjson.JSONArray 类。
+// JSONArray 是 FastJSON 库提供的一个类,用于处理 JSON 数组。
import com.alibaba.fastjson.JSONArray;
import org.junit.Test;
+//定义了一个名为 FastJsonTest 的公共类。
public class FastJsonTest {
/**
- * Json测试
+ * Json测试,方法的功能
*/
- @Test
+ @Test //使用 @Test 注解标识这个方法是一个测试方法。
+
+ //定义了一个公共的无参数方法 test1,并使用 @Test 注解标记。
public void test1()
{
+ //定义了一个字符串 json,包含一个 JSON 数组。
+ // 每个对象用单引号包围,对象属性之间用逗号分隔。
String json="[{'name':'Tom','age':23},{'name':'LiLi','age':24}]";
+
+ //使用 JSONArray.parseArray(json)
+ // 方法将 json 字符串解析为一个 JSONArray 对象。JSONArray 类的 parseArray 方法会将 JSON 字符串转换为 JSONArray 对象。
JSONArray array=JSONArray.parseArray(json);
+
+ //使用 array.getJSONObject(0) 获取数组中的第一个对象。
+ //调用 get("name") 方法获取该对象的 name 属性值。
+ //使用 System.out.println 输出该属性值,即 Tom。
System.out.println(array.getJSONObject(0).get("name"));
+
}
-}
+}
\ No newline at end of file
From 9046037b817d6798aa9040457fb74f7d0cca471d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 21:14:57 +0800
Subject: [PATCH 07/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=9011=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=9011?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/test/java/cn/edu/hust/json/FastJsonTest.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/test/java/cn/edu/hust/json/FastJsonTest.java b/src/test/java/cn/edu/hust/json/FastJsonTest.java
index c177f2c..9028fcd 100644
--- a/src/test/java/cn/edu/hust/json/FastJsonTest.java
+++ b/src/test/java/cn/edu/hust/json/FastJsonTest.java
@@ -16,14 +16,17 @@ public class FastJsonTest {
//定义了一个公共的无参数方法 test1,并使用 @Test 注解标记。
public void test1()
{
+
//定义了一个字符串 json,包含一个 JSON 数组。
// 每个对象用单引号包围,对象属性之间用逗号分隔。
String json="[{'name':'Tom','age':23},{'name':'LiLi','age':24}]";
+
//使用 JSONArray.parseArray(json)
// 方法将 json 字符串解析为一个 JSONArray 对象。JSONArray 类的 parseArray 方法会将 JSON 字符串转换为 JSONArray 对象。
JSONArray array=JSONArray.parseArray(json);
+
//使用 array.getJSONObject(0) 获取数组中的第一个对象。
//调用 get("name") 方法获取该对象的 name 属性值。
//使用 System.out.println 输出该属性值,即 Tom。
From b357bb9ef6865b65c3a652c1c220a8ce0d8dcb11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 21:16:05 +0800
Subject: [PATCH 08/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=9011=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=9011?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6fa5d46..993cb77 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,7 @@
-
-
-
-
-
+
@@ -477,7 +473,7 @@
-
+
1529592741848
@@ -525,7 +521,23 @@
1734353269426
-
+
+
+ 1734354775314
+
+
+
+ 1734354775314
+
+
+
+ 1734354900465
+
+
+
+ 1734354900465
+
+
@@ -642,11 +654,12 @@
-
-
+
+
+
From 731d7ba4c1142386c98a47ee9500ba659caf83c9 Mon Sep 17 00:00:00 2001
From: yy <2565886549@qq.com>
Date: Mon, 16 Dec 2024 21:27:03 +0800
Subject: [PATCH 09/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/encodings.xml | 2 +
.idea/jarRepositories.xml | 20 ++
.idea/workspace.xml | 308 +++++-------------
.../hust/dao/impl/SessionAggrStatDaoImpl.java | 43 ++-
4 files changed, 127 insertions(+), 246 deletions(-)
create mode 100644 .idea/jarRepositories.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index b26911b..af673e7 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,5 +2,7 @@
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..712ab9d
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f042c63..75d518c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,58 +1,17 @@
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -142,11 +101,6 @@
-
-
-
-
-
@@ -157,6 +111,7 @@
+
@@ -278,16 +233,21 @@
+
+
+
+
+
+
+
+
-
-
-
@@ -299,18 +259,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -320,218 +268,136 @@
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
@@ -551,6 +417,7 @@
+
1529592741848
@@ -669,36 +536,19 @@
-
+
-
-
-
+
@@ -706,9 +556,19 @@
-
+
+
+ file://$PROJECT_DIR$/src/main/java/cn/edu/hust/dao/impl/SessionAggrStatDaoImpl.java
+ 24
+
+
+
+ file://$PROJECT_DIR$/src/main/java/cn/edu/hust/dao/SessionDetailDao.java
+ 7
+
+
+
-
diff --git a/src/main/java/cn/edu/hust/dao/impl/SessionAggrStatDaoImpl.java b/src/main/java/cn/edu/hust/dao/impl/SessionAggrStatDaoImpl.java
index 23d21a1..3952939 100644
--- a/src/main/java/cn/edu/hust/dao/impl/SessionAggrStatDaoImpl.java
+++ b/src/main/java/cn/edu/hust/dao/impl/SessionAggrStatDaoImpl.java
@@ -1,16 +1,16 @@
-package cn.edu.hust.dao.impl;
+package cn.edu.hust.dao.impl; // 定义包名,表示这个类属于cn.edu.hust.dao.impl包
-import cn.edu.hust.dao.SessionAggrStatDao;
-import cn.edu.hust.domain.SessionAggrStat;
-import cn.edu.hust.jdbc.JDBCHelper;
+import cn.edu.hust.dao.SessionAggrStatDao; // 导入SessionAggrStatDao接口
+import cn.edu.hust.domain.SessionAggrStat; // 导入SessionAggrStat实体类
+import cn.edu.hust.jdbc.JDBCHelper; // 导入JDBCHelper类,用于数据库操作
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayList; // 导入ArrayList类,用于创建列表
+import java.util.List; // 导入List接口
-public class SessionAggrStatDaoImpl implements SessionAggrStatDao{
- @Override
- public void insert(SessionAggrStat sessionAggrStat) {
- String sql="insert into session_aggr_stat values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+public class SessionAggrStatDaoImpl implements SessionAggrStatDao { // 定义SessionAggrStatDaoImpl类,实现SessionAggrStatDao接口
+ @Override // 覆盖接口中的方法
+ public void insert(SessionAggrStat sessionAggrStat) { // 定义insert方法,用于插入单个SessionAggrStat对象
+ String sql="insert into session_aggr_stat values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; // 定义插入SQL语句
Object[] params={sessionAggrStat.getTaskId(),sessionAggrStat.getSessionCount(),sessionAggrStat.getVisit_Length_1s_3s(),
sessionAggrStat.getVisit_Length_4s_6s(),sessionAggrStat.getVisit_Length_7s_9s(),
sessionAggrStat.getVisit_Length_10s_30s(),sessionAggrStat.getVisit_Length_30s_60s(),
@@ -18,16 +18,15 @@ public class SessionAggrStatDaoImpl implements SessionAggrStatDao{
,sessionAggrStat.getVisit_Length_10m_30m(),sessionAggrStat.getVisit_Length_30m(),
sessionAggrStat.getStep_Length_1_3(),sessionAggrStat.getStep_Length_4_6(),sessionAggrStat.getStep_Length_7_9(),
sessionAggrStat.getStep_Length_7_9(),sessionAggrStat.getStep_Length_10_30(),
- sessionAggrStat.getStep_Length_30_60()};
- JDBCHelper.getInstance().excuteUpdate(sql,params);
+ sessionAggrStat.getStep_Length_30_60()}; // 创建参数数组,包含SessionAggrStat对象的所有属性
+ JDBCHelper.getInstance().excuteUpdate(sql,params); // 调用JDBCHelper的excuteUpdate方法执行SQL更新
}
- @Override
- public void batchInsert(List sessionAggrStatList) {
- String sql="insert into session_aggr_stat values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
- List
-
+
+
+
+
+
+
@@ -28,6 +33,11 @@
+
+
+
@@ -238,6 +248,7 @@
+
@@ -417,7 +428,7 @@
-
+
1529592741848
@@ -433,7 +444,14 @@
1529593229553
-
+
+ 1734355623186
+
+
+
+ 1734355623186
+
+
diff --git a/src/main/java/cn/edu/hust/dao/factory/DaoFactory.java b/src/main/java/cn/edu/hust/dao/factory/DaoFactory.java
index 3f2eba7..d06f1c4 100644
--- a/src/main/java/cn/edu/hust/dao/factory/DaoFactory.java
+++ b/src/main/java/cn/edu/hust/dao/factory/DaoFactory.java
@@ -1,35 +1,36 @@
-package cn.edu.hust.dao.factory;
+package cn.edu.hust.dao.factory; // 定义包名,表示这个类属于cn.edu.hust.dao.factory包
-import cn.edu.hust.dao.*;
-import cn.edu.hust.dao.impl.*;
-import cn.edu.hust.domain.SessionDetail;
-import cn.edu.hust.domain.SessionRandomExtract;
+import cn.edu.hust.dao.*; // 导入cn.edu.hust.dao包下的所有类
+import cn.edu.hust.dao.impl.*; // 导入cn.edu.hust.dao.impl包下的所有类
+import cn.edu.hust.domain.SessionDetail; // 导入SessionDetail实体类
+import cn.edu.hust.domain.SessionRandomExtract; // 导入SessionRandomExtract实体类
-public class DaoFactory {
+public class DaoFactory { // 定义DaoFactory类,用于创建数据访问对象的实例
/**
- * 使用工厂模式
- * @return
+ * 使用工厂模式获取TaskDao对象
+ * @return 返回TaskDao接口的实现类实例
*/
- public static TaskDao getTaskDao()
- {
- return new TaskDaoImpl();
+ public static TaskDao getTaskDao() {
+ return new TaskDaoImpl(); // 创建并返回TaskDaoImpl对象
}
- public static SessionAggrStatDao getSessionAggrStatDao()
- {
- return new SessionAggrStatDaoImpl();
+ public static SessionAggrStatDao getSessionAggrStatDao() {
+ return new SessionAggrStatDaoImpl(); // 创建并返回SessionAggrStatDaoImpl对象
}
- public static SessionRandomExtractDao getSessionRandomExtractDao(){
- return new SessionRandomExtractDaoImpl();
+ public static SessionRandomExtractDao getSessionRandomExtractDao() {
+ return new SessionRandomExtractDaoImpl(); // 创建并返回SessionRandomExtractDaoImpl对象
}
- public static SessionDetailDao getSessionDetailDao()
- {
- return new SessionDetailDaoImpl();
+ public static SessionDetailDao getSessionDetailDao() {
+ return new SessionDetailDaoImpl(); // 创建并返回SessionDetailDaoImpl对象
}
- public static Top10CategoryDao getTop10CategoryDao(){ return new Top10CategoryDaoImpl();}
+ public static Top10CategoryDao getTop10CategoryDao() {
+ return new Top10CategoryDaoImpl(); // 创建并返回Top10CategoryDaoImpl对象
+ }
- public static Top10CategorySessionDao getTop10CategorySessionDao(){ return new Top10CategorySessionDaoImpl();}
-}
+ public static Top10CategorySessionDao getTop10CategorySessionDao() {
+ return new Top10CategorySessionDaoImpl(); // 创建并返回Top10CategorySessionDaoImpl对象
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/dao/impl/SessionDetailDaoImpl.java b/src/main/java/cn/edu/hust/dao/impl/SessionDetailDaoImpl.java
index 0aac7a9..aeb4873 100644
--- a/src/main/java/cn/edu/hust/dao/impl/SessionDetailDaoImpl.java
+++ b/src/main/java/cn/edu/hust/dao/impl/SessionDetailDaoImpl.java
@@ -1,36 +1,55 @@
-package cn.edu.hust.dao.impl;
+package cn.edu.hust.dao.impl; // 定义包名,表示这个类属于cn.edu.hust.dao.impl包
-import cn.edu.hust.dao.SessionDetailDao;
-import cn.edu.hust.domain.SessionDetail;
-import cn.edu.hust.jdbc.JDBCHelper;
+import cn.edu.hust.dao.SessionDetailDao; // 导入SessionDetailDao接口
+import cn.edu.hust.domain.SessionDetail; // 导入SessionDetail实体类
+import cn.edu.hust.jdbc.JDBCHelper; // 导入JDBCHelper类,用于数据库操作
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import java.io.Serializable; // 导入Serializable接口,用于序列化
+import java.util.ArrayList; // 导入ArrayList类,用于创建列表
+import java.util.List; // 导入List接口
-public class SessionDetailDaoImpl implements SessionDetailDao{
- @Override
- public void insert(SessionDetail sessionDetail) {
- String sql="insert into session_detail values(?,?,?,?,?,?,?,?,?,?,?,?)";
- Object[] object=new Object[]{sessionDetail.getTaskId(),sessionDetail.getUserId(),
- sessionDetail.getSessinId(),sessionDetail.getPageid(),sessionDetail.getActionTime(),
- sessionDetail.getSearchKeyWord(),sessionDetail.getClickCategoryId(),sessionDetail.getClickProductId()
- ,sessionDetail.getOrderCategoryIds(),sessionDetail.getOrderProductIds(),sessionDetail.getPayCategoryIds(),sessionDetail.getPayProductIds()};
- JDBCHelper.getInstance().excuteUpdate(sql,object);
+public class SessionDetailDaoImpl implements SessionDetailDao { // 定义SessionDetailDaoImpl类,实现SessionDetailDao接口
+ @Override // 覆盖接口中的方法
+ public void insert(SessionDetail sessionDetail) { // 定义insert方法,用于插入单个SessionDetail对象
+ String sql="insert into session_detail values(?,?,?,?,?,?,?,?,?,?,?,?,?)"; // 定义插入SQL语句
+ Object[] object=new Object[]{ // 创建一个对象数组,用于存储SessionDetail对象的属性值
+ sessionDetail.getTaskId(), // 获取任务ID
+ sessionDetail.getUserId(), // 获取用户ID
+ sessionDetail.getSessinId(), // 获取会话ID(注意:这里可能是拼写错误,应该是sessionDetail.getSessionId())
+ sessionDetail.getPageid(), // 获取页面ID
+ sessionDetail.getActionTime(), // 获取操作时间
+ sessionDetail.getSearchKeyWord(), // 获取搜索关键词
+ sessionDetail.getClickCategoryId(), // 获取点击的分类ID
+ sessionDetail.getClickProductId(), // 获取点击的产品ID
+ sessionDetail.getOrderCategoryIds(), // 获取订单的分类IDs
+ sessionDetail.getOrderProductIds(), // 获取订单的产品IDs
+ sessionDetail.getPayCategoryIds(), // 获取支付的分类IDs
+ sessionDetail.getPayProductIds() // 获取支付的产品IDs
+ };
+ JDBCHelper.getInstance().excuteUpdate(sql,object); // 调用JDBCHelper的excuteUpdate方法执行SQL更新(注意:这里应该是executeUpdate)
}
- @Override
- public void batchInsert(List sessionDetailList) {
- String sql="insert into session_detail values(?,?,?,?,?,?,?,?,?,?,?,?)";
- List paramList=new ArrayList();
- for (SessionDetail sessionDetail:sessionDetailList)
- {
- Object[] object=new Object[]{sessionDetail.getTaskId(),sessionDetail.getUserId(),
- sessionDetail.getSessinId(),sessionDetail.getPageid(),sessionDetail.getActionTime(),
- sessionDetail.getSearchKeyWord(),sessionDetail.getClickCategoryId(),sessionDetail.getClickProductId()
- ,sessionDetail.getOrderCategoryIds(),sessionDetail.getOrderProductIds(),sessionDetail.getPayCategoryIds(),sessionDetail.getPayProductIds()};
- paramList.add(object);
+ @Override // 覆盖接口中的方法
+ public void batchInsert(List sessionDetailList) { // 定义batchInsert方法,用于批量插入SessionDetail对象
+ String sql="insert into session_detail values(?,?,?,?,?,?,?,?,?,?,?,?,?)"; // 定义插入SQL语句
+ List paramList=new ArrayList(); // 创建一个列表,用于存储每个SessionDetail对象的参数数组
+ for (SessionDetail sessionDetail:sessionDetailList) { // 遍历传入的SessionDetail对象列表
+ Object[] object=new Object[]{ // 创建一个对象数组,用于存储当前SessionDetail对象的属性值
+ sessionDetail.getTaskId(), // 获取任务ID
+ sessionDetail.getUserId(), // 获取用户ID
+ sessionDetail.getSessinId(), // 获取会话ID(注意:这里可能是拼写错误,应该是sessionDetail.getSessionId())
+ sessionDetail.getPageid(), // 获取页面ID
+ sessionDetail.getActionTime(), // 获取操作时间
+ sessionDetail.getSearchKeyWord(), // 获取搜索关键词
+ sessionDetail.getClickCategoryId(), // 获取点击的分类ID
+ sessionDetail.getClickProductId(), // 获取点击的产品ID
+ sessionDetail.getOrderCategoryIds(), // 获取订单的分类IDs
+ sessionDetail.getOrderProductIds(), // 获取订单的产品IDs
+ sessionDetail.getPayCategoryIds(), // 获取支付的分类IDs
+ sessionDetail.getPayProductIds() // 获取支付的产品IDs
+ };
+ paramList.add(object); // 将参数数组添加到列表中
}
- JDBCHelper.getInstance().excuteBatch(sql,paramList);
+ JDBCHelper.getInstance().excuteBatch(sql,paramList); // 调用JDBCHelper的excuteBatch方法执行批量SQL更新(注意:这里应该是executeBatch)
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/dao/impl/SessionRandomExtractDaoImpl.java b/src/main/java/cn/edu/hust/dao/impl/SessionRandomExtractDaoImpl.java
index a77fa89..9feca34 100644
--- a/src/main/java/cn/edu/hust/dao/impl/SessionRandomExtractDaoImpl.java
+++ b/src/main/java/cn/edu/hust/dao/impl/SessionRandomExtractDaoImpl.java
@@ -1,22 +1,27 @@
-package cn.edu.hust.dao.impl;
+package cn.edu.hust.dao.impl; // 定义包名,表示这个类属于cn.edu.hust.dao.impl包
-import cn.edu.hust.dao.SessionRandomExtractDao;
-import cn.edu.hust.domain.SessionRandomExtract;
-import cn.edu.hust.jdbc.JDBCHelper;
+import cn.edu.hust.dao.SessionRandomExtractDao; // 导入SessionRandomExtractDao接口
+import cn.edu.hust.domain.SessionRandomExtract; // 导入SessionRandomExtract实体类
+import cn.edu.hust.jdbc.JDBCHelper; // 导入JDBCHelper类,用于数据库操作
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayList; // 导入ArrayList类,用于创建列表
+import java.util.List; // 导入List接口
-public class SessionRandomExtractDaoImpl implements SessionRandomExtractDao{
- @Override
- public void batchInsert(List sessionRandomExtractList) {
- String sql="insert into session_random_extract values(?,?,?,?,?)";
- List paramList=new ArrayList();
- for (SessionRandomExtract sessionRandomExtract:sessionRandomExtractList) {
- Object[] params=new Object[]{sessionRandomExtract.getTaskId(),sessionRandomExtract.getSessionId()
- ,sessionRandomExtract.getStartTime(),sessionRandomExtract.getSearchKeyWords(),sessionRandomExtract.getClick_category_ids()};
- paramList.add(params);
+public class SessionRandomExtractDaoImpl implements SessionRandomExtractDao { // 定义SessionRandomExtractDaoImpl类,实现SessionRandomExtractDao接口
+ @Override // 覆盖接口中的方法
+ public void batchInsert(List sessionRandomExtractList) { // 定义batchInsert方法,用于批量插入SessionRandomExtract对象
+ String sql="insert into session_random_extract values(?,?,?,?,?)"; // 定义插入SQL语句
+ List paramList=new ArrayList(); // 创建一个列表,用于存储每个SessionRandomExtract对象的参数数组
+ for (SessionRandomExtract sessionRandomExtract:sessionRandomExtractList) { // 遍历传入的SessionRandomExtract对象列表
+ Object[] params=new Object[]{ // 创建一个对象数组,用于存储当前SessionRandomExtract对象的属性值
+ sessionRandomExtract.getTaskId(), // 获取任务ID
+ sessionRandomExtract.getSessionId(), // 获取会话ID
+ sessionRandomExtract.getStartTime(), // 获取开始时间
+ sessionRandomExtract.getSearchKeyWords(), // 获取搜索关键词
+ sessionRandomExtract.getClick_category_ids() // 获取点击的分类IDs
+ };
+ paramList.add(params); // 将参数数组添加到列表中
}
- JDBCHelper.getInstance().excuteBatch(sql,paramList);
+ JDBCHelper.getInstance().excuteBatch(sql,paramList); // 调用JDBCHelper的excuteBatch方法执行批量SQL更新(注意:这里应该是executeBatch)
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/dao/impl/TaskDaoImpl.java b/src/main/java/cn/edu/hust/dao/impl/TaskDaoImpl.java
index f8623d7..a84d06b 100644
--- a/src/main/java/cn/edu/hust/dao/impl/TaskDaoImpl.java
+++ b/src/main/java/cn/edu/hust/dao/impl/TaskDaoImpl.java
@@ -1,38 +1,38 @@
-package cn.edu.hust.dao.impl;
+package cn.edu.hust.dao.impl; // 定义包名,表示这个类属于cn.edu.hust.dao.impl包
-import cn.edu.hust.dao.TaskDao;
-import cn.edu.hust.domain.Task;
-import cn.edu.hust.jdbc.JDBCHelper;
+import cn.edu.hust.dao.TaskDao; // 导入TaskDao接口
+import cn.edu.hust.domain.Task; // 导入Task实体类
+import cn.edu.hust.jdbc.JDBCHelper; // 导入JDBCHelper类,用于数据库操作
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.sql.ResultSet; // 导入ResultSet类,用于处理查询结果
+import java.sql.SQLException; // 导入SQLException类,用于处理SQL异常
-public class TaskDaoImpl implements TaskDao{
- @Override
- public Task findTaskById(Long id) {
- String sql="select * from task where task_id=?";
- final Task task=new Task();
- JDBCHelper.getInstance().excuteQuery(sql, new Object[]{id}, new JDBCHelper.QueryCallBack() {
+public class TaskDaoImpl implements TaskDao { // 定义TaskDaoImpl类,实现TaskDao接口
+ @Override // 覆盖接口中的方法
+ public Task findTaskById(Long id) { // 定义findTaskById方法,根据ID查找任务
+ String sql="select * from task where task_id=?"; // 定义查询SQL语句
+ final Task task=new Task(); // 创建Task对象,用于存储查询结果
+ JDBCHelper.getInstance().excuteQuery(sql, new Object[]{id}, new JDBCHelper.QueryCallBack() { // 调用JDBCHelper的excuteQuery方法执行查询
@Override
- public void process(ResultSet rs) {
+ public void process(ResultSet rs) { // 定义process方法,处理查询结果
try {
- if(rs.next())
+ if(rs.next()) // 如果查询结果有数据
{
- Long id=rs.getLong(1);
- String taskName=rs.getString(2);
- String createTime=rs.getString(3);
- String startTime=rs.getString(4);
- String finishTime=rs.getString(5);
- String taskType=rs.getString(6);
- String taskStatus=rs.getString(7);
- String taskParam=rs.getString(8);
- task.set(id,taskName,createTime,startTime,finishTime,taskType,taskStatus,taskParam);
+ Long id=rs.getLong(1); // 获取任务ID
+ String taskName=rs.getString(2); // 获取任务名称
+ String createTime=rs.getString(3); // 获取创建时间
+ String startTime=rs.getString(4); // 获取开始时间
+ String finishTime=rs.getString(5); // 获取完成时间
+ String taskType=rs.getString(6); // 获取任务类型
+ String taskStatus=rs.getString(7); // 获取任务状态
+ String taskParam=rs.getString(8); // 获取任务参数
+ task.set(id,taskName,createTime,startTime,finishTime,taskType,taskStatus,taskParam); // 设置Task对象的属性
}
- } catch (SQLException e) {
- e.printStackTrace();
+ } catch (SQLException e) { // 捕获并处理SQLException
+ e.printStackTrace(); // 打印异常堆栈信息
}
}
});
- return task;
+ return task; // 返回Task对象
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/dao/impl/Top10CategoryDaoImpl.java b/src/main/java/cn/edu/hust/dao/impl/Top10CategoryDaoImpl.java
index d87ed43..0800d80 100644
--- a/src/main/java/cn/edu/hust/dao/impl/Top10CategoryDaoImpl.java
+++ b/src/main/java/cn/edu/hust/dao/impl/Top10CategoryDaoImpl.java
@@ -1,36 +1,41 @@
-package cn.edu.hust.dao.impl;
+package cn.edu.hust.dao.impl; // 定义包名,表示这个类属于cn.edu.hust.dao.impl包
-import cn.edu.hust.dao.Top10CategoryDao;
-import cn.edu.hust.domain.Top10Category;
-import cn.edu.hust.jdbc.JDBCHelper;
+import cn.edu.hust.dao.Top10CategoryDao; // 导入Top10CategoryDao接口
+import cn.edu.hust.domain.Top10Category; // 导入Top10Category实体类
+import cn.edu.hust.jdbc.JDBCHelper; // 导入JDBCHelper类,用于数据库操作
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayList; // 导入ArrayList类,用于创建列表
+import java.util.List; // 导入List接口
-public class Top10CategoryDaoImpl implements Top10CategoryDao {
- @Override
- public void insert(Top10Category top10Category) {
- String sql="insert into top10_category values(?,?,?,?,?)";
- Object[] params=new Object[]{
- top10Category.getTaskId(),top10Category.getCategoryId(),top10Category.getCategoryId(),
- top10Category.getClickCount(),top10Category.getOrderCount(),top10Category.getPayCount()
+public class Top10CategoryDaoImpl implements Top10CategoryDao { // 定义Top10CategoryDaoImpl类,实现Top10CategoryDao接口
+ @Override // 覆盖接口中的方法
+ public void insert(Top10Category top10Category) { // 定义insert方法,用于插入单个Top10Category对象
+ String sql="insert into top10_category values(?,?,?,?,?)"; // 定义插入SQL语句
+ Object[] params=new Object[]{ // 创建一个对象数组,用于存储Top10Category对象的属性值
+ top10Category.getTaskId(), // 获取任务ID
+ top10Category.getCategoryId(), // 获取分类ID(注意:这里代码中重复了两次,可能是错误)
+ top10Category.getCategoryId(), // 重复的分类ID
+ top10Category.getClickCount(), // 获取点击次数
+ top10Category.getOrderCount(), // 获取订单次数
+ top10Category.getPayCount() // 获取支付次数
};
- JDBCHelper.getInstance().excuteUpdate(sql,params);
+ JDBCHelper.getInstance().excuteUpdate(sql,params); // 调用JDBCHelper的excuteUpdate方法执行SQL更新(注意:这里应该是executeUpdate)
}
- @Override
- public void batchInsert(List top10CategoryList) {
- String sql="insert into top10_category values(?,?,?,?,?)";
- List paramList=new ArrayList();
- for (Top10Category top10Category:top10CategoryList)
- {
- Object[] params=new Object[]{
- top10Category.getTaskId(),top10Category.getCategoryId(),
- top10Category.getClickCount(),top10Category.getOrderCount(),top10Category.getPayCount()
+ @Override // 覆盖接口中的方法
+ public void batchInsert(List top10CategoryList) { // 定义batchInsert方法,用于批量插入Top10Category对象
+ String sql="insert into top10_category values(?,?,?,?,?)"; // 定义插入SQL语句
+ List paramList=new ArrayList(); // 创建一个列表,用于存储每个Top10Category对象的参数数组
+ for (Top10Category top10Category:top10CategoryList) { // 遍历传入的Top10Category对象列表
+ Object[] params=new Object[]{ // 创建一个对象数组,用于存储当前Top10Category对象的属性值
+ top10Category.getTaskId(), // 获取任务ID
+ top10Category.getCategoryId(), // 获取分类ID
+ top10Category.getClickCount(), // 获取点击次数
+ top10Category.getOrderCount(), // 获取订单次数
+ top10Category.getPayCount() // 获取支付次数
};
- paramList.add(params);
+ paramList.add(params); // 将参数数组添加到列表中
}
-
- JDBCHelper.getInstance().excuteBatch(sql,paramList);
+ JDBCHelper.getInstance().excuteBatch(sql,paramList); // 调用JDBCHelper的excuteBatch方法执行批量SQL更新(注意:这里应该是executeBatch)
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/dao/impl/Top10CategorySessionDaoImpl.java b/src/main/java/cn/edu/hust/dao/impl/Top10CategorySessionDaoImpl.java
index 78849a4..2207e26 100644
--- a/src/main/java/cn/edu/hust/dao/impl/Top10CategorySessionDaoImpl.java
+++ b/src/main/java/cn/edu/hust/dao/impl/Top10CategorySessionDaoImpl.java
@@ -1,24 +1,28 @@
-package cn.edu.hust.dao.impl;
+package cn.edu.hust.dao.impl; // 定义包名,表示这个类属于cn.edu.hust.dao.impl包
-import cn.edu.hust.dao.Top10CategorySessionDao;
-import cn.edu.hust.domain.Top10CategorySession;
-import cn.edu.hust.jdbc.JDBCHelper;
+import cn.edu.hust.dao.Top10CategorySessionDao; // 导入Top10CategorySessionDao接口
+import cn.edu.hust.domain.Top10CategorySession; // 导入Top10CategorySession实体类
+import cn.edu.hust.jdbc.JDBCHelper; // 导入JDBCHelper类,用于数据库操作
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayList; // 导入ArrayList类,用于创建列表
+import java.util.List; // 导入List接口
-public class Top10CategorySessionDaoImpl implements Top10CategorySessionDao
+public class Top10CategorySessionDaoImpl implements Top10CategorySessionDao // 定义Top10CategorySessionDaoImpl类,实现Top10CategorySessionDao接口
{
- @Override
- public void batchInsert(List top10CategorySessionList) {
- String sql="insert into top10_category_session values(?,?,?,?)";
- List paramList=new ArrayList();
- for(Top10CategorySession top10CategorySession:top10CategorySessionList)
+ @Override // 覆盖接口中的方法
+ public void batchInsert(List top10CategorySessionList) { // 定义batchInsert方法,用于批量插入Top10CategorySession对象
+ String sql="insert into top10_category_session values(?,?,?,?)"; // 定义插入SQL语句
+ List paramList=new ArrayList(); // 创建一个列表,用于存储每个Top10CategorySession对象的参数数组
+ for(Top10CategorySession top10CategorySession:top10CategorySessionList) // 遍历传入的Top10CategorySession对象列表
{
- Object[] param=new Object[]{top10CategorySession.getTaskId(),top10CategorySession.getCategoryId(),
- top10CategorySession.getSessionId(),top10CategorySession.getClickCount()};
- paramList.add(param);
+ Object[] param=new Object[]{ // 创建一个对象数组,用于存储当前Top10CategorySession对象的属性值
+ top10CategorySession.getTaskId(), // 获取任务ID
+ top10CategorySession.getCategoryId(), // 获取分类ID
+ top10CategorySession.getSessionId(), // 获取会话ID
+ top10CategorySession.getClickCount() // 获取点击次数
+ };
+ paramList.add(param); // 将参数数组添加到列表中
}
- JDBCHelper.getInstance().excuteBatch(sql,paramList);
+ JDBCHelper.getInstance().excuteBatch(sql,paramList); // 调用JDBCHelper的excuteBatch方法执行批量SQL更新(注意:这里应该是executeBatch)
}
-}
+}
\ No newline at end of file
From 5c011ce1b0cefc80475d7f3b8c25f3b577f9aa8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=B0=8F=E5=A8=9C?= <1253094786@qq.com>
Date: Mon, 16 Dec 2024 21:56:02 +0800
Subject: [PATCH 11/43] =?UTF-8?q?=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 40 ++--
pom.xml | 6 +
.../edu/hust/conf/ConfigurationManager.java | 158 +++++++-------
.../java/cn/edu/hust/constant/Constants.java | 192 ++++++++++++------
src/main/java/cn/edu/hust/util/DateUtils.java | 2 +-
.../hust/conf/ConfigurationManagerTest.java | 32 +--
6 files changed, 255 insertions(+), 175 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2edfa9b..5e50896 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,13 @@
-
+
+
+
+
+
+
@@ -401,6 +406,7 @@
+
@@ -420,7 +426,7 @@
-
+
1529592741848
@@ -436,7 +442,14 @@
1529593229553
-
+
+ 1734352510160
+
+
+
+ 1734352510160
+
+
@@ -546,30 +559,17 @@
+
-
+
+
diff --git a/pom.xml b/pom.xml
index 9b55150..e10085e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,12 @@
4.12
test
+
+ junit
+ junit
+ RELEASE
+ test
+
diff --git a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
index dbae85b..6f09f9d 100644
--- a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
+++ b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
@@ -1,75 +1,83 @@
-package cn.edu.hust.conf;
-
-import java.io.InputStream;
-import java.util.Properties;
-
-/**
- * 配置文件管理类
- * 主要的功能:从特定的properties文件中读取相应的key/value
- */
-public class ConfigurationManager {
- private static Properties prop=new Properties();
-
- /**
- * 通过静态代码块加载配置文件
- */
- static{
- try
- {
- //通过类的加载器读取配置文件
- InputStream is=ConfigurationManager.class.getClassLoader().getResourceAsStream("conf.properties");
- //加载配置文件
- prop.load(is);
- }catch(Exception e)
- {
- e.printStackTrace();
- }
- }
-
- /**
- * 通过指定的key获取value
- * @param key
- * @return
- */
- public static String getProperty(String key)
- {
- return prop.getProperty(key);
- }
-
- /**
- * 获取整数变量
- * @param key
- * @return
- */
- public static Integer getInteger(String key)
- {
- String value=getProperty(key);
- try
- {
- Integer result=Integer.valueOf(value);
- return result;
- }
- catch (Exception e)
- {
-
- e.printStackTrace();
- }
- return 0;
- }
-
- /**
- * 获取布尔型
- * @param key
- * @return
- */
- public static Boolean getBoolean(String key)
- {
- String value=getProperty(key);
- if("false".equals(value))
- {
- return false;
- }
- return true;
- }
-
-}
+package cn.edu.hust.conf;//包
+//
+import java.io.InputStream;//申明
+//
+import java.util.Properties;//申明
+//
+//
+ //配置文件管理类
+ //主要的功能:从特定的properties文件中读取相应的key/value
+ //
+public class ConfigurationManager { //
+ // 创建一个静态的Properties对象,用于存储从配置文件中读取的配置信息
+ private static Properties prop = new Properties();// 创建一个静态的Properties对象,用于存储从配置文件中读取的配置信息
+//
+ //
+ // 通过静态代码块加载配置文件
+ //
+ static { //ha
+ try { //dd
+ // 通过类的加载器读取名为"conf.properties"的配置文件
+ InputStream is = ConfigurationManager.class.getClassLoader().getResourceAsStream("conf.properties");//加载
+ // 加载配置文件到Properties对象中
+ prop.load(is);//加载
+ } catch (Exception e)//kuaizai
+ // 捕获加载文件时的异常并打印错误堆栈信息
+ e.printStackTrace();//kuaizai
+ }//对象
+ } //
+//编写过程
+ //编写过程
+ //
+ //通过指定的key获取value
+ // @param key 配置项的key
+ //@return 返回与key对应的value,如果没有则返回null
+ //
+ public static String getProperty(String key) { //
+ // 使用Properties对象的getProperty方法获取指定key的值
+ return prop.getProperty(key); //
+ } //
+//
+ //
+ // 获取整数变量
+ // @param key 配置项的key
+ // @return 返回与key对应的整数值,如果转换失败则返回默认值0
+ //
+ public static Integer getInteger(String key) { //加载
+ // 获取key对应的字符串值
+ String value = getProperty(key);//
+ //
+ try { //
+ // 尝试将字符串值转换为整数
+ Integer result = Integer.valueOf(value);//
+ //
+ return result; //输出结果
+ //
+ } catch (Exception e) { //catch
+ // 捕获转换时的异常并打印错误堆栈信息
+ e.printStackTrace(); //e
+ //
+ }//
+ // 如果转换失败,返回默认值0
+ return 0; //返回值
+ } //
+//
+ //
+ //获取布尔型
+ // @param key 配置项的key
+ // @return 返回与key对应的布尔值,如果值为"false"则返回false,其他情况返回true
+ //
+ public static Boolean getBoolean(String key) { //
+ // 获取key对应的字符串值
+ String value = getProperty(key); //string
+ // 如果值为"false"(不区分大小写),则返回false
+ if ("false".equals(value)) { //错误
+ //返回值
+ return false; //返回错误结果
+ } //
+ // 默认返回true
+ return true; //返回正确
+ }//
+ //
+}//
+//完成
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/constant/Constants.java b/src/main/java/cn/edu/hust/constant/Constants.java
index 4ad5a94..ead3d2b 100644
--- a/src/main/java/cn/edu/hust/constant/Constants.java
+++ b/src/main/java/cn/edu/hust/constant/Constants.java
@@ -1,64 +1,128 @@
-package cn.edu.hust.constant;
-
-public class Constants {
- /**
- * 项目配置常量
- */
- public static final String JDBC_DRIVER="jdbc.driver";
- public static final String JDBC_URL="jdbc.url";
- public static final String JDBC_USERNAME="jdbc.username";
- public static final String JDBC_PSSWORD="jdbc.password";
- public static final String JDBC_ACTIVE="jdbc.active";
-
- /**
- * Spark作业相关常量
- */
- public static final String APP_NAME_SESSION="UserVisitAnalyze";
- public static final String SPARK_LOCAL="spark_local";
- public static final String FIELD_SESSIONID="sessionId";
- public static final String FIELD_SERACH_KEYWORDS="searchKeywords";
- public static final String FIELD_CLICK_CATEGORYIDS="clickCategoryIds";
- public static final String FIELD_AGE="age";
- public static final String FIELD_CITY="city";
- public static final String FIELD_SEX="sex";
- public static final String FIELD_PROFESSIONAL="professional";
- public static final String FIELD_VISIT_LENGTH="visitLength";
- public static final String FIELD_STEP_LENGTH="stepLength";
- public static final String FIELD_START_TIME="startTime";
- public static final String FIELD_CATEGORY_ID="categoryId";
- public static final String FIELD_CLICK_CATEGORY="categoryId";
- public static final String FIELD_ORDER_CATEGORY="clickCategory";
- public static final String FIELD_PAY_CATEGORY="orderCategory";
-
- /**
- * Spark任务相关厂常量
- */
- public static final String PARAM_STARTTIME ="startDate";
- public static final String PARAM_ENDTIME ="endDate";
- public static final String PARAM_STARTAGE ="startAge";
- public static final String PARAM_ENDAGE ="endAge";
- public static final String PARAM_PROFESSONALS ="professionals";
- public static final String PARAM_CIYTIES ="cities";
- public static final String PARAM_SEX ="sex";
- public static final String PARAM_SERACH_KEYWORDS="searchKeywords";
- public static final String PARAM_CLICK_CATEGORYIDS="clickCategoryIds";
-
- public static final String SESSION_COUNT = "session_count";
- public static final String TIME_PERIOD_1s_3s = "1s_3s";
- public static final String TIME_PERIOD_4s_6s = "4s_6s";
- public static final String TIME_PERIOD_7s_9s = "7s_9s";
- public static final String TIME_PERIOD_10s_30s = "10s_30s";
- public static final String TIME_PERIOD_30s_60s = "30s_60s";
- public static final String TIME_PERIOD_1m_3m = "1m_3m";
- public static final String TIME_PERIOD_3m_10m = "3m_10m";
- public static final String TIME_PERIOD_10m_30m = "10m_30m";
- public static final String TIME_PERIOD_30m = "30m";
-
- public static final String STEP_PERIOD_1_3 = "1_3";
- public static final String STEP_PERIOD_4_6 = "4_6";
- public static final String STEP_PERIOD_7_9 = "7_9";
- public static final String STEP_PERIOD_10_30 = "10_30";
- public static final String STEP_PERIOD_30_60 = "30_60";
- public static final String STEP_PERIOD_60 = "60";
-
-}
+//开始
+package cn.edu.hust.constant;//申明
+//
+public class Constants { //
+//
+ //
+ // 项目配置常量
+ //这些常量用于存储数据库连接的配置信息
+ //
+ public static final String JDBC_DRIVER="jdbc.driver"; // JDBC驱动类
+ //
+ public static final String JDBC_URL="jdbc.url"; // 数据库连接URL
+ //
+ public static final String JDBC_USERNAME="jdbc.username"; // 数据库用户名
+ //
+ public static final String JDBC_PSSWORD="jdbc.password"; // 数据库密码
+ //
+ public static final String JDBC_ACTIVE="jdbc.active"; // 数据库连接是否活跃
+ //
+//
+ //
+ //Spark作业相关常量
+ // 这些常量用于存储Spark作业相关的配置信息、字段名等
+ //
+ public static final String APP_NAME_SESSION="UserVisitAnalyze"; // Spark应用名称,用于标识作业
+ //
+ public static final String SPARK_LOCAL="spark_local"; // Spark本地模式的配置标识
+ //
+ public static final String FIELD_SESSIONID="sessionId"; // 用户会话ID字段名
+ //
+ public static final String FIELD_SERACH_KEYWORDS="searchKeywords"; // 搜索关键词字段名
+ //
+ public static final String FIELD_CLICK_CATEGORYIDS="clickCategoryIds"; // 点击的分类ID字段名
+ //
+ public static final String FIELD_AGE="age"; // 用户年龄字段名
+ //
+ public static final String FIELD_CITY="city"; // 用户所在城市字段名
+ //
+ public static final String FIELD_SEX="sex"; // 用户性别字段名
+ //
+ public static final String FIELD_PROFESSIONAL="professional"; // 用户职业字段名
+ //
+ public static final String FIELD_VISIT_LENGTH="visitLength"; // 访问时长字段名
+ //
+ public static final String FIELD_STEP_LENGTH="stepLength"; // 访问步长字段名
+ //
+ public static final String FIELD_START_TIME="startTime"; // 会话开始时间字段名
+ //
+ public static final String FIELD_CATEGORY_ID="categoryId"; // 分类ID字段名
+ //
+ public static final String FIELD_CLICK_CATEGORY="categoryId"; // 点击的分类字段名
+ //
+ public static final String FIELD_ORDER_CATEGORY="clickCategory"; // 订单分类字段名
+ //
+ public static final String FIELD_PAY_CATEGORY="orderCategory"; // 支付分类字段名
+//
+ //
+ // Spark任务相关参数常量
+ // 这些常量用于存储Spark任务中的参数名称
+ //
+ public static final String PARAM_STARTTIME ="startDate"; // 起始日期参数
+ //
+ public static final String PARAM_ENDTIME ="endDate"; // 结束日期参数
+ //
+ public static final String PARAM_STARTAGE ="startAge"; // 起始年龄参数
+ //
+ public static final String PARAM_ENDAGE ="endAge"; // 结束年龄参数
+ //
+ public static final String PARAM_PROFESSONALS ="professionals"; // 专业参数
+ //
+ public static final String PARAM_CIYTIES ="cities"; // 城市参数
+ //
+ public static final String PARAM_SEX ="sex"; // 性别参数
+ //
+ public static final String PARAM_SERACH_KEYWORDS="searchKeywords"; // 搜索关键词参数
+ //
+ public static final String PARAM_CLICK_CATEGORYIDS="clickCategoryIds"; // 点击的分类ID参数
+ //
+//
+ //
+ // 会话统计相关常量
+ //用于会话时长或访问步数的统计分类
+ //
+ public static final String SESSION_COUNT = "session_count"; // 会话统计
+ //
+//
+ //
+ // 用户访问时长时间段常量
+ //用于标识用户访问时长的各个时间段
+ //
+ public static final String TIME_PERIOD_1s_3s = "1s_3s"; // 1秒到3秒的时长
+ //
+ public static final String TIME_PERIOD_4s_6s = "4s_6s"; // 4秒到6秒的时长
+ //
+ public static final String TIME_PERIOD_7s_9s = "7s_9s"; // 7秒到9秒的时长
+ //
+ public static final String TIME_PERIOD_10s_30s = "10s_30s"; // 10秒到30秒的时长
+ //
+ public static final String TIME_PERIOD_30s_60s = "30s_60s"; // 30秒到60秒的时长
+ //
+ public static final String TIME_PERIOD_1m_3m = "1m_3m"; // 1分钟到3分钟的时长
+ //
+ public static final String TIME_PERIOD_3m_10m = "3m_10m"; // 3分钟到10分钟的时长
+ //
+ public static final String TIME_PERIOD_10m_30m = "10m_30m"; // 10分钟到30分钟的时长
+ //
+ public static final String TIME_PERIOD_30m = "30m"; // 超过30分钟的时长
+ //
+//
+ //
+ // 用户访问步数时间段常量
+ //用于标识用户的访问步数区间
+ //
+ public static final String STEP_PERIOD_1_3 = "1_3"; // 1步到3步的访问
+ //
+ public static final String STEP_PERIOD_4_6 = "4_6"; // 4步到6步的访问
+ //
+ public static final String STEP_PERIOD_7_9 = "7_9"; // 7步到9步的访问
+ //
+ public static final String STEP_PERIOD_10_30 = "10_30"; // 10步到30步的访问
+ //
+ public static final String STEP_PERIOD_30_60 = "30_60"; // 30步到60步的访问
+ //
+ public static final String STEP_PERIOD_60 = "60"; // 超过60步的访问
+ //
+//
+}//返回
+//完成
diff --git a/src/main/java/cn/edu/hust/util/DateUtils.java b/src/main/java/cn/edu/hust/util/DateUtils.java
index e5f32bb..1bfde96 100644
--- a/src/main/java/cn/edu/hust/util/DateUtils.java
+++ b/src/main/java/cn/edu/hust/util/DateUtils.java
@@ -7,7 +7,7 @@ import java.util.Date;
/**
* 日期时间工具类
- * @author Administrator111
+ * @author Administrator111222
*
*/
public class DateUtils {
diff --git a/src/test/java/cn/edu/hust/conf/ConfigurationManagerTest.java b/src/test/java/cn/edu/hust/conf/ConfigurationManagerTest.java
index 75d3272..932b499 100644
--- a/src/test/java/cn/edu/hust/conf/ConfigurationManagerTest.java
+++ b/src/test/java/cn/edu/hust/conf/ConfigurationManagerTest.java
@@ -1,15 +1,17 @@
-package cn.edu.hust.conf;
-
-
-import org.junit.Test;
-
-public class ConfigurationManagerTest {
- /**
- * 测试配置文件管理类
- */
- @Test
- public void getMethod()
- {
- System.out.println(ConfigurationManager.getProperty("key1"));
- }
-}
+//开始
+package cn.edu.hust.conf; // 导入包:配置管理相关的类
+//
+import org.junit.Test; // 导入JUnit的Test注解,用于标识测试方法
+//
+public class ConfigurationManagerTest { // 定义测试类,测试ConfigurationManager类的功能
+ //
+ //测试配置文件管理类 // 方法注释,表示该方法用于测试配置文件管理类
+ //
+ @Test // 使用JUnit的Test注解,表示该方法为一个测试方法
+ //
+ public void getMethod() // 定义一个测试方法
+ { //
+ System.out.println(ConfigurationManager.getProperty("key1")); // 打印从ConfigurationManager获取key1对应的属性值
+ }//
+}//
+//完成
From 0966dc92b6d182213c0bacb70c8fb17d2042cd81 Mon Sep 17 00:00:00 2001
From: yy <2565886549@qq.com>
Date: Mon, 16 Dec 2024 21:56:09 +0800
Subject: [PATCH 12/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 22 +--
.../hust/dao/impl/SessionAggrStatDaoImpl.java | 57 +++++---
.../hust/dao/impl/SessionDetailDaoImpl.java | 135 ++++++++++++------
.../dao/impl/SessionRandomExtractDaoImpl.java | 60 +++++---
.../cn/edu/hust/dao/impl/TaskDaoImpl.java | 78 ++++++----
.../hust/dao/impl/Top10CategoryDaoImpl.java | 93 ++++++++----
.../dao/impl/Top10CategorySessionDaoImpl.java | 57 +++++---
src/main/java/cn/edu/hust/demo/Singleton.java | 67 ++++-----
8 files changed, 366 insertions(+), 203 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 38b8afc..b82f45f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,11 +6,9 @@
+
-
-
-
-
+
@@ -428,7 +426,7 @@
-
+
1529592741848
@@ -451,7 +449,14 @@
1734355623186
-
+
+ 1734356287423
+
+
+
+ 1734356287423
+
+
@@ -575,11 +580,6 @@
-
- file://$PROJECT_DIR$/src/main/java/cn/edu/hust/dao/impl/SessionAggrStatDaoImpl.java
- 24
-
-
file://$PROJECT_DIR$/src/main/java/cn/edu/hust/dao/SessionDetailDao.java
7
diff --git a/src/main/java/cn/edu/hust/dao/impl/SessionAggrStatDaoImpl.java b/src/main/java/cn/edu/hust/dao/impl/SessionAggrStatDaoImpl.java
index 3952939..97ac4ca 100644
--- a/src/main/java/cn/edu/hust/dao/impl/SessionAggrStatDaoImpl.java
+++ b/src/main/java/cn/edu/hust/dao/impl/SessionAggrStatDaoImpl.java
@@ -1,15 +1,24 @@
-package cn.edu.hust.dao.impl; // 定义包名,表示这个类属于cn.edu.hust.dao.impl包
+package cn.edu.hust.dao.impl;
+// 定义包名,表示这个类属于cn.edu.hust.dao.impl包
-import cn.edu.hust.dao.SessionAggrStatDao; // 导入SessionAggrStatDao接口
-import cn.edu.hust.domain.SessionAggrStat; // 导入SessionAggrStat实体类
-import cn.edu.hust.jdbc.JDBCHelper; // 导入JDBCHelper类,用于数据库操作
+import cn.edu.hust.dao.SessionAggrStatDao;
+// 导入SessionAggrStatDao接口
+import cn.edu.hust.domain.SessionAggrStat;
+// 导入SessionAggrStat实体类
+import cn.edu.hust.jdbc.JDBCHelper;
+// 导入JDBCHelper类,用于数据库操作
-import java.util.ArrayList; // 导入ArrayList类,用于创建列表
-import java.util.List; // 导入List接口
+import java.util.ArrayList;
+// 导入ArrayList类,用于创建列表
+import java.util.List;
+// 导入List接口
-public class SessionAggrStatDaoImpl implements SessionAggrStatDao { // 定义SessionAggrStatDaoImpl类,实现SessionAggrStatDao接口
- @Override // 覆盖接口中的方法
- public void insert(SessionAggrStat sessionAggrStat) { // 定义insert方法,用于插入单个SessionAggrStat对象
+public class SessionAggrStatDaoImpl implements SessionAggrStatDao {
+ // 定义SessionAggrStatDaoImpl类,实现SessionAggrStatDao接口
+ @Override
+ // 覆盖接口中的方法
+ public void insert(SessionAggrStat sessionAggrStat) {
+ // 定义insert方法,用于插入单个SessionAggrStat对象
String sql="insert into session_aggr_stat values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; // 定义插入SQL语句
Object[] params={sessionAggrStat.getTaskId(),sessionAggrStat.getSessionCount(),sessionAggrStat.getVisit_Length_1s_3s(),
sessionAggrStat.getVisit_Length_4s_6s(),sessionAggrStat.getVisit_Length_7s_9s(),
@@ -18,15 +27,22 @@ public class SessionAggrStatDaoImpl implements SessionAggrStatDao { // 定义Ses
,sessionAggrStat.getVisit_Length_10m_30m(),sessionAggrStat.getVisit_Length_30m(),
sessionAggrStat.getStep_Length_1_3(),sessionAggrStat.getStep_Length_4_6(),sessionAggrStat.getStep_Length_7_9(),
sessionAggrStat.getStep_Length_7_9(),sessionAggrStat.getStep_Length_10_30(),
- sessionAggrStat.getStep_Length_30_60()}; // 创建参数数组,包含SessionAggrStat对象的所有属性
- JDBCHelper.getInstance().excuteUpdate(sql,params); // 调用JDBCHelper的excuteUpdate方法执行SQL更新
+ sessionAggrStat.getStep_Length_30_60()};
+ // 创建参数数组,包含SessionAggrStat对象的所有属性
+ JDBCHelper.getInstance().excuteUpdate(sql,params);
+ // 调用JDBCHelper的excuteUpdate方法执行SQL更新
}
- @Override // 覆盖接口中的方法
- public void batchInsert(List sessionAggrStatList) { // 定义batchInsert方法,用于批量插入SessionAggrStat对象
- String sql="insert into session_aggr_stat values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; // 定义插入SQL语句
- List paramList=new ArrayList(); // 创建一个列表,用于存储每个SessionAggrStat对象的参数数组
- for (SessionAggrStat sessionAggrStat:sessionAggrStatList) { // 遍历传入的SessionAggrStat对象列表
+ @Override
+ // 覆盖接口中的方法
+ public void batchInsert(List sessionAggrStatList) {
+ // 定义batchInsert方法,用于批量插入SessionAggrStat对象
+ String sql="insert into session_aggr_stat values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ // 定义插入SQL语句
+ List paramList=new ArrayList();
+ // 创建一个列表,用于存储每个SessionAggrStat对象的参数数组
+ for (SessionAggrStat sessionAggrStat:sessionAggrStatList) {
+ // 遍历传入的SessionAggrStat对象列表
Object[] params={sessionAggrStat.getTaskId(),sessionAggrStat.getSessionCount(),sessionAggrStat.getVisit_Length_1s_3s(),
sessionAggrStat.getVisit_Length_4s_6s(),sessionAggrStat.getVisit_Length_7s_9s(),
sessionAggrStat.getVisit_Length_10s_30s(),sessionAggrStat.getVisit_Length_30s_60s(),
@@ -34,9 +50,12 @@ public class SessionAggrStatDaoImpl implements SessionAggrStatDao { // 定义Ses
,sessionAggrStat.getVisit_Length_10m_30m(),sessionAggrStat.getVisit_Length_30m(),
sessionAggrStat.getStep_Length_1_3(),sessionAggrStat.getStep_Length_4_6(),sessionAggrStat.getStep_Length_7_9(),
sessionAggrStat.getStep_Length_7_9(),sessionAggrStat.getStep_Length_10_30(),
- sessionAggrStat.getStep_Length_30_60()}; // 创建参数数组,包含当前SessionAggrStat对象的所有属性
- paramList.add(params); // 将参数数组添加到列表中
+ sessionAggrStat.getStep_Length_30_60()};
+ // 创建参数数组,包含当前SessionAggrStat对象的所有属性
+ paramList.add(params);
+ // 将参数数组添加到列表中
}
- JDBCHelper.getInstance().excuteBatch(sql,paramList); // 调用JDBCHelper的excuteBatch方法执行批量SQL更新
+ JDBCHelper.getInstance().excuteBatch(sql,paramList);
+ // 调用JDBCHelper的excuteBatch方法执行批量SQL更新
}
}
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/dao/impl/SessionDetailDaoImpl.java b/src/main/java/cn/edu/hust/dao/impl/SessionDetailDaoImpl.java
index aeb4873..f026c76 100644
--- a/src/main/java/cn/edu/hust/dao/impl/SessionDetailDaoImpl.java
+++ b/src/main/java/cn/edu/hust/dao/impl/SessionDetailDaoImpl.java
@@ -1,55 +1,100 @@
-package cn.edu.hust.dao.impl; // 定义包名,表示这个类属于cn.edu.hust.dao.impl包
+package cn.edu.hust.dao.impl;
+// 定义包名,表示这个类属于cn.edu.hust.dao.impl包
-import cn.edu.hust.dao.SessionDetailDao; // 导入SessionDetailDao接口
-import cn.edu.hust.domain.SessionDetail; // 导入SessionDetail实体类
-import cn.edu.hust.jdbc.JDBCHelper; // 导入JDBCHelper类,用于数据库操作
+import cn.edu.hust.dao.SessionDetailDao;
+// 导入SessionDetailDao接口
+import cn.edu.hust.domain.SessionDetail;
+// 导入SessionDetail实体类
+import cn.edu.hust.jdbc.JDBCHelper;
+// 导入JDBCHelper类,用于数据库操作
-import java.io.Serializable; // 导入Serializable接口,用于序列化
-import java.util.ArrayList; // 导入ArrayList类,用于创建列表
-import java.util.List; // 导入List接口
+import java.io.Serializable;
+// 导入Serializable接口,用于序列化
+import java.util.ArrayList;
+// 导入ArrayList类,用于创建列表
+import java.util.List;
+// 导入List接口
-public class SessionDetailDaoImpl implements SessionDetailDao { // 定义SessionDetailDaoImpl类,实现SessionDetailDao接口
- @Override // 覆盖接口中的方法
- public void insert(SessionDetail sessionDetail) { // 定义insert方法,用于插入单个SessionDetail对象
- String sql="insert into session_detail values(?,?,?,?,?,?,?,?,?,?,?,?,?)"; // 定义插入SQL语句
- Object[] object=new Object[]{ // 创建一个对象数组,用于存储SessionDetail对象的属性值
- sessionDetail.getTaskId(), // 获取任务ID
- sessionDetail.getUserId(), // 获取用户ID
- sessionDetail.getSessinId(), // 获取会话ID(注意:这里可能是拼写错误,应该是sessionDetail.getSessionId())
- sessionDetail.getPageid(), // 获取页面ID
- sessionDetail.getActionTime(), // 获取操作时间
- sessionDetail.getSearchKeyWord(), // 获取搜索关键词
- sessionDetail.getClickCategoryId(), // 获取点击的分类ID
- sessionDetail.getClickProductId(), // 获取点击的产品ID
- sessionDetail.getOrderCategoryIds(), // 获取订单的分类IDs
- sessionDetail.getOrderProductIds(), // 获取订单的产品IDs
- sessionDetail.getPayCategoryIds(), // 获取支付的分类IDs
- sessionDetail.getPayProductIds() // 获取支付的产品IDs
+public class SessionDetailDaoImpl implements SessionDetailDao {
+ // 定义SessionDetailDaoImpl类,实现SessionDetailDao接口
+ @Override
+ // 覆盖接口中的方法
+ public void insert(SessionDetail sessionDetail) {
+ // 定义insert方法,用于插入单个SessionDetail对象
+ String sql="insert into session_detail values(?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ // 定义插入SQL语句
+ Object[] object=new Object[]{
+ // 创建一个对象数组,用于存储SessionDetail对象的属性值
+ sessionDetail.getTaskId(),
+ // 获取任务ID
+ sessionDetail.getUserId(),
+ // 获取用户ID
+ sessionDetail.getSessinId(),
+ // 获取会话ID(注意:这里可能是拼写错误,应该是sessionDetail.getSessionId())
+ sessionDetail.getPageid(),
+ // 获取页面ID
+ sessionDetail.getActionTime(),
+ // 获取操作时间
+ sessionDetail.getSearchKeyWord(),
+ // 获取搜索关键词
+ sessionDetail.getClickCategoryId(),
+ // 获取点击的分类ID
+ sessionDetail.getClickProductId(),
+ // 获取点击的产品ID
+ sessionDetail.getOrderCategoryIds(),
+ // 获取订单的分类IDs
+ sessionDetail.getOrderProductIds(),
+ // 获取订单的产品IDs
+ sessionDetail.getPayCategoryIds(),
+ // 获取支付的分类IDs
+ sessionDetail.getPayProductIds()
+ // 获取支付的产品IDs
};
- JDBCHelper.getInstance().excuteUpdate(sql,object); // 调用JDBCHelper的excuteUpdate方法执行SQL更新(注意:这里应该是executeUpdate)
+ JDBCHelper.getInstance().excuteUpdate(sql,object);
+ // 调用JDBCHelper的excuteUpdate方法执行SQL更新(注意:这里应该是executeUpdate)
}
- @Override // 覆盖接口中的方法
- public void batchInsert(List sessionDetailList) { // 定义batchInsert方法,用于批量插入SessionDetail对象
- String sql="insert into session_detail values(?,?,?,?,?,?,?,?,?,?,?,?,?)"; // 定义插入SQL语句
- List paramList=new ArrayList(); // 创建一个列表,用于存储每个SessionDetail对象的参数数组
- for (SessionDetail sessionDetail:sessionDetailList) { // 遍历传入的SessionDetail对象列表
- Object[] object=new Object[]{ // 创建一个对象数组,用于存储当前SessionDetail对象的属性值
- sessionDetail.getTaskId(), // 获取任务ID
- sessionDetail.getUserId(), // 获取用户ID
- sessionDetail.getSessinId(), // 获取会话ID(注意:这里可能是拼写错误,应该是sessionDetail.getSessionId())
- sessionDetail.getPageid(), // 获取页面ID
- sessionDetail.getActionTime(), // 获取操作时间
- sessionDetail.getSearchKeyWord(), // 获取搜索关键词
- sessionDetail.getClickCategoryId(), // 获取点击的分类ID
- sessionDetail.getClickProductId(), // 获取点击的产品ID
- sessionDetail.getOrderCategoryIds(), // 获取订单的分类IDs
- sessionDetail.getOrderProductIds(), // 获取订单的产品IDs
- sessionDetail.getPayCategoryIds(), // 获取支付的分类IDs
- sessionDetail.getPayProductIds() // 获取支付的产品IDs
+ @Override
+ // 覆盖接口中的方法
+ public void batchInsert(List sessionDetailList) {
+ // 定义batchInsert方法,用于批量插入SessionDetail对象
+ String sql="insert into session_detail values(?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ // 定义插入SQL语句
+ List paramList=new ArrayList();
+ // 创建一个列表,用于存储每个SessionDetail对象的参数数组
+ for (SessionDetail sessionDetail:sessionDetailList) {
+ // 遍历传入的SessionDetail对象列表
+ Object[] object=new Object[]{
+ // 创建一个对象数组,用于存储当前SessionDetail对象的属性值
+ sessionDetail.getTaskId(),
+ // 获取任务ID
+ sessionDetail.getUserId(),
+ // 获取用户ID
+ sessionDetail.getSessinId(),
+ // 获取会话ID(注意:这里可能是拼写错误,应该是sessionDetail.getSessionId())
+ sessionDetail.getPageid(),
+ // 获取页面ID
+ sessionDetail.getActionTime(),
+ // 获取操作时间
+ sessionDetail.getSearchKeyWord(),
+ // 获取搜索关键词
+ sessionDetail.getClickCategoryId(),
+ // 获取点击的分类ID
+ sessionDetail.getClickProductId(),
+ // 获取点击的产品ID
+ sessionDetail.getOrderCategoryIds(),
+ // 获取订单的分类IDs
+ sessionDetail.getOrderProductIds(),
+ // 获取订单的产品IDs
+ sessionDetail.getPayCategoryIds(),
+ // 获取支付的分类IDs
+ sessionDetail.getPayProductIds()
+ // 获取支付的产品IDs
};
- paramList.add(object); // 将参数数组添加到列表中
+ paramList.add(object);
+ // 将参数数组添加到列表中
}
- JDBCHelper.getInstance().excuteBatch(sql,paramList); // 调用JDBCHelper的excuteBatch方法执行批量SQL更新(注意:这里应该是executeBatch)
+ JDBCHelper.getInstance().excuteBatch(sql,paramList);
+ // 调用JDBCHelper的excuteBatch方法执行批量SQL更新(注意:这里应该是executeBatch)
}
}
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/dao/impl/SessionRandomExtractDaoImpl.java b/src/main/java/cn/edu/hust/dao/impl/SessionRandomExtractDaoImpl.java
index 9feca34..6b55a89 100644
--- a/src/main/java/cn/edu/hust/dao/impl/SessionRandomExtractDaoImpl.java
+++ b/src/main/java/cn/edu/hust/dao/impl/SessionRandomExtractDaoImpl.java
@@ -1,27 +1,47 @@
-package cn.edu.hust.dao.impl; // 定义包名,表示这个类属于cn.edu.hust.dao.impl包
+package cn.edu.hust.dao.impl;
+// 定义包名,表示这个类属于cn.edu.hust.dao.impl包
-import cn.edu.hust.dao.SessionRandomExtractDao; // 导入SessionRandomExtractDao接口
-import cn.edu.hust.domain.SessionRandomExtract; // 导入SessionRandomExtract实体类
-import cn.edu.hust.jdbc.JDBCHelper; // 导入JDBCHelper类,用于数据库操作
+import cn.edu.hust.dao.SessionRandomExtractDao;
+// 导入SessionRandomExtractDao接口
+import cn.edu.hust.domain.SessionRandomExtract;
+// 导入SessionRandomExtract实体类
+import cn.edu.hust.jdbc.JDBCHelper;
+// 导入JDBCHelper类,用于数据库操作
-import java.util.ArrayList; // 导入ArrayList类,用于创建列表
-import java.util.List; // 导入List接口
+import java.util.ArrayList;
+// 导入ArrayList类,用于创建列表
+import java.util.List;
+// 导入List接口
-public class SessionRandomExtractDaoImpl implements SessionRandomExtractDao { // 定义SessionRandomExtractDaoImpl类,实现SessionRandomExtractDao接口
- @Override // 覆盖接口中的方法
- public void batchInsert(List sessionRandomExtractList) { // 定义batchInsert方法,用于批量插入SessionRandomExtract对象
- String sql="insert into session_random_extract values(?,?,?,?,?)"; // 定义插入SQL语句
- List paramList=new ArrayList(); // 创建一个列表,用于存储每个SessionRandomExtract对象的参数数组
- for (SessionRandomExtract sessionRandomExtract:sessionRandomExtractList) { // 遍历传入的SessionRandomExtract对象列表
- Object[] params=new Object[]{ // 创建一个对象数组,用于存储当前SessionRandomExtract对象的属性值
- sessionRandomExtract.getTaskId(), // 获取任务ID
- sessionRandomExtract.getSessionId(), // 获取会话ID
- sessionRandomExtract.getStartTime(), // 获取开始时间
- sessionRandomExtract.getSearchKeyWords(), // 获取搜索关键词
- sessionRandomExtract.getClick_category_ids() // 获取点击的分类IDs
+public class SessionRandomExtractDaoImpl implements SessionRandomExtractDao {
+ // 定义SessionRandomExtractDaoImpl类,实现SessionRandomExtractDao接口
+ @Override
+ // 覆盖接口中的方法
+ public void batchInsert(List sessionRandomExtractList) {
+ // 定义batchInsert方法,用于批量插入SessionRandomExtract对象
+ String sql="insert into session_random_extract values(?,?,?,?,?)";
+ // 定义插入SQL语句
+ List paramList=new ArrayList();
+ // 创建一个列表,用于存储每个SessionRandomExtract对象的参数数组
+ for (SessionRandomExtract sessionRandomExtract:sessionRandomExtractList) {
+ // 遍历传入的SessionRandomExtract对象列表
+ Object[] params=new Object[]{
+ // 创建一个对象数组,用于存储当前SessionRandomExtract对象的属性值
+ sessionRandomExtract.getTaskId(),
+ // 获取任务ID
+ sessionRandomExtract.getSessionId(),
+ // 获取会话ID
+ sessionRandomExtract.getStartTime(),
+ // 获取开始时间
+ sessionRandomExtract.getSearchKeyWords(),
+ // 获取搜索关键词
+ sessionRandomExtract.getClick_category_ids()
+ // 获取点击的分类IDs
};
- paramList.add(params); // 将参数数组添加到列表中
+ paramList.add(params);
+ // 将参数数组添加到列表中
}
- JDBCHelper.getInstance().excuteBatch(sql,paramList); // 调用JDBCHelper的excuteBatch方法执行批量SQL更新(注意:这里应该是executeBatch)
+ JDBCHelper.getInstance().excuteBatch(sql,paramList);
+ // 调用JDBCHelper的excuteBatch方法执行批量SQL更新(注意:这里应该是executeBatch)
}
}
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/dao/impl/TaskDaoImpl.java b/src/main/java/cn/edu/hust/dao/impl/TaskDaoImpl.java
index a84d06b..3ca2293 100644
--- a/src/main/java/cn/edu/hust/dao/impl/TaskDaoImpl.java
+++ b/src/main/java/cn/edu/hust/dao/impl/TaskDaoImpl.java
@@ -1,38 +1,64 @@
-package cn.edu.hust.dao.impl; // 定义包名,表示这个类属于cn.edu.hust.dao.impl包
+package cn.edu.hust.dao.impl;
+// 定义包名,表示这个类属于cn.edu.hust.dao.impl包
-import cn.edu.hust.dao.TaskDao; // 导入TaskDao接口
-import cn.edu.hust.domain.Task; // 导入Task实体类
-import cn.edu.hust.jdbc.JDBCHelper; // 导入JDBCHelper类,用于数据库操作
+import cn.edu.hust.dao.TaskDao;
+// 导入TaskDao接口
+import cn.edu.hust.domain.Task;
+// 导入Task实体类
+import cn.edu.hust.jdbc.JDBCHelper;
+// 导入JDBCHelper类,用于数据库操作
-import java.sql.ResultSet; // 导入ResultSet类,用于处理查询结果
-import java.sql.SQLException; // 导入SQLException类,用于处理SQL异常
+import java.sql.ResultSet;
+// 导入ResultSet类,用于处理查询结果
+import java.sql.SQLException;
+// 导入SQLException类,用于处理SQL异常
-public class TaskDaoImpl implements TaskDao { // 定义TaskDaoImpl类,实现TaskDao接口
- @Override // 覆盖接口中的方法
- public Task findTaskById(Long id) { // 定义findTaskById方法,根据ID查找任务
- String sql="select * from task where task_id=?"; // 定义查询SQL语句
- final Task task=new Task(); // 创建Task对象,用于存储查询结果
- JDBCHelper.getInstance().excuteQuery(sql, new Object[]{id}, new JDBCHelper.QueryCallBack() { // 调用JDBCHelper的excuteQuery方法执行查询
+public class TaskDaoImpl implements TaskDao {
+ // 定义TaskDaoImpl类,实现TaskDao接口
+ @Override
+ // 覆盖接口中的方法
+ public Task findTaskById(Long id) {
+ // 定义findTaskById方法,根据ID查找任务
+ String sql="select * from task where task_id=?";
+ // 定义查询SQL语句
+ final Task task=new Task();
+ // 创建Task对象,用于存储查询结果
+ JDBCHelper.getInstance().excuteQuery(sql, new Object[]{id}, new JDBCHelper.QueryCallBack() {
+ // 调用JDBCHelper的excuteQuery方法执行查询
@Override
- public void process(ResultSet rs) { // 定义process方法,处理查询结果
+ public void process(ResultSet rs) {
+ // 定义process方法,处理查询结果
try {
- if(rs.next()) // 如果查询结果有数据
+ if(rs.next())
+ // 如果查询结果有数据
{
- Long id=rs.getLong(1); // 获取任务ID
- String taskName=rs.getString(2); // 获取任务名称
- String createTime=rs.getString(3); // 获取创建时间
- String startTime=rs.getString(4); // 获取开始时间
- String finishTime=rs.getString(5); // 获取完成时间
- String taskType=rs.getString(6); // 获取任务类型
- String taskStatus=rs.getString(7); // 获取任务状态
- String taskParam=rs.getString(8); // 获取任务参数
- task.set(id,taskName,createTime,startTime,finishTime,taskType,taskStatus,taskParam); // 设置Task对象的属性
+ Long id=rs.getLong(1);
+ // 获取任务ID
+ String taskName=rs.getString(2);
+ // 获取任务名称
+ String createTime=rs.getString(3);
+ // 获取创建时间
+ String startTime=rs.getString(4);
+ // 获取开始时间
+ String finishTime=rs.getString(5);
+ // 获取完成时间
+ String taskType=rs.getString(6);
+ // 获取任务类型
+ String taskStatus=rs.getString(7);
+ // 获取任务状态
+ String taskParam=rs.getString(8);
+ // 获取任务参数
+ task.set(id,taskName,createTime,startTime,finishTime,taskType,taskStatus,taskParam);
+ // 设置Task对象的属性
}
- } catch (SQLException e) { // 捕获并处理SQLException
- e.printStackTrace(); // 打印异常堆栈信息
+ } catch (SQLException e) {
+ // 捕获并处理SQLException
+ e.printStackTrace();
+ // 打印异常堆栈信息
}
}
});
- return task; // 返回Task对象
+ return task;
+ // 返回Task对象
}
}
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/dao/impl/Top10CategoryDaoImpl.java b/src/main/java/cn/edu/hust/dao/impl/Top10CategoryDaoImpl.java
index 0800d80..5db732e 100644
--- a/src/main/java/cn/edu/hust/dao/impl/Top10CategoryDaoImpl.java
+++ b/src/main/java/cn/edu/hust/dao/impl/Top10CategoryDaoImpl.java
@@ -1,41 +1,72 @@
-package cn.edu.hust.dao.impl; // 定义包名,表示这个类属于cn.edu.hust.dao.impl包
+package cn.edu.hust.dao.impl;
+// 定义包名,表示这个类属于cn.edu.hust.dao.impl包
-import cn.edu.hust.dao.Top10CategoryDao; // 导入Top10CategoryDao接口
-import cn.edu.hust.domain.Top10Category; // 导入Top10Category实体类
-import cn.edu.hust.jdbc.JDBCHelper; // 导入JDBCHelper类,用于数据库操作
+import cn.edu.hust.dao.Top10CategoryDao;
+// 导入Top10CategoryDao接口
+import cn.edu.hust.domain.Top10Category;
+// 导入Top10Category实体类
+import cn.edu.hust.jdbc.JDBCHelper;
+// 导入JDBCHelper类,用于数据库操作
-import java.util.ArrayList; // 导入ArrayList类,用于创建列表
-import java.util.List; // 导入List接口
+import java.util.ArrayList;
+// 导入ArrayList类,用于创建列表
+import java.util.List;
+// 导入List接口
-public class Top10CategoryDaoImpl implements Top10CategoryDao { // 定义Top10CategoryDaoImpl类,实现Top10CategoryDao接口
- @Override // 覆盖接口中的方法
- public void insert(Top10Category top10Category) { // 定义insert方法,用于插入单个Top10Category对象
- String sql="insert into top10_category values(?,?,?,?,?)"; // 定义插入SQL语句
- Object[] params=new Object[]{ // 创建一个对象数组,用于存储Top10Category对象的属性值
- top10Category.getTaskId(), // 获取任务ID
- top10Category.getCategoryId(), // 获取分类ID(注意:这里代码中重复了两次,可能是错误)
- top10Category.getCategoryId(), // 重复的分类ID
- top10Category.getClickCount(), // 获取点击次数
- top10Category.getOrderCount(), // 获取订单次数
- top10Category.getPayCount() // 获取支付次数
+public class Top10CategoryDaoImpl implements Top10CategoryDao {
+ // 定义Top10CategoryDaoImpl类,实现Top10CategoryDao接口
+ @Override
+ // 覆盖接口中的方法
+ public void insert(Top10Category top10Category) {
+ // 定义insert方法,用于插入单个Top10Category对象
+ String sql="insert into top10_category values(?,?,?,?,?)";
+ // 定义插入SQL语句
+ Object[] params=new Object[]{
+ // 创建一个对象数组,用于存储Top10Category对象的属性值
+ top10Category.getTaskId(),
+ // 获取任务ID
+ top10Category.getCategoryId(),
+ // 获取分类ID(注意:这里代码中重复了两次,可能是错误)
+ top10Category.getCategoryId(),
+ // 重复的分类ID
+ top10Category.getClickCount(),
+ // 获取点击次数
+ top10Category.getOrderCount(),
+ // 获取订单次数
+ top10Category.getPayCount()
+ // 获取支付次数
};
- JDBCHelper.getInstance().excuteUpdate(sql,params); // 调用JDBCHelper的excuteUpdate方法执行SQL更新(注意:这里应该是executeUpdate)
+ JDBCHelper.getInstance().excuteUpdate(sql,params);
+ // 调用JDBCHelper的excuteUpdate方法执行SQL更新(注意:这里应该是executeUpdate)
}
- @Override // 覆盖接口中的方法
- public void batchInsert(List top10CategoryList) { // 定义batchInsert方法,用于批量插入Top10Category对象
- String sql="insert into top10_category values(?,?,?,?,?)"; // 定义插入SQL语句
- List paramList=new ArrayList(); // 创建一个列表,用于存储每个Top10Category对象的参数数组
- for (Top10Category top10Category:top10CategoryList) { // 遍历传入的Top10Category对象列表
- Object[] params=new Object[]{ // 创建一个对象数组,用于存储当前Top10Category对象的属性值
- top10Category.getTaskId(), // 获取任务ID
- top10Category.getCategoryId(), // 获取分类ID
- top10Category.getClickCount(), // 获取点击次数
- top10Category.getOrderCount(), // 获取订单次数
- top10Category.getPayCount() // 获取支付次数
+ @Override
+ // 覆盖接口中的方法
+ public void batchInsert(List top10CategoryList) {
+ // 定义batchInsert方法,用于批量插入Top10Category对象
+ String sql="insert into top10_category values(?,?,?,?,?)";
+ // 定义插入SQL语句
+ List paramList=new ArrayList();
+ // 创建一个列表,用于存储每个Top10Category对象的参数数组
+ for (Top10Category top10Category:top10CategoryList) {
+ // 遍历传入的Top10Category对象列表
+ Object[] params=new Object[]{
+ // 创建一个对象数组,用于存储当前Top10Category对象的属性值
+ top10Category.getTaskId(),
+ // 获取任务ID
+ top10Category.getCategoryId(),
+ // 获取分类ID
+ top10Category.getClickCount(),
+ // 获取点击次数
+ top10Category.getOrderCount(),
+ // 获取订单次数
+ top10Category.getPayCount()
+ // 获取支付次数
};
- paramList.add(params); // 将参数数组添加到列表中
+ paramList.add(params);
+ // 将参数数组添加到列表中
}
- JDBCHelper.getInstance().excuteBatch(sql,paramList); // 调用JDBCHelper的excuteBatch方法执行批量SQL更新(注意:这里应该是executeBatch)
+ JDBCHelper.getInstance().excuteBatch(sql,paramList);
+ // 调用JDBCHelper的excuteBatch方法执行批量SQL更新(注意:这里应该是executeBatch)
}
}
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/dao/impl/Top10CategorySessionDaoImpl.java b/src/main/java/cn/edu/hust/dao/impl/Top10CategorySessionDaoImpl.java
index 2207e26..b072b20 100644
--- a/src/main/java/cn/edu/hust/dao/impl/Top10CategorySessionDaoImpl.java
+++ b/src/main/java/cn/edu/hust/dao/impl/Top10CategorySessionDaoImpl.java
@@ -1,28 +1,47 @@
-package cn.edu.hust.dao.impl; // 定义包名,表示这个类属于cn.edu.hust.dao.impl包
+package cn.edu.hust.dao.impl;
+// 定义包名,表示这个类属于cn.edu.hust.dao.impl包
-import cn.edu.hust.dao.Top10CategorySessionDao; // 导入Top10CategorySessionDao接口
-import cn.edu.hust.domain.Top10CategorySession; // 导入Top10CategorySession实体类
-import cn.edu.hust.jdbc.JDBCHelper; // 导入JDBCHelper类,用于数据库操作
+import cn.edu.hust.dao.Top10CategorySessionDao;
+// 导入Top10CategorySessionDao接口
+import cn.edu.hust.domain.Top10CategorySession;
+// 导入Top10CategorySession实体类
+import cn.edu.hust.jdbc.JDBCHelper;
+// 导入JDBCHelper类,用于数据库操作
-import java.util.ArrayList; // 导入ArrayList类,用于创建列表
-import java.util.List; // 导入List接口
+import java.util.ArrayList;
+// 导入ArrayList类,用于创建列表
+import java.util.List;
+// 导入List接口
-public class Top10CategorySessionDaoImpl implements Top10CategorySessionDao // 定义Top10CategorySessionDaoImpl类,实现Top10CategorySessionDao接口
+public class Top10CategorySessionDaoImpl implements Top10CategorySessionDao
+// 定义Top10CategorySessionDaoImpl类,实现Top10CategorySessionDao接口
{
- @Override // 覆盖接口中的方法
- public void batchInsert(List top10CategorySessionList) { // 定义batchInsert方法,用于批量插入Top10CategorySession对象
- String sql="insert into top10_category_session values(?,?,?,?)"; // 定义插入SQL语句
- List paramList=new ArrayList(); // 创建一个列表,用于存储每个Top10CategorySession对象的参数数组
- for(Top10CategorySession top10CategorySession:top10CategorySessionList) // 遍历传入的Top10CategorySession对象列表
+ @Override
+ // 覆盖接口中的方法
+ public void batchInsert(List top10CategorySessionList) {
+ // 定义batchInsert方法,用于批量插入Top10CategorySession对象
+ String sql="insert into top10_category_session values(?,?,?,?)";
+ // 定义插入SQL语句
+ List paramList=new ArrayList();
+ // 创建一个列表,用于存储每个Top10CategorySession对象的参数数组
+ for(Top10CategorySession top10CategorySession:top10CategorySessionList)
+ // 遍历传入的Top10CategorySession对象列表
{
- Object[] param=new Object[]{ // 创建一个对象数组,用于存储当前Top10CategorySession对象的属性值
- top10CategorySession.getTaskId(), // 获取任务ID
- top10CategorySession.getCategoryId(), // 获取分类ID
- top10CategorySession.getSessionId(), // 获取会话ID
- top10CategorySession.getClickCount() // 获取点击次数
+ Object[] param=new Object[]{
+ // 创建一个对象数组,用于存储当前Top10CategorySession对象的属性值
+ top10CategorySession.getTaskId(),
+ // 获取任务ID
+ top10CategorySession.getCategoryId(),
+ // 获取分类ID
+ top10CategorySession.getSessionId(),
+ // 获取会话ID
+ top10CategorySession.getClickCount()
+ // 获取点击次数
};
- paramList.add(param); // 将参数数组添加到列表中
+ paramList.add(param);
+ // 将参数数组添加到列表中
}
- JDBCHelper.getInstance().excuteBatch(sql,paramList); // 调用JDBCHelper的excuteBatch方法执行批量SQL更新(注意:这里应该是executeBatch)
+ JDBCHelper.getInstance().excuteBatch(sql,paramList);
+ // 调用JDBCHelper的excuteBatch方法执行批量SQL更新(注意:这里应该是executeBatch)
}
}
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/demo/Singleton.java b/src/main/java/cn/edu/hust/demo/Singleton.java
index 900bb7a..7b3910d 100644
--- a/src/main/java/cn/edu/hust/demo/Singleton.java
+++ b/src/main/java/cn/edu/hust/demo/Singleton.java
@@ -1,59 +1,62 @@
package cn.edu.hust.demo;
+// 定义包名,表示这个类属于cn.edu.hust.demo包
/**
* 单例模式几种实现方式
*/
public class Singleton {
+ // 定义Singleton类,用于实现单例模式
/**
* 饿汉模式实现单例模式,线程安全
*/
- /**
- private static Singleton instance=new Singleton();
- private Singleton()
- {
-
+ /*
+ private static Singleton instance = new Singleton(); // 在类加载时就创建实例,实现线程安全
+ private Singleton() {
+ // 私有化构造函数,防止外部通过new创建实例
}
- public static Singleton getInstance()
- {
+ public static Singleton getInstance() {
return instance;
- }*/
+ // 提供全局访问点
+ }
+ */
/**
* 懒汉模式实现单例模式 线程不安全的写法
-
- private static Singleton instance=null;
- private Singleton()
- {
-
+ */
+ /*
+ private static Singleton instance = null; // 实例化延后到第一次使用时
+ private Singleton() {
+ // 私有化构造函数,防止外部通过new创建实例
}
- public static Singleton getInstance()
- {
- if(instance==null) instance=new Singleton();
+ public static Singleton getInstance() {
+ if (instance == null) instance = new Singleton();
+ // 线程不安全,可能存在多个实例
return instance;
- }*/
+ }
+ */
/**
* 懒汉模式线程安全的写法
*/
- private static Singleton instance=null;
- private Singleton()
- {
-
+ private static Singleton instance = null;
+ // 实例化延后到第一次使用时
+ private Singleton() {
+ // 私有化构造函数,防止外部通过new创建实例
}
- public static Singleton getInstance()
- {
- if(instance==null)
- {
- synchronized (Singleton.class)
- {
- if(instance==null)
- {
- instance=new Singleton();
+ public static Singleton getInstance() {
+ if (instance == null) {
+ // 第一次检查,避免不必要的同步
+ synchronized (Singleton.class) {
+ // 同步块,确保线程安全
+ if (instance == null) {
+ // 第二次检查,确保只有一个实例被创建
+ instance = new Singleton();
+ // 创建实例
}
}
-
}
return instance;
+ // 返回唯一实例
}
-}
+}
\ No newline at end of file
From 0af0f9bd612db554bb03efbafbd84ac29c145464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 21:58:42 +0800
Subject: [PATCH 13/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=9011=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=9011=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=9011?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 16 ++-
.../cn/edu/hust/session/UserVisitAnalyze.java | 102 +++++++++++++++++-
2 files changed, 112 insertions(+), 6 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 993cb77..492df0f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,10 @@
-
+
+
+
+
@@ -474,6 +477,7 @@
+
1529592741848
@@ -537,7 +541,15 @@
1734354900465
-
+
+
+ 1734354969705
+
+
+
+ 1734354969705
+
+
diff --git a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
index ae867a7..ff804ca 100644
--- a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
+++ b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
@@ -1,25 +1,94 @@
+//这行代码定义了当前类所在的包名。包名用于组织和管理类。
package cn.edu.hust.session;
+//导入 cn.edu.hust.conf 包下的 ConfigurationManager 类。这个类可能用于管理配置信息
+
import cn.edu.hust.conf.ConfigurationManager;
+
+//导入 cn.edu.hust.constant 包下的 Constants 类。这个类可能包含一些常量定义。
+
import cn.edu.hust.constant.Constants;
+
+//导入 cn.edu.hust.dao 包下的 TaskDao 类。这个类可能用于与任务相关的数据访问操作。
+
import cn.edu.hust.dao.TaskDao;
+
+//导入 cn.edu.hust.dao.factory 包下的 DaoFactory 类。这个类可能用于创建 DAO 对象。
+
import cn.edu.hust.dao.factory.DaoFactory;
+
+//导入 cn.edu.hust.domain 包下的所有类。这个包可能包含一些数据模型类。
+
import cn.edu.hust.domain.*;
+
+//导入 cn.edu.hust.mockData 包下的 MockData 类。这个类可能用于生成模拟数据
+
import cn.edu.hust.mockData.MockData;
+
+//导入 cn.edu.hust.util 包下的所有类。这个包可能包含一些通用工具类。
+
import cn.edu.hust.util.*;
+
+//导入 com.alibaba.fastjson.JSONObject 类。FastJSON 是一个用于处理 JSON 数据的库。
+
import com.alibaba.fastjson.JSONObject;
+
+//导入 org.apache.spark.Accumulator 类。这个类用于在 Spark 作业中共享和累加数据。
+
import org.apache.spark.Accumulator;
+
+//导入 org.apache.spark.SparkConf 类。这个类用于配置 Spark 应用程序。
+
import org.apache.spark.SparkConf;
+
+//导入 org.apache.spark.SparkContext 类。这个类是 Spark 应用程序的主入口点。
+
import org.apache.spark.SparkContext;
+
+//导入 org.apache.spark.api.java.JavaPairRDD 类。
+// 这个类是用于处理键值对的 RDD(弹性分布式数据集)
+
import org.apache.spark.api.java.JavaPairRDD;
+
+//导入 org.apache.spark.api.java.JavaRDD 类。这个类是用于处理普通 RDD 的 Java API。
+
import org.apache.spark.api.java.JavaRDD;
+
+//导入了 JavaSparkContext 类。
+// JavaSparkContext 是 org.apache.spark.api.java 包下的一个类,提供了与 Spark 集群交互的 Java API。
+
import org.apache.spark.api.java.JavaSparkContext;
+
+//导入 org.apache.spark.api.java.function 包下的所有函数类。
+// 这些类提供了常见的操作函数,如 FlatMapFunction, MapFunction, FilterFunction 等。
+
import org.apache.spark.api.java.function.*;
+
+//导入 org.apache.spark.sql.DataFrame 类。这个类是用于操作结构化数据的。
+
import org.apache.spark.sql.DataFrame;
+
+//导入 org.apache.spark.sql.Row 类。这个类是用于表示一行数据的。
+
import org.apache.spark.sql.Row;
+
+//导入 org.apache.spark.sql.SQLContext 类。
+// 这个类用于创建 Spark SQL 的上下文环境
+
import org.apache.spark.sql.SQLContext;
+
+//导入 org.apache.spark.sql.hive.HiveContext 类。
+//这个类用于与 Hive 兼容的 Spark SQL 上下文环境
+
import org.apache.spark.sql.hive.HiveContext;
+
+//导入 org.apache.spark.storage.StorageLevel 类。
+// 这个类定义了 Spark 中数据存储的级别。
+
import org.apache.spark.storage.StorageLevel;
+
+//导入 scala.Tuple2 类。这个类用于表示一个二元组(一个包含两个元素的元组)。
+
import scala.Tuple2;
import java.util.*;
@@ -36,50 +105,75 @@ import java.util.*;
public class UserVisitAnalyze {
public static void main(String[] args)
{
+
+ //初始化 args 参数数组,用于传递给 main 方法。
+ // 这里暂时设置为 {"1"},实际使用时可以根据需要调整。
args=new String[]{"1"};
/**
* 构建spark上下文
*/
+ //创建 SparkConf 对象并设置应用程序名称和运行模式(本地模式,使用3个核心)。
+ //使用 SparkConf 创建 JavaSparkContext 实例,初始化Spark上下文。
SparkConf conf=new SparkConf().setAppName(Constants.APP_NAME_SESSION).setMaster("local[3]");
JavaSparkContext context=new JavaSparkContext(conf);
+
+ //通过 JavaSparkContext 获取 SQLContext,用于执行SQL查询。
SQLContext sc=getSQLContext(context.sc());
- //生成模拟数据
+ //生成模拟数据,调用 mock 方法生成模拟数据到Spark环境中。
mock(context,sc);
//拿到相应的Dao组建
+ //通过 DaoFactory 获取 TaskDao 实例,用于数据库操作。
TaskDao dao= DaoFactory.getTaskDao();
+
//从外部传入的参数获取任务的id
+ //通过 args 参数获取任务ID。
Long taskId=ParamUtils.getTaskIdFromArgs(args);
+
//从数据库中查询出相应的task
+ //通过任务ID从数据库中查询任务信息,并将任务参数解析为 JSONObject
Task task=dao.findTaskById(taskId);
JSONObject jsonObject=JSONObject.parseObject(task.getTaskParam());
//获取指定范围内的Sesssion
+ //调用 getActionRDD 方法获取包含指定范围内的Session的RDD。
JavaRDD sessionRangeDate=getActionRDD(sc,jsonObject);
//这里增加一个新的方法,主要是映射
+ //将 sessionRangeDate 转换为包含键值对的 PairRDD。
JavaPairRDD sessionInfoPairRDD=getSessonInfoPairRDD(sessionRangeDate);
+
//重复用到的RDD进行持久化
+ //将 sessionInfoPairRDD 持久化到磁盘,提高后续操作的性能
sessionInfoPairRDD.persist(StorageLevel.DISK_ONLY());
- //上面的两个RDD是
+
//按照Sesson进行聚合
+ //调用 aggregateBySessionId 方法对Session信息进行聚合。
JavaPairRDD sesssionAggregateInfoRDD=aggregateBySessionId(sc,sessionInfoPairRDD);
//通过条件对RDD进行筛选
- // 重构,同时统计
+ //使用Accumulator进行统计:
+ //创建一个 Accumulator 来统计聚合结果。
Accumulator sessionAggrStatAccumulator=context.accumulator("",new SessionAggrStatAccumulator());
-
+ //过滤和统计Session信息:
//在进行accumulator之前,需要aciton动作,不然会为空
+ //调用 filterSessionAndAggrStat 方法过滤并统计Session信息。
JavaPairRDD filteredSessionRDD=filterSessionAndAggrStat(sesssionAggregateInfoRDD,jsonObject,sessionAggrStatAccumulator);
+
//重复用到的RDD进行持久化
+ //将过滤后的RDD持久化到磁盘。
filteredSessionRDD.persist(StorageLevel.DISK_ONLY());
+
//获取符合过滤条件的全信息公共RDD
+ //调用 getFilterFullInfoRDD 方法获取包含完整信息的公共RDD。
JavaPairRDD commonFullClickInfoRDD=getFilterFullInfoRDD(filteredSessionRDD,sessionInfoPairRDD);
//重复用到的RDD进行持久化
+ //将公共RDD持久化到磁盘。
commonFullClickInfoRDD.persist(StorageLevel.DISK_ONLY());
//session聚合统计,统计出访问时长和访问步长的各个区间所占的比例
+
/**
* 重构实现的思路:
* 1。不要去生成任何的新RDD
From afa30ef4bd12f39682bccb5801b6ba8868e39ec7 Mon Sep 17 00:00:00 2001
From: yy <2565886549@qq.com>
Date: Mon, 16 Dec 2024 22:02:42 +0800
Subject: [PATCH 14/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 18 ++++++++++--------
.../java/cn/edu/hust/dao/SessionAggrDao.java | 18 +++++++++++++-----
2 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b82f45f..a82c497 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,7 @@
-
-
-
-
-
-
+
@@ -426,7 +421,7 @@
-
+
1529592741848
@@ -456,7 +451,14 @@
1734356287423
-
+
+ 1734357370059
+
+
+
+ 1734357370059
+
+
diff --git a/src/test/java/cn/edu/hust/dao/SessionAggrDao.java b/src/test/java/cn/edu/hust/dao/SessionAggrDao.java
index a0a63c5..7f63678 100644
--- a/src/test/java/cn/edu/hust/dao/SessionAggrDao.java
+++ b/src/test/java/cn/edu/hust/dao/SessionAggrDao.java
@@ -1,15 +1,23 @@
package cn.edu.hust.dao;
+// 定义包名,表示这个类属于cn.edu.hust.dao包
import cn.edu.hust.dao.factory.DaoFactory;
+// 导入DaoFactory类,用于获取DAO实例
import cn.edu.hust.domain.SessionAggrStat;
+// 导入SessionAggrStat实体类
import org.junit.Test;
+// 导入JUnit测试注解
public class SessionAggrDao {
+ // 定义SessionAggrDao类,用于测试SessionAggrStat的DAO操作
@Test
- public void test()
- {
- SessionAggrStat sessionAggrStat=new SessionAggrStat();
- sessionAggrStat.set(1L,100L,1,2,3,4,5,6,7,8,9,0,10,11,12,13,14);
+ // 用@Test注解标记这是一个测试方法
+ public void test() {
+ // 创建SessionAggrStat对象
+ SessionAggrStat sessionAggrStat = new SessionAggrStat();
+ // 设置SessionAggrStat对象的属性值
+ sessionAggrStat.set(1L, 100L, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 10, 11, 12, 13, 14);
+ // 使用DaoFactory获取SessionAggrStatDao的实现,并调用insert方法插入数据
DaoFactory.getSessionAggrStatDao().insert(sessionAggrStat);
}
-}
+}
\ No newline at end of file
From c04555504afe52218f93a8f9e1d1409b07b1b11d Mon Sep 17 00:00:00 2001
From: yy <2565886549@qq.com>
Date: Mon, 16 Dec 2024 22:07:57 +0800
Subject: [PATCH 15/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 16 ++++++++--
.../cn/edu/hust/dao/SessionDetailTest.java | 19 ++++++++----
.../hust/dao/SessionRandomExtractDaoTest.java | 29 ++++++++++++++-----
.../java/cn/edu/hust/dao/TaskDaoTest.java | 18 ++++++++----
4 files changed, 61 insertions(+), 21 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a82c497..27e728c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,10 @@
-
+
+
+
+
@@ -421,7 +424,7 @@
-
+
1529592741848
@@ -458,7 +461,14 @@
1734357370059
-
+
+ 1734357762782
+
+
+
+ 1734357762782
+
+
diff --git a/src/test/java/cn/edu/hust/dao/SessionDetailTest.java b/src/test/java/cn/edu/hust/dao/SessionDetailTest.java
index 41e7390..b0b4d5c 100644
--- a/src/test/java/cn/edu/hust/dao/SessionDetailTest.java
+++ b/src/test/java/cn/edu/hust/dao/SessionDetailTest.java
@@ -1,15 +1,24 @@
package cn.edu.hust.dao;
+// 定义包名,表示这个类属于cn.edu.hust.dao包
import cn.edu.hust.dao.factory.DaoFactory;
+// 导入DaoFactory类,用于获取DAO实例
import cn.edu.hust.domain.SessionDetail;
+// 导入SessionDetail实体类
import org.junit.Test;
+// 导入JUnit测试注解
public class SessionDetailTest {
+ // 定义SessionDetailTest类,用于测试SessionDetail的DAO操作
+
@Test
- public void testInsert()
- {
- SessionDetail sessionDetail=new SessionDetail();
- sessionDetail.set(1L,1L,"1",1L,"1","1",1L,1L,"1","1","1","1");
+ // 用@Test注解标记这是一个测试方法
+ public void testInsert() {
+ // 创建SessionDetail对象
+ SessionDetail sessionDetail = new SessionDetail();
+ // 设置SessionDetail对象的属性值
+ sessionDetail.set(1L, 1L, "1", 1L, "1", "1", 1L, 1L, "1", "1", "1", "1");
+ // 使用DaoFactory获取SessionDetailDao的实现,并调用insert方法插入数据
DaoFactory.getSessionDetailDao().insert(sessionDetail);
}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/cn/edu/hust/dao/SessionRandomExtractDaoTest.java b/src/test/java/cn/edu/hust/dao/SessionRandomExtractDaoTest.java
index a0c04f0..75b9589 100644
--- a/src/test/java/cn/edu/hust/dao/SessionRandomExtractDaoTest.java
+++ b/src/test/java/cn/edu/hust/dao/SessionRandomExtractDaoTest.java
@@ -1,24 +1,37 @@
package cn.edu.hust.dao;
+// 定义包名,表示这个类属于cn.edu.hust.dao包
import cn.edu.hust.dao.factory.DaoFactory;
+
import cn.edu.hust.domain.SessionRandomExtract;
+// 导入SessionRandomExtract实体类
import org.junit.Test;
+// 导入JUnit测试注解
import java.util.ArrayList;
+// 导入ArrayList类,用于创建列表
import java.util.List;
+// 导入List接口
public class SessionRandomExtractDaoTest {
+ // 定义SessionRandomExtractDaoTest类,用于测试SessionRandomExtract的批量插入操作
+
@Test
- public void testBatchInsert()
- {
- List sessionRandomExtractList=new ArrayList();
- SessionRandomExtract sessionRandomExtract1=new SessionRandomExtract();
- sessionRandomExtract1.set(1L,"1","2","3","4");
- SessionRandomExtract sessionRandomExtract2=new SessionRandomExtract();
- sessionRandomExtract2.set(2L,"1","2","3","4");
+ // 用@Test注解标记这是一个测试方法
+ public void testBatchInsert() {
+ // 创建一个SessionRandomExtract对象列表
+ List sessionRandomExtractList = new ArrayList();
+ // 创建第一个SessionRandomExtract对象并设置属性值
+ SessionRandomExtract sessionRandomExtract1 = new SessionRandomExtract();
+ sessionRandomExtract1.set(1L, "1", "2", "3", "4");
+ // 创建第二个SessionRandomExtract对象并设置属性值
+ SessionRandomExtract sessionRandomExtract2 = new SessionRandomExtract();
+ sessionRandomExtract2.set(2L, "1", "2", "3", "4");
+ // 将两个SessionRandomExtract对象添加到列表中
sessionRandomExtractList.add(sessionRandomExtract1);
sessionRandomExtractList.add(sessionRandomExtract2);
+ // 使用DaoFactory获取SessionRandomExtractDao的实现,并调用batchInsert方法批量插入数据
DaoFactory.getSessionRandomExtractDao().batchInsert(sessionRandomExtractList);
}
-}
+}
\ No newline at end of file
diff --git a/src/test/java/cn/edu/hust/dao/TaskDaoTest.java b/src/test/java/cn/edu/hust/dao/TaskDaoTest.java
index 8709594..f0c1839 100644
--- a/src/test/java/cn/edu/hust/dao/TaskDaoTest.java
+++ b/src/test/java/cn/edu/hust/dao/TaskDaoTest.java
@@ -1,14 +1,22 @@
package cn.edu.hust.dao;
+// 定义包名,表示这个类属于cn.edu.hust.dao包
import cn.edu.hust.dao.factory.DaoFactory;
+// 导入DaoFactory类,用于获取DAO实例
import cn.edu.hust.domain.Task;
+// 导入Task实体类
import org.junit.Test;
+// 导入JUnit测试注解
public class TaskDaoTest {
+ // 定义TaskDaoTest类,用于测试Task的DAO操作
+
@Test
- public void testDao()
- {
- Task task=DaoFactory.getTaskDao().findTaskById(1L);
- System.out.println(task.getTaskName()+":"+task.getTaskParam());
+ // 用@Test注解标记这是一个测试方法
+ public void testDao() {
+ // 使用DaoFactory获取TaskDao的实现,并调用findTaskById方法查找任务
+ Task task = DaoFactory.getTaskDao().findTaskById(1L);
+ // 打印找到的任务名称和任务参数
+ System.out.println(task.getTaskName() + ":" + task.getTaskParam());
};
-}
+}
\ No newline at end of file
From 4089d8982704d775a40341098f574a3d3d583a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 22:12:47 +0800
Subject: [PATCH 16/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=901=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=901=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=901?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 17 +++-
.../cn/edu/hust/session/UserVisitAnalyze.java | 85 ++++++++++++++++++-
2 files changed, 95 insertions(+), 7 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 492df0f..4bc42e4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
-
+
@@ -477,7 +477,7 @@
-
+
1529592741848
@@ -549,7 +549,15 @@
1734354969705
-
+
+
+ 1734357525655
+
+
+
+ 1734357525655
+
+
@@ -671,7 +679,8 @@
-
+
+
diff --git a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
index ff804ca..a97784c 100644
--- a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
+++ b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
@@ -174,42 +174,79 @@ public class UserVisitAnalyze {
commonFullClickInfoRDD.persist(StorageLevel.DISK_ONLY());
//session聚合统计,统计出访问时长和访问步长的各个区间所占的比例
+
+
/**
* 重构实现的思路:
* 1。不要去生成任何的新RDD
+ *
* 2。不要去单独遍历一遍sesion的数据
+ *
* 3。可以在聚合数据的时候可以直接计算session的访问时长和访问步长
+ *
* 4。在以前的聚合操作中,可以在以前的基础上进行计算加上自己实现的Accumulator来进行一次性解决
+ *
* 开发Spark的经验准则
+ *
* 1。尽量少生成RDD
+ *
* 2。尽量少对RDD进行蒜子操作,如果可能,尽量在一个算子里面,实现多个需求功能
+ *
* 3。尽量少对RDD进行shuffle算子操作,比如groupBykey、reduceBykey、sortByKey
+ *
* shuffle操作,会导致大量的磁盘读写,严重降低性能
* 有shuffle的算子,和没有shuffle的算子,甚至性能相差极大
* 有shuffle的算子,很容易造成性能倾斜,一旦数据倾斜,简直就是性能杀手
+ *
* 4。无论做什么功能,性能第一
+ *
* 在大数据项目中,性能最重要。主要是大数据以及大数据项目的特点,决定了大数据的程序和项目速度,都比较满
* 如果不考虑性能的话,就会导致一个大数据处理程序运行长达数个小时,甚至是数个小时,对用户的体验,简直是
* 一场灾难。
*/
+
+
/**
* 使用CountByKey算子实现随机抽取功能
*/
+ //调用 randomExtractSession 方法实现随机抽取功能。
randomExtractSession(taskId,filteredSessionRDD,sessionInfoPairRDD);
//在使用Accumulutor之前,需要使用Action算子,否则获取的值为空,这里随机计算
//filteredSessionRDD.count();
//计算各个session占比,并写入MySQL
+
+ //调用 calculateAndPersist 方法计算并持久化聚合统计结果。
calculateAndPersist(sessionAggrStatAccumulator.value(),taskId);
- //获取热门品类数据Top10
+
+ //调用 getTop10Category 方法获取热门品类数据Top10
List> top10CategoryIds=getTop10Category(taskId,commonFullClickInfoRDD);
- //获取热门每一个品类点击Top10session
+
+ //调用 getTop10Session 方法获取热门品类点击Top10Session。
getTop10Session(context,taskId,sessionInfoPairRDD,top10CategoryIds);
- //关闭spark上下文
+
+ //关闭Spark上下文,释放资源
context.close();
}
+ /**
+ * 功能总结
+ * 配置和初始化:配置Spark环境并初始化Spark上下文。
+ * 生成模拟数据:生成模拟数据到Spark环境中。
+ * 数据库操作:从数据库中获取任务信息。
+ * 数据处理:读取和处理Session数据,进行聚合、过滤、统计等操作。
+ * 持久化:将中间结果持久化以提高性能。
+ * 统计和汇总:计算并汇总统计数据。
+ * 随机抽取和输出:实现随机抽取功能并输出结果。
+ * 关闭资源:关闭Spark上下文,释放资源。
+ * 通过这些步骤,可以完成用户访问分析的整个流程。
+ */
+
+
+
+
+
@@ -218,25 +255,67 @@ public class UserVisitAnalyze {
* @param sc
* @return
*/
+ //getSQLContext 方法
public static SQLContext getSQLContext(SparkContext sc)
{
+ //通过 ConfigurationManager 获取配置项 SPARK_LOCAL,判断是否运行在本地模式下。
boolean local= ConfigurationManager.getBoolean(Constants.SPARK_LOCAL);
+
+ //判断是否为本地模式:
+ //如果是本地模式,则返回一个新的 SQLContext 实例。
+ // SQLContext 用于执行传统的SQL查询。
if(local)
{
return new SQLContext(sc);
}
+
+ //返回HiveContext:
+ //如果不是本地模式,则返回一个新的 HiveContext 实例。
+ // HiveContext 用于与Hive集成,执行Hive查询。
return new HiveContext(sc);
}
+ /**
+ * 功能解释
+ * 本地模式与Hive模式:此方法根据配置项 SPARK_LOCAL 的值来决定返回 SQLContext 还是 HiveContext。SPARK_LOCAL 为 true 时,
+ * 返回 SQLContext,用于执行传统的SQL查询;
+ * SPARK_LOCAL 为 false 时,返回 HiveContext,用于与Hive集成,执行Hive查询。
+ * 配置管理:使用 ConfigurationManager 来获取配置项,
+ * 确保配置项的灵活性和可维护性。
+ * ConfigurationManager.getBoolean 方法可以方便地获取布尔类型的配置项。
+ * @param context
+ * @param sc
+ */
+
+
+ //mock 方法
private static void mock(JavaSparkContext context,SQLContext sc)
{
+
+ //获取配置项:
+ //通过 ConfigurationManager
+ // 获取配置项 SPARK_LOCAL,判断是否运行在本地模式下。
boolean local= ConfigurationManager.getBoolean(Constants.SPARK_LOCAL);
+
+ //判断是否为本地模式:
+ //如果是本地模式,则调用 MockData.mock 方法生成模拟数据。
if(local)
{
MockData.mock(context,sc);
}
}
+ /**
+ * 功能解释
+ * 模拟数据生成:此方法根据配置项 SPARK_LOCAL 的值来决定是否生成模拟数据。
+ * SPARK_LOCAL 为 true 时,调用 MockData.mock 方法生成模拟数据到Spark环境中。
+ * 模拟数据:MockData.mock 方法的具体实现细节没有显示,
+ * 但通常用于生成模拟的RDD或DataFrame,以便在开发或测试阶段使用。
+ * 这有助于避免实际数据处理过程中可能出现的问题,同时便于进行单元测试和调试。
+ */
+
+
+
/**
* 获取指定日期范围内的数据
From a33178593cf4aee94925949cbf0ba7278b5beb53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 22:42:49 +0800
Subject: [PATCH 17/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=9011=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=901=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=901?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 17 +++--
.../cn/edu/hust/session/UserVisitAnalyze.java | 72 ++++++++++++++++++-
2 files changed, 83 insertions(+), 6 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4bc42e4..a8fe339 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
-
+
@@ -477,7 +477,7 @@
-
+
1529592741848
@@ -557,7 +557,15 @@
1734357525655
-
+
+
+ 1734358371283
+
+
+
+ 1734358371283
+
+
@@ -680,7 +688,8 @@
-
+
+
diff --git a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
index a97784c..9c8ab5b 100644
--- a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
+++ b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
@@ -323,27 +323,82 @@ public class UserVisitAnalyze {
* @param taskParam
* @return
*/
+
+
+ //getActionRDD 方法
private static JavaRDD getActionRDD(SQLContext sc, JSONObject taskParam)
{
+
+ //获取开始时间和结束时间:
+ //从 taskParam 中获取开始时间 startTime 和结束时间 endTime。
+ // ParamUtils.getParam 方法用于从 JSONObject 中获取参数值。
String startTime=ParamUtils.getParam(taskParam,Constants.PARAM_STARTTIME);
String endTime=ParamUtils.getParam(taskParam,Constants.PARAM_ENDTIME);
+
+ //构建SQL查询语句
+ // 查询表 user_visit_action 中 date 字段在 startTime 和 endTime 之间的所有记录。
String sql="select *from user_visit_action where date>='"+startTime+"' and date<='"+endTime+"'";
+
+ //执行SQL查询并获取DataFrame:
+ //使用 SQLContext 执行SQL查询,获取查询结果的 DataFrame。
DataFrame df=sc.sql(sql);
+
+ //将DataFrame转换为JavaRDD
+ //方便后续的RDD操作。
return df.javaRDD();
}
+ /**
+ * 功能解释
+ * SQL查询:通过SQL查询从数据库中获取特定时间段内的用户访问数据。
+ * 数据转换:将查询结果的 DataFrame 转换为 JavaRDD,以便进行后续的数据处理操作。
+ */
+
+
+
+
+
/**
* 将数据进行映射成为Pair,键为SessionId,Value为Row
* @param sessionRangeDate
* @return
*/
- private static JavaPairRDD getSessonInfoPairRDD(JavaRDD sessionRangeDate) {
- return sessionRangeDate.mapToPair(new PairFunction() {
+//getSessonInfoPairRDD 方法
+
+ //定义方法签名:
+ //定义一个静态方法 getSessonInfoPairRDD,该方法接受一个 JavaRDD 类型的参数 sessionRangeDate,
+ // 并返回一个 JavaPairRDD。
+ private static JavaPairRDD getSessonInfoPairRDD(JavaRDD sessionRangeDate) {
+
+
+ //使用 mapToPair 方法:
+ //使用 mapToPair 方法将 JavaRDD 转换为 JavaPairRDD。
+ // mapToPair 方法接受一个 PairFunction 实现类,
+ // 该实现类用于将每个 Row 对象转换为一个键值对 Tuple2。
+ return sessionRangeDate.mapToPair(new PairFunction() {
@Override
+ //实现 PairFunction:
+ //实现 PairFunction 接口的 call 方法。
+ // call 方法会接受一个 Row 对象作为输入,并返回一个 Tuple2。
public Tuple2 call(Row row) throws Exception {
+
+ //构造 Tuple2 对象:
+ //从 Row 对象中提取指定列的值(这里是第3列),
+ // 作为键 String,并将整个 Row 对象作为值 Row,返回一个 Tuple2。
return new Tuple2(row.getString(2),row);
}
});
+ /**
+ * 功能解释
+ * 映射操作:使用 mapToPair 方法将每个 Row 对象转换为一个键值对 Tuple2。具体来说,
+ * 键是 Row 对象中的第3列的值,值是整个 Row 对象。
+ * 生成键值对:通过提取 Row 对象中的特定字段生成键值对,方便后续的聚合和处理操作。
+ * getSessonInfoPairRDD 方法:将 JavaRDD 转换为 JavaPairRDD,
+ * 其中键为 Row 对象中的 sessionId,
+ * 值为整个 Row 对象。
+ * 这有助于后续的聚合和处理操作,例如按 sessionId 分组统计或其他复杂操作。
+ */
+
}
/**
@@ -352,6 +407,12 @@ public class UserVisitAnalyze {
* @param sessionInfoPairRDD
* @return
*/
+
+ //方法签名:
+ //定义一个静态方法 aggregateBySessionId,
+ // 该方法接受一个 SQLContext
+ // 和一个 JavaPairRDD 类型的参数 sessionInfoPairRDD,
+ // 并返回一个 JavaPairRDD。
private static JavaPairRDD aggregateBySessionId(SQLContext sc, JavaPairRDD sessionInfoPairRDD) {
/**
* 先将数据映射成map格式
@@ -368,8 +429,15 @@ public class UserVisitAnalyze {
/**
* 根据sessionId进行分组
*/
+ //根据 sessionId 进行分组:
+ //使用 groupByKey 方法将 JavaPairRDD 按 sessionId 分组,
+ // 得到一个 JavaPairRDD>,
+ // 其中键为 sessionId,值为具有相同 sessionId 的所有 Row 对象的迭代器。
JavaPairRDD> sessionActionGrouped=sessionInfoPairRDD.groupByKey();
+ //映射生成键值对:
+ //使用 mapToPair 方法将每个 Tuple2> 转换为一个 Tuple2。
+ // 具体来说,键为 Row 对象中的 userId,值为生成的字符串信息。
JavaPairRDD sessionPartInfo=sessionActionGrouped.mapToPair(new PairFunction>, Long, String>() {
@Override
public Tuple2 call(Tuple2> stringIterableTuple2) throws Exception {
From 9a7ec4138e9d4aaba966d9a72d960d523d16ee48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=B0=8F=E5=A8=9C?= <1253094786@qq.com>
Date: Mon, 16 Dec 2024 23:09:46 +0800
Subject: [PATCH 18/43] =?UTF-8?q?=E7=BC=96=E5=86=991?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5e50896..1d56c6f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,16 +1,12 @@
+
-
+
-
-
-
-
-
@@ -296,6 +292,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -426,7 +433,7 @@
-
+
1529592741848
@@ -449,7 +456,14 @@
1734352510160
-
+
+ 1734357362481
+
+
+
+ 1734357362481
+
+
@@ -569,7 +583,8 @@
-
+
+
From 735e337cac1f26a65822902cab5573bff54efdc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 23:20:07 +0800
Subject: [PATCH 19/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=9011=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=9011=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=9011?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 17 +++-
.../cn/edu/hust/session/UserVisitAnalyze.java | 79 ++++++++++++++++++-
2 files changed, 90 insertions(+), 6 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a8fe339..1975f1c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
-
+
@@ -477,7 +477,7 @@
-
+
1529592741848
@@ -565,7 +565,15 @@
1734358371283
-
+
+
+ 1734360173676
+
+
+
+ 1734360173676
+
+
@@ -689,7 +697,8 @@
-
+
+
diff --git a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
index 9c8ab5b..ee86af4 100644
--- a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
+++ b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
@@ -441,6 +441,10 @@ public class UserVisitAnalyze {
JavaPairRDD sessionPartInfo=sessionActionGrouped.mapToPair(new PairFunction>, Long, String>() {
@Override
public Tuple2 call(Tuple2> stringIterableTuple2) throws Exception {
+
+ //提取关键信息:
+ //从 Iterable 中提取 sessionId 和 rows。
+ //初始化一些变量,用于存储搜索关键字、点击类别ID、用户ID、开始时间、结束时间和步骤长度。
String sessionId=stringIterableTuple2._1;
Iterable rows=stringIterableTuple2._2;
StringBuffer searchKeywords=new StringBuffer();
@@ -449,19 +453,27 @@ public class UserVisitAnalyze {
Date startTime=null;
Date endTime=null;
int stepLength=0;
+
+ //遍历每一行 Row 对象:
+ //遍历每个 Row 对象,如果 userId 为空,则将其设置为当前的 userId。
+ //提取 searchKeyword 和 clickCategoryId。
for (Row row:rows)
{
if(userId==null)
userId=row.getLong(1);
String searchKeyword=row.getString(5);
Long clickCategoryId=row.getLong(6);
+
+
//判断是否需要拼接
+ //拼接搜索关键字和点击类别ID:
+ //检查 searchKeyword 是否为空并拼接到 searchKeywords 中。
if(StringUtils.isNotEmpty(searchKeyword))
{
if(!searchKeywords.toString().contains(searchKeyword))
searchKeywords.append(searchKeyword+",");
}
-
+ //检查 clickCategoryId 是否为 null 并拼接到 clickCategoryIds 中。
if(clickCategoryId!=null)
{
if(!clickCategoryId.toString().contains(String.valueOf(clickCategoryId)))
@@ -469,6 +481,9 @@ public class UserVisitAnalyze {
}
//计算session开始时间和结束时间
+ //从 Row 对象中提取 actionTime。
+ //更新 startTime 和 endTime,确保它们分别为最小和最大时间。
+ //增加 stepLength 记录步骤数。
Date actionTime= DateUtils.parseTime(row.getString(4));
if(startTime==null)
startTime=actionTime;
@@ -484,9 +499,13 @@ public class UserVisitAnalyze {
}
stepLength++;
}
- //访问时长(s)
+
+
+ //计算访问时长:
+ //计算访问时长(以秒为单位)。
Long visitLengtth=(endTime.getTime()-startTime.getTime())/1000;
+ //格式化信息并返回:
String searchKeywordsInfo=StringUtils.trimComma(searchKeywords.toString());
String clickCategoryIdsInfo=StringUtils.trimComma(clickCategoryIds.toString());
String info=Constants.FIELD_SESSIONID+"="+sessionId+"|"+Constants.FIELD_SERACH_KEYWORDS+"="+searchKeywordsInfo+"|"
@@ -498,40 +517,96 @@ public class UserVisitAnalyze {
//查询所有的用户数据
String sql="select * from user_info";
+
+ //执行SQL查询获取用户信息,并将结果转换为 JavaRDD。
JavaRDD userInfoRDD=sc.sql(sql).javaRDD();
+
//将用户信息映射成map
+ //使用 mapToPair 方法将 JavaRDD 转换为 JavaPairRDD,
+ // 其中键为 Row 对象中的某个列(通常是 userId),值为整个 Row 对象。
JavaPairRDD userInfoPariRDD=userInfoRDD.mapToPair(new PairFunction() {
@Override
public Tuple2 call(Row row) throws Exception {
return new Tuple2(row.getLong(0),row);
}
});
+
//将两个信息join在一起
+ //使用 join 方法将两个 JavaPairRDD 进行连接,连接键为 userId。结果是一个 JavaPairRDD>,
+ // 其中键为 userId,值为一个包含用户会话信息和用户信息的元组。
JavaPairRDD> tuple2JavaPairRDD=sessionPartInfo.join(userInfoPariRDD);
+ /**
+ * aggregateBySessionId 方法:将用户会话数据按 sessionId 分组,并生成每个会话的详细信息。具体包括搜索关键字、点击类别ID、访问时长、步骤数和开始时间。
+ * 查询用户数据:从数据库中查询用户信息。
+ * 映射用户信息:将用户信息转换为 JavaPairRDD。
+ * 连接会话信息和用户信息:将用户会话信息和用户信息进行连接,生成包含用户详细信息的会话数据。
+ * 通过这些步骤,可以获取每个用户在不同会话中的详细行为信息,为后续的分析和统计提供基础数据。
+ */
+
+
+
+
/**
* 拿到所需的session
*/
+ //定义 JavaPairRDD 变量 sessionInfo:
+ //定义一个名为 sessionInfo 的 JavaPairRDD,
+ // 并使用 mapToPair 方法对 tuple2JavaPairRDD 进行映射操作。
JavaPairRDD sessionInfo=tuple2JavaPairRDD.mapToPair(new PairFunction>, String, String>() {
@Override
public Tuple2 call(Tuple2> longTuple2Tuple2) throws Exception {
+
+ //提取会话信息和用户信息:
+ //从 Tuple2> 中提取 sessionPartInfo 和 userInfo。
+ //sessionPartInfo 是会话的详细信息,userInfo 是用户的详细信息。
String sessionPartInfo=longTuple2Tuple2._2._1;
Row userInfo=longTuple2Tuple2._2._2;
+
+
//拿到需要的用户信息
+ //从 Row 对象 userInfo 中提取用户的基本信息,
+ // 包括年龄 age、职业 professional、城市 city 和性别 sex。
int age=userInfo.getInt(3);
String professional=userInfo.getString(4);
String city=userInfo.getString(5);
String sex=userInfo.getString(6);
+
//拼接字符串
+ //将会话信息 sessionPartInfo 和用户信息拼接成一个完整的字符串 fullInfo。
String fullInfo=sessionPartInfo+"|"+Constants.FIELD_AGE+"="+age+"|"
+Constants.FIELD_PROFESSIONAL+"="+professional+"|"+Constants.FIELD_CITY+"="+city+"|"+Constants.FIELD_SEX+"="+sex;
+
+ //提取会话ID:
+ //使用 StringUtils.getFieldFromConcatString 方法从 sessionPartInfo 中提取会话ID,
+ // 假设会话ID的格式是 Constants.FIELD_SESSIONID。
String session=StringUtils.getFieldFromConcatString(sessionPartInfo,"\\|",Constants.FIELD_SESSIONID);
+
+ //返回结果:
+ //返回一个 Tuple2,
+ // 其中键为会话ID session,值为包含会话信息和用户信息的字符串 fullInfo。
return new Tuple2(session,fullInfo);
}
});
+ //返回处理后的 sessionInfo。
return sessionInfo;
}
+/**
+ * 功能总结
+ * 功能:该方法将 tuple2JavaPairRDD 中包含的会话信息和用户信息进行合并,生成一个包含会话详细信息和用户详细信息的字符串。然后将这些信息封装为 JavaPairRDD。
+ * 关键步骤:
+ * 提取信息:从 tuple2JavaPairRDD 中提取会话信息和用户信息。
+ * 提取用户信息:从 Row 对象中提取用户的基本信息,包括年龄、职业、城市和性别。
+ * 拼接信息:将会话信息和用户信息拼接成一个完整的字符串。
+ * 提取会话ID:从会话信息中提取会话ID。
+ * 返回结果:返回一个包含会话ID和完整信息的 JavaPairRDD。
+ * 通过这些步骤,可以将用户会话数据和用户信息合并在一起,为后续的分析和统计提供更详细的数据。
+ */
+
+
+
+
/**
From 547ecad4ddd7b5cd7bd776d5954ee8d925d253ce Mon Sep 17 00:00:00 2001
From: yy <2565886549@qq.com>
Date: Mon, 16 Dec 2024 23:21:36 +0800
Subject: [PATCH 20/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...ml_jackson_core_jackson_databind_2_4_3.xml | 8 +++++++
...module_jackson_module_scala_2_10_2_4_4.xml | 15 +++++++++++++
..._com_google_code_findbugs_jsr305_1_3_9.xml | 15 +++++++++++++
...Maven__com_google_code_gson_gson_2_2_4.xml | 21 ++++++++++++++++++
.../Maven__com_google_guava_guava_14_0_1.xml | 21 ++++++++++++++++++
...om_google_protobuf_protobuf_java_2_5_0.xml | 21 ++++++++++++++++++
...com_googlecode_javaewah_JavaEWAH_0_3_2.xml | 21 ++++++++++++++++++
...Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml | 21 ++++++++++++++++++
.../Maven__com_ning_compress_lzf_1_0_3.xml | 21 ++++++++++++++++++
...aven__com_sun_jersey_jersey_client_1_9.xml | 21 ++++++++++++++++++
.../Maven__com_sun_jersey_jersey_core_1_9.xml | 21 ++++++++++++++++++
.idea/workspace.xml | 22 +++++++++++++++----
12 files changed, 224 insertions(+), 4 deletions(-)
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml
index 567d7e5..b5a66bd 100644
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml
@@ -1,12 +1,20 @@
+
+
+
+
+
+
+
+
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_scala_2_10_2_4_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_scala_2_10_2_4_4.xml
index 29ba609..5c8573e 100644
--- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_scala_2_10_2_4_4.xml
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_scala_2_10_2_4_4.xml
@@ -1,13 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
index 0e66824..153512e 100644
--- a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
+++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
@@ -1,13 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
index 4533c1b..1ec91eb 100644
--- a/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
+++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml b/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
index b71e220..7be8b2b 100644
--- a/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
+++ b/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml
index c06d3a1..1148955 100644
--- a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml
+++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_3_2.xml b/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_3_2.xml
index 061f3a1..b4574b0 100644
--- a/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_3_2.xml
+++ b/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_3_2.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml b/.idea/libraries/Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml
index c24800a..eaf3302 100644
--- a/.idea/libraries/Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml
+++ b/.idea/libraries/Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_ning_compress_lzf_1_0_3.xml b/.idea/libraries/Maven__com_ning_compress_lzf_1_0_3.xml
index 322a3c2..5eeda5d 100644
--- a/.idea/libraries/Maven__com_ning_compress_lzf_1_0_3.xml
+++ b/.idea/libraries/Maven__com_ning_compress_lzf_1_0_3.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml
index 4c22f08..9fe0946 100644
--- a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml
index abd3e5d..a85c018 100644
--- a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 27e728c..d8d9110 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,8 +5,15 @@
-
-
+
+
+
+
+
+
+
+
+
@@ -424,7 +431,7 @@
-
+
1529592741848
@@ -468,7 +475,14 @@
1734357762782
-
+
+ 1734358077856
+
+
+
+ 1734358077856
+
+
From 5a280d2543f835febae49ac170ec40a7fb8e11cf Mon Sep 17 00:00:00 2001
From: yy <2565886549@qq.com>
Date: Mon, 16 Dec 2024 23:23:32 +0800
Subject: [PATCH 21/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...aven__com_sun_jersey_jersey_server_1_9.xml | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml
index 717467f..c552500 100644
--- a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 4443f56f7c51a758c6b4a09d80874e42ed5b6710 Mon Sep 17 00:00:00 2001
From: yy <2565886549@qq.com>
Date: Mon, 16 Dec 2024 23:29:28 +0800
Subject: [PATCH 22/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...m_thoughtworks_paranamer_paranamer_2_6.xml | 21 ++++++++++++++
.../Maven__com_twitter_chill_2_10_0_5_0.xml | 21 ++++++++++++++
.../Maven__com_twitter_chill_java_0_5_0.xml | 21 ++++++++++++++
...om_twitter_parquet_hadoop_bundle_1_6_0.xml | 21 ++++++++++++++
.idea/workspace.xml | 29 ++++++++++++-------
5 files changed, 103 insertions(+), 10 deletions(-)
diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_6.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_6.xml
index 465a468..9aa7353 100644
--- a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_6.xml
+++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_6.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_twitter_chill_2_10_0_5_0.xml b/.idea/libraries/Maven__com_twitter_chill_2_10_0_5_0.xml
index 08c3ced..497c5f8 100644
--- a/.idea/libraries/Maven__com_twitter_chill_2_10_0_5_0.xml
+++ b/.idea/libraries/Maven__com_twitter_chill_2_10_0_5_0.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_twitter_chill_java_0_5_0.xml b/.idea/libraries/Maven__com_twitter_chill_java_0_5_0.xml
index 2f68aba..fd9403d 100644
--- a/.idea/libraries/Maven__com_twitter_chill_java_0_5_0.xml
+++ b/.idea/libraries/Maven__com_twitter_chill_java_0_5_0.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_twitter_parquet_hadoop_bundle_1_6_0.xml b/.idea/libraries/Maven__com_twitter_parquet_hadoop_bundle_1_6_0.xml
index 7ec1c2f..adfc3ee 100644
--- a/.idea/libraries/Maven__com_twitter_parquet_hadoop_bundle_1_6_0.xml
+++ b/.idea/libraries/Maven__com_twitter_parquet_hadoop_bundle_1_6_0.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d8d9110..ebc6ee0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,14 +5,9 @@
-
-
-
-
-
-
-
-
+
+
+
@@ -431,7 +426,7 @@
-
+
1529592741848
@@ -482,7 +477,21 @@
1734358077856
-
+
+ 1734362496554
+
+
+
+ 1734362496554
+
+
+ 1734362612615
+
+
+
+ 1734362612615
+
+
From 826a9ec2224df98fddd7f747802535b8a79e5309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 23:32:36 +0800
Subject: [PATCH 23/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 18 +++--
.../cn/edu/hust/session/UserVisitAnalyze.java | 74 +++++++++++++++++++
2 files changed, 87 insertions(+), 5 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1975f1c..7e41d09 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
-
+
@@ -477,7 +477,7 @@
-
+
1529592741848
@@ -573,7 +573,15 @@
1734360173676
-
+
+
+ 1734362412393
+
+
+
+ 1734362412393
+
+
@@ -695,10 +703,10 @@
-
-
+
+
diff --git a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
index ee86af4..7bcf24f 100644
--- a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
+++ b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
@@ -616,8 +616,17 @@ public class UserVisitAnalyze {
* @param sessionAggrStatAccumulator
* @return
*/
+
+ //方法签名
+ //方法 filterSessionAndAggrStat 接受三个参数:
+ //sessionInfoRDD:一个 JavaPairRDD,包含会话ID和会话信息。
+ //taskParam:一个 JSONObject,包含筛选条件。
+ //sessionAggrStatAccumulator:一个 Accumulator,用于累加统计信息。
private static JavaPairRDD filterSessionAndAggrStat(JavaPairRDD sessionInfoRDD, final JSONObject taskParam, final Accumulator sessionAggrStatAccumulator){
//得到条件
+ //从任务参数中提取筛选条件
+ //从 taskParam 中提取不同的筛选条件,
+ //如年龄范围、职业、城市、性别、搜索关键词和点击类别ID。
String startAge=ParamUtils.getParam(taskParam,Constants.PARAM_STARTAGE);
String endAge=ParamUtils.getParam(taskParam,Constants.PARAM_ENDAGE);
String professionals=ParamUtils.getParam(taskParam,Constants.PARAM_PROFESSONALS);
@@ -627,44 +636,60 @@ public class UserVisitAnalyze {
String categoryIds=ParamUtils.getParam(taskParam,Constants.PARAM_CLICK_CATEGORYIDS);
//拼接参数
+ //将提取的筛选条件拼接成一个字符串 _paramter,方便后续进行条件判断。
String _paramter=(startAge!=null?Constants.PARAM_STARTAGE+"="+startAge+"|":"")+
(endAge!=null?Constants.PARAM_ENDAGE+"="+endAge+"|":"")+(professionals!=null?Constants.PARAM_PROFESSONALS+"="+professionals+"|":"")+
(cities!=null?Constants.PARAM_CIYTIES+"="+cities+"|":"")+(sex!=null?Constants.PARAM_SEX+"="+sex+"|":"")+
(keyWords!=null?Constants.PARAM_SERACH_KEYWORDS+"="+keyWords+"|":"")+(categoryIds!=null?Constants.PARAM_CLICK_CATEGORYIDS+"="+categoryIds+"|":"");
+ //去除末尾多余的 |
+ //确保参数格式正确。
if(_paramter.endsWith("\\|"))
_paramter=_paramter.substring(0,_paramter.length()-1);
+ //定义最终参数
+ //使用 final 关键字定义最终参数 paramter,确保在 filter 函数中可以使用。
final String paramter=_paramter;
+
+ //过滤和统计会话数据
JavaPairRDD filteredSessionRDD=sessionInfoRDD.filter(new Function, Boolean>() {
@Override
public Boolean call(Tuple2 tuple2) throws Exception {
String sessionInfo=tuple2._2;
//按照条件进行过滤
+ //
//按照年龄进行过滤
if(!ValidUtils.between(sessionInfo,Constants.FIELD_AGE,paramter,Constants.PARAM_STARTAGE,Constants.PARAM_ENDAGE))
return false;
+ //
//按照职业进行过滤
if(!ValidUtils.in(sessionInfo,Constants.FIELD_PROFESSIONAL,paramter,Constants.PARAM_PROFESSONALS))
return false;
+ //
//按照城市进行过滤
if(!ValidUtils.in(sessionInfo,Constants.FIELD_CITY,paramter,Constants.PARAM_CIYTIES))
return false;
+ //
//按照性别进行筛选
if(!ValidUtils.equal(sessionInfo,Constants.FIELD_SEX,paramter,Constants.PARAM_SEX))
return false;
+ //
//按照搜索词进行过滤,只要有一个搜索词即可
if(!ValidUtils.in(sessionInfo,Constants.FIELD_SERACH_KEYWORDS,paramter,Constants.PARAM_PROFESSONALS))
return false;
+
if(!ValidUtils.in(sessionInfo,Constants.FIELD_CLICK_CATEGORYIDS,paramter,Constants.FIELD_CLICK_CATEGORYIDS))
return false;
+
//如果经过了之前的所有的过滤条件,也就是满足用户筛选条件
sessionAggrStatAccumulator.add(Constants.SESSION_COUNT);
+
//计算出访问时长和访问步长的范围并进行相应的累加
Long visitLength=Long.valueOf(StringUtils.getFieldFromConcatString(sessionInfo,"\\|",Constants.FIELD_VISIT_LENGTH));
Long stepLength=Long.valueOf(StringUtils.getFieldFromConcatString(sessionInfo,"\\|",Constants.FIELD_STEP_LENGTH));
+
//使用函数进行统计
calculateVisitLength(visitLength);
calculateStepLength(stepLength);
@@ -672,6 +697,8 @@ public class UserVisitAnalyze {
}
//统计访问时长的数量
+ //从会话信息中提取访问时长 visitLength。
+ //根据 visitLength 的范围进行统计,累加到 sessionAggrStatAccumulator 中。
private void calculateVisitLength(Long visitLegth)
{
if(visitLegth>=1&&visitLegth<=3)
@@ -693,7 +720,10 @@ public class UserVisitAnalyze {
else if(visitLegth>1800)
sessionAggrStatAccumulator.add(Constants.TIME_PERIOD_30m);
}
+
//统计访问步长的数量
+ //从会话信息中提取访问步长 stepLength。
+ //根据 stepLength 的范围进行统计,累加到 sessionAggrStatAccumulator 中。
private void calculateStepLength(Long stepLength)
{
if(stepLength>=1&&stepLength<=3)
@@ -710,8 +740,28 @@ public class UserVisitAnalyze {
sessionAggrStatAccumulator.add(Constants.STEP_PERIOD_60);
}
});
+ //返回过滤后的会话数据 filteredSessionRDD。
return filteredSessionRDD;
}
+ /**
+ * 功能总结
+ * 功能:该方法用于过滤和统计用户会话数据。根据传入的任务参数(如年龄、职业、城市、性别、搜索关键词和点击类别ID),对会话数据进行筛选,并统计访问时长和访问步长的范围。
+ * 关键步骤:
+ * 提取筛选条件:从 taskParam 中提取筛选条件。
+ * 拼接参数:将筛选条件拼接成一个字符串 _paramter。
+ * 过滤会话数据:使用 filter 方法对会话数据进行筛选。
+ * 统计访问时长:根据访问时长进行范围统计。
+ * 统计访问步长:根据访问步长进行范围统计。
+ * 返回结果:返回过滤后的会话数据 filteredSessionRDD。
+ * 通过这些步骤,可以筛选出符合特定条件的会话数据,并进行访问时长和访问步长的统计,为后续的数据分析提供基础。
+ */
+
+
+
+
+
+
+
/**
*
@@ -720,16 +770,40 @@ public class UserVisitAnalyze {
* @param sessionInfoPairRDD
* @return
*/
+
+ //定义一个静态方法 getFilterFullInfoRDD,该方法接受两个参数:
+ //filteredSessionRDD:一个 JavaPairRDD,包含过滤后的会话信息。
+ //sessionInfoPairRDD:一个 JavaPairRDD,
+ // 包含完整的会话信息(会话ID和包含详细信息的 Row 对象)。
private static JavaPairRDD getFilterFullInfoRDD(JavaPairRDD filteredSessionRDD, JavaPairRDD sessionInfoPairRDD) {
//1.获取符合条件的session范围的所有品类
+ //使用 filteredSessionRDD 和 sessionInfoPairRDD 进行 join 操作,
+ // 将两个 RDD 中的相同 key(会话ID)的数据连接在一起。
+ //使用 mapToPair 方法对连接后的结果进行转换,生成新的 JavaPairRDD。
return filteredSessionRDD.join(sessionInfoPairRDD).mapToPair(new PairFunction>, String, Row>() {
@Override
public Tuple2 call(Tuple2> stringTuple2Tuple2) throws Exception {
+ //从 Tuple2> 中提取会话ID stringTuple2Tuple2._1
+ // 和完整的 Row 对象 stringTuple2Tuple2._2._2。
+ //将会话ID和完整的 Row 对象封装为一个新的 Tuple2 并返回。
return new Tuple2(stringTuple2Tuple2._1,stringTuple2Tuple2._2._2);
}
});
}
+ /**
+ * 功能总结
+ * 功能:该方法用于获取符合条件的会话范围的所有品类的详细信息。具体步骤如下:
+ * 连接两个 RDD:使用 join 方法将 filteredSessionRDD 和 sessionInfoPairRDD 中的相同会话ID的数据连接在一起。
+ * 提取详细信息:通过 mapToPair 方法提取每个连接后的 Tuple2 中的会话ID和完整的 Row 对象。
+ * 返回结果:返回一个新的 JavaPairRDD,其中每个 Row 对象包含了完整的会话信息。
+ */
+
+
+
+
+
+
/**
* 随机抽取Sesison功能
* @param taskId
From 4b5f96ad3a2cf234b95f3760801990ea0bd4dfe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Mon, 16 Dec 2024 23:36:24 +0800
Subject: [PATCH 24/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=9011?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7e41d09..373eefe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,7 @@
-
-
-
-
+
@@ -477,7 +474,7 @@
-
+
1529592741848
@@ -581,7 +578,15 @@
1734362412393
-
+
+
+ 1734363163041
+
+
+
+ 1734363163041
+
+
@@ -701,12 +706,12 @@
-
-
+
+
From 87a0ab682861cba9907806c92f9a1be40e414c33 Mon Sep 17 00:00:00 2001
From: yy <2565886549@qq.com>
Date: Mon, 16 Dec 2024 23:43:29 +0800
Subject: [PATCH 25/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...m_typesafe_akka_akka_actor_2_10_2_3_11.xml | 21 ++++++++++++++
..._typesafe_akka_akka_remote_2_10_2_3_11.xml | 21 ++++++++++++++
...m_typesafe_akka_akka_slf4j_2_10_2_3_11.xml | 21 ++++++++++++++
.../Maven__com_typesafe_config_1_2_1.xml | 21 ++++++++++++++
..._com_yammer_metrics_metrics_core_2_2_0.xml | 21 ++++++++++++++
...mons_beanutils_commons_beanutils_1_7_0.xml | 21 ++++++++++++++
...beanutils_commons_beanutils_core_1_8_0.xml | 21 ++++++++++++++
.../Maven__commons_cli_commons_cli_1_2.xml | 21 ++++++++++++++
...aven__commons_codec_commons_codec_1_10.xml | 13 ---------
..._collections_commons_collections_3_2_2.xml | 29 ++++++++++++++++---
...onfiguration_commons_configuration_1_6.xml | 21 ++++++++++++++
.../Maven__commons_dbcp_commons_dbcp_1_4.xml | 21 ++++++++++++++
.idea/workspace.xml | 22 ++++++++++----
13 files changed, 252 insertions(+), 22 deletions(-)
delete mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
diff --git a/.idea/libraries/Maven__com_typesafe_akka_akka_actor_2_10_2_3_11.xml b/.idea/libraries/Maven__com_typesafe_akka_akka_actor_2_10_2_3_11.xml
index 7036476..c75be6b 100644
--- a/.idea/libraries/Maven__com_typesafe_akka_akka_actor_2_10_2_3_11.xml
+++ b/.idea/libraries/Maven__com_typesafe_akka_akka_actor_2_10_2_3_11.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_typesafe_akka_akka_remote_2_10_2_3_11.xml b/.idea/libraries/Maven__com_typesafe_akka_akka_remote_2_10_2_3_11.xml
index dc47d0c..bb382ed 100644
--- a/.idea/libraries/Maven__com_typesafe_akka_akka_remote_2_10_2_3_11.xml
+++ b/.idea/libraries/Maven__com_typesafe_akka_akka_remote_2_10_2_3_11.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_typesafe_akka_akka_slf4j_2_10_2_3_11.xml b/.idea/libraries/Maven__com_typesafe_akka_akka_slf4j_2_10_2_3_11.xml
index 4e40647..dba2926 100644
--- a/.idea/libraries/Maven__com_typesafe_akka_akka_slf4j_2_10_2_3_11.xml
+++ b/.idea/libraries/Maven__com_typesafe_akka_akka_slf4j_2_10_2_3_11.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_typesafe_config_1_2_1.xml b/.idea/libraries/Maven__com_typesafe_config_1_2_1.xml
index cc78721..0485b81 100644
--- a/.idea/libraries/Maven__com_typesafe_config_1_2_1.xml
+++ b/.idea/libraries/Maven__com_typesafe_config_1_2_1.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml b/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml
index fc159c5..7ff5144 100644
--- a/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml
+++ b/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml
index 1cb64ed..34763ef 100644
--- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml
+++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml
index 3fda2c0..163936c 100644
--- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml
+++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
index cec2493..f0159d1 100644
--- a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
+++ b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
deleted file mode 100644
index 27424a1..0000000
--- a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
index 13afda2..5a2810a 100644
--- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
+++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
@@ -1,13 +1,34 @@
+
-
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
index ae96781..5ab0a11 100644
--- a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
+++ b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml
index 49c39ce..43281c9 100644
--- a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml
+++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ebc6ee0..f8402fb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,14 @@
-
-
-
+
+
+
+
+
+
+
+
@@ -426,7 +431,7 @@
-
+
1529592741848
@@ -491,7 +496,14 @@
1734362612615
-
+
+ 1734362968394
+
+
+
+ 1734362968394
+
+
From 9ec53da8b81f0ad953e061d5ca30ce281a4e22bf Mon Sep 17 00:00:00 2001
From: yy <2565886549@qq.com>
Date: Tue, 17 Dec 2024 00:02:29 +0800
Subject: [PATCH 26/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
..._commons_digester_commons_digester_1_8.xml | 21 ++++++++++++
...mons_httpclient_commons_httpclient_3_1.xml | 21 ++++++++++++
.../Maven__commons_io_commons_io_2_4.xml | 21 ++++++++++++
.../Maven__commons_lang_commons_lang_2_4.xml | 21 ++++++++++++
..._commons_logging_commons_logging_1_1_3.xml | 21 ++++++++++++
.../Maven__commons_net_commons_net_2_2.xml | 21 ++++++++++++
...Maven__commons_pool_commons_pool_1_5_4.xml | 21 ++++++++++++
..._dropwizard_metrics_metrics_core_3_1_2.xml | 21 ++++++++++++
...pwizard_metrics_metrics_graphite_3_1_2.xml | 21 ++++++++++++
..._dropwizard_metrics_metrics_json_3_1_2.xml | 21 ++++++++++++
...o_dropwizard_metrics_metrics_jvm_3_1_2.xml | 21 ++++++++++++
.../Maven__io_netty_netty_3_8_0_Final.xml | 21 ++++++++++++
...Maven__io_netty_netty_all_4_0_29_Final.xml | 21 ++++++++++++
...Maven__javax_activation_activation_1_1.xml | 21 ++++++++++++
.../Maven__javax_jdo_jdo_api_3_0_1.xml | 21 ++++++++++++
.../Maven__javax_servlet_servlet_api_2_5.xml | 21 ++++++++++++
.../Maven__javax_transaction_jta_1_1.xml | 21 ++++++++++++
.idea/workspace.xml | 33 +++++++++++++------
18 files changed, 380 insertions(+), 10 deletions(-)
diff --git a/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml b/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml
index 49f1def..ff38349 100644
--- a/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml
+++ b/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
index 66e6537..fab9cab 100644
--- a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
+++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
index bc2aad0..377ee90 100644
--- a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
+++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
index 5e8b8d3..d0e2e65 100644
--- a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
+++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
index 01c7b8e..2e42f00 100644
--- a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
+++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_net_commons_net_2_2.xml b/.idea/libraries/Maven__commons_net_commons_net_2_2.xml
index cdd400d..d6a47ff 100644
--- a/.idea/libraries/Maven__commons_net_commons_net_2_2.xml
+++ b/.idea/libraries/Maven__commons_net_commons_net_2_2.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml
index ab20721..37c2889 100644
--- a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml
+++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_core_3_1_2.xml b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_core_3_1_2.xml
index e25f69c..ab72a46 100644
--- a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_core_3_1_2.xml
+++ b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_core_3_1_2.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_graphite_3_1_2.xml b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_graphite_3_1_2.xml
index fe7ca23..3ca0d32 100644
--- a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_graphite_3_1_2.xml
+++ b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_graphite_3_1_2.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_json_3_1_2.xml b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_json_3_1_2.xml
index 8b11059..37da418 100644
--- a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_json_3_1_2.xml
+++ b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_json_3_1_2.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_jvm_3_1_2.xml b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_jvm_3_1_2.xml
index 32625f0..cb90333 100644
--- a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_jvm_3_1_2.xml
+++ b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_jvm_3_1_2.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_3_8_0_Final.xml b/.idea/libraries/Maven__io_netty_netty_3_8_0_Final.xml
index d77c5c9..11e24b2 100644
--- a/.idea/libraries/Maven__io_netty_netty_3_8_0_Final.xml
+++ b/.idea/libraries/Maven__io_netty_netty_3_8_0_Final.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_all_4_0_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_0_29_Final.xml
index eaf53f6..17fa2b1 100644
--- a/.idea/libraries/Maven__io_netty_netty_all_4_0_29_Final.xml
+++ b/.idea/libraries/Maven__io_netty_netty_all_4_0_29_Final.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml
index 180d587..67b553c 100644
--- a/.idea/libraries/Maven__javax_activation_activation_1_1.xml
+++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml b/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml
index ee6078c..e992e63 100644
--- a/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml
+++ b/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml b/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
index 679e09a..6f618d0 100644
--- a/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
+++ b/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_transaction_jta_1_1.xml b/.idea/libraries/Maven__javax_transaction_jta_1_1.xml
index 3047243..b6fc0c8 100644
--- a/.idea/libraries/Maven__javax_transaction_jta_1_1.xml
+++ b/.idea/libraries/Maven__javax_transaction_jta_1_1.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f8402fb..33b92da 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,14 +5,20 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -431,7 +437,7 @@
-
+
1529592741848
@@ -503,7 +509,14 @@
1734362968394
-
+
+ 1734363809106
+
+
+
+ 1734363809106
+
+
From 3a6af1a9d05afce2f27653b34b045dcc56ec550c Mon Sep 17 00:00:00 2001
From: yy <2565886549@qq.com>
Date: Tue, 17 Dec 2024 00:15:05 +0800
Subject: [PATCH 27/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Maven__javax_xml_bind_jaxb_api_2_2_2.xml | 21 ++++++++++++
...Maven__javax_xml_stream_stax_api_1_0_2.xml | 21 ++++++++++++
.../Maven__javolution_javolution_5_5_1.xml | 21 ++++++++++++
.idea/libraries/Maven__jline_jline_2_12.xml | 21 ++++++++++++
.../Maven__joda_time_joda_time_2_5.xml | 21 ++++++++++++
.idea/libraries/Maven__junit_junit_4_12.xml | 21 ++++++++++++
...aven__log4j_apache_log4j_extras_1_2_17.xml | 21 ++++++++++++
.idea/libraries/Maven__log4j_log4j_1_2_17.xml | 21 ++++++++++++
...aven__mysql_mysql_connector_java_5_1_6.xml | 21 ++++++++++++
..._hydromatic_eigenbase_properties_1_1_5.xml | 21 ++++++++++++
...aven__net_java_dev_jets3t_jets3t_0_7_1.xml | 21 ++++++++++++
.../Maven__net_jpountz_lz4_lz4_1_3_0.xml | 21 ++++++++++++
.../Maven__net_razorvine_pyrolite_4_4.xml | 21 ++++++++++++
.../Maven__net_sf_opencsv_opencsv_2_3.xml | 21 ++++++++++++
.../Maven__net_sf_py4j_py4j_0_8_2_1.xml | 21 ++++++++++++
.idea/workspace.xml | 32 +++++++++----------
16 files changed, 331 insertions(+), 16 deletions(-)
diff --git a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml
index a3054d2..d0ac2d7 100644
--- a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml
+++ b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
index 2a4dd7a..083e108 100644
--- a/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
+++ b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javolution_javolution_5_5_1.xml b/.idea/libraries/Maven__javolution_javolution_5_5_1.xml
index 374563d..de3623a 100644
--- a/.idea/libraries/Maven__javolution_javolution_5_5_1.xml
+++ b/.idea/libraries/Maven__javolution_javolution_5_5_1.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jline_jline_2_12.xml b/.idea/libraries/Maven__jline_jline_2_12.xml
index eaff5ff..939f9b0 100644
--- a/.idea/libraries/Maven__jline_jline_2_12.xml
+++ b/.idea/libraries/Maven__jline_jline_2_12.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_5.xml b/.idea/libraries/Maven__joda_time_joda_time_2_5.xml
index 7eb240e..17c9942 100644
--- a/.idea/libraries/Maven__joda_time_joda_time_2_5.xml
+++ b/.idea/libraries/Maven__joda_time_joda_time_2_5.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml
index d411041..eb939d3 100644
--- a/.idea/libraries/Maven__junit_junit_4_12.xml
+++ b/.idea/libraries/Maven__junit_junit_4_12.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__log4j_apache_log4j_extras_1_2_17.xml b/.idea/libraries/Maven__log4j_apache_log4j_extras_1_2_17.xml
index 170743e..a11f3b9 100644
--- a/.idea/libraries/Maven__log4j_apache_log4j_extras_1_2_17.xml
+++ b/.idea/libraries/Maven__log4j_apache_log4j_extras_1_2_17.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
index e383c1b..5c0641c 100644
--- a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
+++ b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml
index 2b062b5..1aef56e 100644
--- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml
+++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_hydromatic_eigenbase_properties_1_1_5.xml b/.idea/libraries/Maven__net_hydromatic_eigenbase_properties_1_1_5.xml
index 388b7eb..e45fc62 100644
--- a/.idea/libraries/Maven__net_hydromatic_eigenbase_properties_1_1_5.xml
+++ b/.idea/libraries/Maven__net_hydromatic_eigenbase_properties_1_1_5.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_java_dev_jets3t_jets3t_0_7_1.xml b/.idea/libraries/Maven__net_java_dev_jets3t_jets3t_0_7_1.xml
index a301a5b..d088d3f 100644
--- a/.idea/libraries/Maven__net_java_dev_jets3t_jets3t_0_7_1.xml
+++ b/.idea/libraries/Maven__net_java_dev_jets3t_jets3t_0_7_1.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_jpountz_lz4_lz4_1_3_0.xml b/.idea/libraries/Maven__net_jpountz_lz4_lz4_1_3_0.xml
index 7e9fceb..9abc0a7 100644
--- a/.idea/libraries/Maven__net_jpountz_lz4_lz4_1_3_0.xml
+++ b/.idea/libraries/Maven__net_jpountz_lz4_lz4_1_3_0.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_razorvine_pyrolite_4_4.xml b/.idea/libraries/Maven__net_razorvine_pyrolite_4_4.xml
index 84ff505..46f838f 100644
--- a/.idea/libraries/Maven__net_razorvine_pyrolite_4_4.xml
+++ b/.idea/libraries/Maven__net_razorvine_pyrolite_4_4.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_3.xml b/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_3.xml
index 6abe098..644b7fe 100644
--- a/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_3.xml
+++ b/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_3.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_py4j_py4j_0_8_2_1.xml b/.idea/libraries/Maven__net_sf_py4j_py4j_0_8_2_1.xml
index b771ebc..96f9792 100644
--- a/.idea/libraries/Maven__net_sf_py4j_py4j_0_8_2_1.xml
+++ b/.idea/libraries/Maven__net_sf_py4j_py4j_0_8_2_1.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 33b92da..0f3b89c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,20 +5,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -437,7 +430,7 @@
-
+
1529592741848
@@ -516,7 +509,14 @@
1734363809106
-
+
+ 1734364949444
+
+
+
+ 1734364949444
+
+
From 6d5aa2e4cbf2e427620d970dbb8f419943add5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Tue, 17 Dec 2024 00:17:00 +0800
Subject: [PATCH 28/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=9011=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=9011=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=9011?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 21 ++-
.../cn/edu/hust/session/UserVisitAnalyze.java | 148 ++++++++++++------
2 files changed, 120 insertions(+), 49 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 373eefe..ad194c8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,10 @@
-
+
+
+
+
@@ -474,7 +477,8 @@
-
+
+
1529592741848
@@ -586,7 +590,15 @@
1734363163041
-
+
+
+ 1734363388179
+
+
+
+ 1734363388179
+
+
@@ -711,7 +723,8 @@
-
+
+
diff --git a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
index 7bcf24f..1d62b3b 100644
--- a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
+++ b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
@@ -811,93 +811,151 @@ public class UserVisitAnalyze {
* @param sessionInfoPairRDD
*/
private static void randomExtractSession(final Long taskId, JavaPairRDD filteredSessionRDD, JavaPairRDD sessionInfoPairRDD) {
- //1.先将过滤Seesion进行映射,映射成为Time,Info的数据格式
+ // 1. 先将过滤Seesion进行映射,映射成为Time,Info的数据格式
+ // 下面这行代码使用mapToPair操作对filteredSessionRDD进行转换,创建一个新的JavaPairRDD(键值对形式的RDD)。
+ // 这里传入了一个PairFunction实现,用于定义如何将原有的Tuple2类型的数据转换为新的键值对形式。
final JavaPairRDD mapDataRDD=filteredSessionRDD.mapToPair(new PairFunction, String, String>() {
@Override
public Tuple2 call(Tuple2 tuple2) throws Exception {
String info=tuple2._2;
- //获取开始的时间
+ // 获取开始的时间,通过StringUtils工具类的getFieldFromConcatString方法从info字符串中提取相应字段,以"|"作为分隔符,提取的是Constants.FIELD_START_TIME所指定的字段(应该是定义好的表示开始时间的字段索引之类的)。
+
String startTime=StringUtils.getFieldFromConcatString(info,"\\|",Constants.FIELD_START_TIME);
+ // 对获取到的开始时间进行格式化处理,调用DateUtils工具类的getDateHour方法,将时间格式化为特定的小时格式(具体格式由该方法内部定义)。
+
String formatStartTime=DateUtils.getDateHour(startTime);
+ // 返回一个新的Tuple2,以格式化后的时间作为键,原info字符串作为值,这样就完成了将原始数据按照特定格式进行映射转换。
+
return new Tuple2(formatStartTime,info);
}
});
- //计算每一个小时的Session数量
+ // 计算每一个小时的Session数量,通过countByKey方法统计mapDataRDD中每个键(也就是经过格式化后的时间)对应的元素数量,
+ // 返回一个Map,键是时间,值是对应的数量。
Map mapCount=mapDataRDD.countByKey();
+
+ // 遍历mapCount,这个mapCount里存放了每个时间对应的Session数量情况。
//设计一个新的数据结构Map> dateHourCount,日期作为Key,时间和数量作为Map
Map> dateHourCountMap=new HashMap>();
//遍历mapCount
for (Map.Entry entry:mapCount.entrySet())
{
+ // 从键(格式应该是类似"日期_小时"这样的字符串)中分割出日期部分,以"_"作为分隔符取第一个元素。
String date=entry.getKey().split("_")[0];
+
+ // 从键中分割出小时部分,以"_"作为分隔符取第二个元素。
String hour=entry.getKey().split("_")[1];
+ // 根据日期从dateHourCountMap中获取对应的内层Map(存放小时和数量的映射),
+ // 如果不存在则返回null。
Map hourCount=dateHourCountMap.get(date);
+
+ // 如果对应的内层Map不存在,就创建一个新的HashMap用来存放该日期下各个小时的Session数量。
if(hourCount==null)
{
+ // 将新创建的内层Map放入外层的dateHourCountMap中,以日期作为键。
hourCount=new HashMap();
dateHourCountMap.put(date,hourCount);
}
+ // 将当前小时对应的Session数量放入内层的hourCount Map中,
+ // 这里需要将entry.getValue()转换为Long类型
+ // (因为countByKey返回的值类型是Object,实际应该是Long表示数量)。
hourCount.put(hour,(Long)entry.getValue());
+
+ // 功能解释:
+ // 整体这段代码的功能主要是对给定的过滤后的会话数据(filteredSessionRDD)进行处理。
+ // 首先将其按照特定格式进行映射转换,把会话信息中的开始时间提取并格式化后作为键,原会话信息作为值存放在新的mapDataRDD中。
+ // 接着统计每个格式化后的时间对应的会话数量,得到一个时间和数量的映射mapCount。
+ // 最后构建了一个更复杂的嵌套Map结构dateHourCountMap,按照日期对每个小时的会话数量进行分类组织,方便后续按照日期和小时维度来进一步分析和处理会话数据相关的统计信息等操作。
+
}
- //将数据按照天数平均
- int countPerday=100/dateHourCountMap.size();
- //实现一个随机函数后面将会用到
- Random random=new Random();
- //设计一个新的数据结构,用于存储随机索引,Key是每一天,Map是小时和随机索引列表构成的
- final Map>> dateRandomExtractMap=new HashMap>>();
- for (Map.Entry> dateHourCount:dateHourCountMap.entrySet())
- {
- //日期
- String date=dateHourCount.getKey();
- //每一天个Session个数
- Long sessionCount=0L;
- for(Map.Entry hourCountMap:dateHourCount.getValue().entrySet())
- {
- sessionCount+=hourCountMap.getValue();
- }
- //获取每一天随机存储的Map
- Map> dayExtactMap=dateRandomExtractMap.get(date);
- if(dayExtactMap==null)
- {
- dayExtactMap=new HashMap>();
- dateRandomExtractMap.put(date,dayExtactMap);
- }
+ int countPerday = 100 / dateHourCountMap.size();
+// 这行代码的目的是计算每天平均要抽取的数量。它用固定值100除以dateHourCountMap中不同日期的数量(也就是总天数),
+// 这里假设是想按照平均分配的方式来确定每天大致要抽取多少个会话数据,不过要注意如果dateHourCountMap.size()为0会导致除零异常,实际应用中可能需要额外处理这种边界情况。
- //遍历每一个小时,计算出每一个小时的Session占比和抽取的数量
+// 实现一个随机函数后面将会用到
+ Random random = new Random();
+// 创建一个Random对象,用于后续生成随机数,例如生成随机索引来实现随机抽取会话数据的功能。
- for(Map.Entry hourCountMap:dateHourCount.getValue().entrySet())
- {
- int extractSize= (int) ((double) hourCountMap.getValue()/sessionCount*countPerday);
+// 设计一个新的数据结构,用于存储随机索引,Key是每一天,Map是小时和随机索引列表构成的
+ final Map>> dateRandomExtractMap = new HashMap>>();
+// 创建一个外层是按照日期为键,内层是按照小时为键,值为长整型列表(用来存放随机索引)的嵌套HashMap结构,
+// 这个数据结构将用于存储针对每个日期下每个小时抽取会话数据时所用到的随机索引信息。
- //如果抽离的长度大于被抽取数据的长度,那么抽取的长度就是被抽取长度
- extractSize= extractSize>hourCountMap.getValue()?hourCountMap.getValue().intValue():extractSize;
+ for (Map.Entry> dateHourCount : dateHourCountMap.entrySet()) {
+ // 日期
+ String date = dateHourCount.getKey();
+ // 从dateHourCountMap的每一个元素(外层键值对,键是日期,值是包含小时和对应会话数量的内层Map)中获取日期部分,也就是外层键。
- //获取存储每一个小时的List
- List indexList=dayExtactMap.get(hourCountMap.getKey());
- if(indexList==null)
- {
- indexList=new ArrayList();
- dayExtactMap.put(hourCountMap.getKey(),indexList);
+ // 每一天个Session个数
+ Long sessionCount = 0L;
+ // 初始化一个变量用来统计当前日期下总的会话数量,初始值设为0。
+
+ for (Map.Entry hourCountMap : dateHourCount.getValue().entrySet()) {
+ // 遍历当前日期对应的内层Map(存放每个小时和对应的会话数量),获取每一个小时的会话数量,并累加到sessionCount变量中,
+ // 这样最终sessionCount就表示当前日期下总的会话数量了。
+ sessionCount += hourCountMap.getValue();
+ }
+
+ // 获取每一天随机存储的Map
+ Map> dayExtactMap = dateRandomExtractMap.get(date);
+ // 根据当前日期从dateRandomExtractMap中获取对应的内层Map(用来存放每个小时的随机索引列表的那个Map),如果不存在则返回null。
+
+ if (dayExtactMap == null) {
+ // 如果对应的内层Map不存在,就创建一个新的HashMap,用来存放当前日期下各个小时对应的随机索引列表。
+ dayExtactMap = new HashMap>();
+ // 将新创建的内层Map放入外层的dateRandomExtractMap中,以日期作为键,这样就完成了针对当前日期的内层Map初始化操作。
+ dateRandomExtractMap.put(date, dayExtactMap);
+ }
+
+ // 遍历每一个小时,计算出每一个小时的Session占比和抽取的数量
+ for (Map.Entry hourCountMap : dateHourCount.getValue().entrySet()) {
+ // 计算当前小时的会话数据抽取数量。先将当前小时的会话数量除以当天总的会话数量得到占比,再乘以每天平均要抽取的数量countPerday,
+ // 并将结果转换为整型作为当前小时预计抽取的数量,这里涉及到类型转换(从Long类型的会话数量等转换为int类型的抽取数量),要注意可能出现数据精度丢失等情况。
+ int extractSize = (int) ((double) hourCountMap.getValue() / sessionCount * countPerday);
+
+ // 如果抽离的长度大于被抽取数据的长度,那么抽取的长度就是被抽取长度
+ extractSize = extractSize > hourCountMap.getValue()? hourCountMap.getValue().intValue() : extractSize;
+ // 进行边界判断,如果计算出来的抽取数量大于当前小时实际的会话数量,那就把抽取数量设置为当前小时实际的会话数量,
+ // 避免出现抽取数量超出实际可抽取范围的情况,这里同样进行了类型转换确保赋值给int类型的extractSize变量。
+
+ // 获取存储每一个小时的List
+ List indexList = dayExtactMap.get(hourCountMap.getKey());
+ // 从当前日期对应的内层Map(dayExtactMap)中获取当前小时对应的随机索引列表,如果不存在则返回null。
+
+ if (indexList == null) {
+ // 如果对应的随机索引列表不存在,就创建一个新的ArrayList用来存放随机索引。
+ indexList = new ArrayList();
+ // 将新创建的列表放入dayExtactMap中,以当前小时作为键,这样就完成了针对当前小时的随机索引列表初始化操作。
+ dayExtactMap.put(hourCountMap.getKey(), indexList);
}
- //使用随机函数生成随机索引
- for(int i=0;i> time2GroupRDD=mapDataRDD.groupByKey();
From f288be9029bd30745ae453c306e5d071e55bccbe Mon Sep 17 00:00:00 2001
From: yy <2565886549@qq.com>
Date: Tue, 17 Dec 2024 00:35:50 +0800
Subject: [PATCH 29/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../libraries/Maven__org_antlr_ST4_4_0_4.xml | 21 +++++++++++++++
.../Maven__org_antlr_antlr_runtime_3_4.xml | 21 +++++++++++++++
.../Maven__org_antlr_stringtemplate_3_2_1.xml | 21 +++++++++++++++
.../Maven__org_apache_avro_avro_1_7_7.xml | 21 +++++++++++++++
.../Maven__org_apache_avro_avro_ipc_1_7_7.xml | 21 +++++++++++++++
...__org_apache_avro_avro_ipc_tests_1_7_7.xml | 23 +++++++++++++++-
..._apache_avro_avro_mapred_hadoop2_1_7_7.xml | 21 +++++++++++++++
...lcite_calcite_avatica_1_2_0_incubating.xml | 21 +++++++++++++++
..._calcite_calcite_core_1_2_0_incubating.xml | 21 +++++++++++++++
...alcite_calcite_linq4j_1_2_0_incubating.xml | 21 +++++++++++++++
..._apache_commons_commons_compress_1_4_1.xml | 21 +++++++++++++++
...org_apache_commons_commons_lang3_3_3_2.xml | 21 +++++++++++++++
.idea/workspace.xml | 26 ++++++++++++-------
13 files changed, 270 insertions(+), 10 deletions(-)
diff --git a/.idea/libraries/Maven__org_antlr_ST4_4_0_4.xml b/.idea/libraries/Maven__org_antlr_ST4_4_0_4.xml
index 6633680..c185a92 100644
--- a/.idea/libraries/Maven__org_antlr_ST4_4_0_4.xml
+++ b/.idea/libraries/Maven__org_antlr_ST4_4_0_4.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
index fd0779a..dc15b2f 100644
--- a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
+++ b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
index 6998bac..2070213 100644
--- a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
+++ b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_1_7_7.xml b/.idea/libraries/Maven__org_apache_avro_avro_1_7_7.xml
index 1cef8eb..55d4f8a 100644
--- a/.idea/libraries/Maven__org_apache_avro_avro_1_7_7.xml
+++ b/.idea/libraries/Maven__org_apache_avro_avro_1_7_7.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_7.xml b/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_7.xml
index 2d2e5e6..8403c39 100644
--- a/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_7.xml
+++ b/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_7.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_ipc_tests_1_7_7.xml b/.idea/libraries/Maven__org_apache_avro_avro_ipc_tests_1_7_7.xml
index 077445c..fbcf8b5 100644
--- a/.idea/libraries/Maven__org_apache_avro_avro_ipc_tests_1_7_7.xml
+++ b/.idea/libraries/Maven__org_apache_avro_avro_ipc_tests_1_7_7.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
+
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_mapred_hadoop2_1_7_7.xml b/.idea/libraries/Maven__org_apache_avro_avro_mapred_hadoop2_1_7_7.xml
index 0abd56e..13395c5 100644
--- a/.idea/libraries/Maven__org_apache_avro_avro_mapred_hadoop2_1_7_7.xml
+++ b/.idea/libraries/Maven__org_apache_avro_avro_mapred_hadoop2_1_7_7.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_calcite_calcite_avatica_1_2_0_incubating.xml b/.idea/libraries/Maven__org_apache_calcite_calcite_avatica_1_2_0_incubating.xml
index 21ff29c..4d4ee9f 100644
--- a/.idea/libraries/Maven__org_apache_calcite_calcite_avatica_1_2_0_incubating.xml
+++ b/.idea/libraries/Maven__org_apache_calcite_calcite_avatica_1_2_0_incubating.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_calcite_calcite_core_1_2_0_incubating.xml b/.idea/libraries/Maven__org_apache_calcite_calcite_core_1_2_0_incubating.xml
index 99d56fa..f4cf1f0 100644
--- a/.idea/libraries/Maven__org_apache_calcite_calcite_core_1_2_0_incubating.xml
+++ b/.idea/libraries/Maven__org_apache_calcite_calcite_core_1_2_0_incubating.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_calcite_calcite_linq4j_1_2_0_incubating.xml b/.idea/libraries/Maven__org_apache_calcite_calcite_linq4j_1_2_0_incubating.xml
index 79cca19..3be6b7b 100644
--- a/.idea/libraries/Maven__org_apache_calcite_calcite_linq4j_1_2_0_incubating.xml
+++ b/.idea/libraries/Maven__org_apache_calcite_calcite_linq4j_1_2_0_incubating.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
index 190209e..45e3693 100644
--- a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
+++ b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
index 83cba3e..3b5e976 100644
--- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
@@ -1,13 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0f3b89c..51c53aa 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,13 +5,14 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -430,7 +431,7 @@
-
+
1529592741848
@@ -516,7 +517,14 @@
1734364949444
-
+
+ 1734365705378
+
+
+
+ 1734365705378
+
+
From 7ea5a6f0521529f93fec1029ba22aacb6996742d Mon Sep 17 00:00:00 2001
From: yy <2565886549@qq.com>
Date: Tue, 17 Dec 2024 00:40:08 +0800
Subject: [PATCH 30/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 51c53aa..2b51ca8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,17 +4,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -431,7 +421,7 @@
-
+
1529592741848
@@ -524,7 +514,14 @@
1734365705378
-
+
+ 1734366950342
+
+
+
+ 1734366950342
+
+
From fc715ccc75a70e84e205995b3e1d2758acf8cf58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=B0=8F=E5=A8=9C?= <1253094786@qq.com>
Date: Tue, 17 Dec 2024 00:58:37 +0800
Subject: [PATCH 31/43] =?UTF-8?q?=E7=BC=96=E5=86=992?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/compiler.xml | 2 +-
.idea/encodings.xml | 2 +
.idea/jarRepositories.xml | 20 ++
.idea/libraries/Maven__antlr_antlr_2_7_7.xml | 13 +
.idea/libraries/Maven__asm_asm_3_1.xml | 13 +
.../Maven__com_101tec_zkclient_0_3.xml | 13 +
.../Maven__com_alibaba_fastjson_1_1_41.xml | 13 +
...com_clearspring_analytics_stream_2_7_0.xml | 13 +
...n__com_esotericsoftware_kryo_kryo_2_21.xml | 13 +
...com_esotericsoftware_minlog_minlog_1_2.xml | 13 +
...ware_reflectasm_reflectasm_shaded_1_07.xml | 13 +
...jackson_core_jackson_annotations_2_4_3.xml | 13 +
...terxml_jackson_core_jackson_core_2_4_3.xml | 13 +
...ml_jackson_core_jackson_databind_2_4_3.xml | 13 +
...module_jackson_module_scala_2_10_2_4_4.xml | 13 +
..._com_google_code_findbugs_jsr305_1_3_9.xml | 13 +
...Maven__com_google_code_gson_gson_2_2_4.xml | 13 +
.../Maven__com_google_guava_guava_14_0_1.xml | 13 +
...om_google_protobuf_protobuf_java_2_5_0.xml | 13 +
...com_googlecode_javaewah_JavaEWAH_0_3_2.xml | 13 +
...Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml | 13 +
.../Maven__com_ning_compress_lzf_1_0_3.xml | 13 +
...aven__com_sun_jersey_jersey_client_1_9.xml | 13 +
.../Maven__com_sun_jersey_jersey_core_1_9.xml | 13 +
...aven__com_sun_jersey_jersey_server_1_9.xml | 13 +
...m_thoughtworks_paranamer_paranamer_2_6.xml | 13 +
.../Maven__com_twitter_chill_2_10_0_5_0.xml | 13 +
.../Maven__com_twitter_chill_java_0_5_0.xml | 13 +
...om_twitter_parquet_hadoop_bundle_1_6_0.xml | 13 +
...m_typesafe_akka_akka_actor_2_10_2_3_11.xml | 13 +
..._typesafe_akka_akka_remote_2_10_2_3_11.xml | 13 +
...m_typesafe_akka_akka_slf4j_2_10_2_3_11.xml | 13 +
.../Maven__com_typesafe_config_1_2_1.xml | 13 +
..._com_yammer_metrics_metrics_core_2_2_0.xml | 13 +
...mons_beanutils_commons_beanutils_1_7_0.xml | 13 +
...beanutils_commons_beanutils_core_1_8_0.xml | 13 +
.../Maven__commons_cli_commons_cli_1_2.xml | 13 +
...aven__commons_codec_commons_codec_1_10.xml | 13 +
..._collections_commons_collections_3_2_2.xml | 13 +
...onfiguration_commons_configuration_1_6.xml | 13 +
.../Maven__commons_dbcp_commons_dbcp_1_4.xml | 13 +
..._commons_digester_commons_digester_1_8.xml | 13 +
...mons_httpclient_commons_httpclient_3_1.xml | 13 +
.../Maven__commons_io_commons_io_2_4.xml | 13 +
.../Maven__commons_lang_commons_lang_2_4.xml | 13 +
..._commons_logging_commons_logging_1_1_3.xml | 13 +
.../Maven__commons_net_commons_net_2_2.xml | 13 +
...Maven__commons_pool_commons_pool_1_5_4.xml | 13 +
..._dropwizard_metrics_metrics_core_3_1_2.xml | 13 +
...pwizard_metrics_metrics_graphite_3_1_2.xml | 13 +
..._dropwizard_metrics_metrics_json_3_1_2.xml | 13 +
...o_dropwizard_metrics_metrics_jvm_3_1_2.xml | 13 +
.../Maven__io_netty_netty_3_8_0_Final.xml | 13 +
...Maven__io_netty_netty_all_4_0_29_Final.xml | 13 +
...Maven__javax_activation_activation_1_1.xml | 13 +
.../Maven__javax_jdo_jdo_api_3_0_1.xml | 13 +
.../Maven__javax_servlet_servlet_api_2_5.xml | 13 +
.../Maven__javax_transaction_jta_1_1.xml | 13 +
.../Maven__javax_xml_bind_jaxb_api_2_2_2.xml | 13 +
...Maven__javax_xml_stream_stax_api_1_0_2.xml | 13 +
.../Maven__javolution_javolution_5_5_1.xml | 13 +
.idea/libraries/Maven__jline_jline_2_12.xml | 13 +
.../Maven__joda_time_joda_time_2_5.xml | 13 +
.idea/libraries/Maven__junit_junit_4_13_2.xml | 13 +
...aven__log4j_apache_log4j_extras_1_2_17.xml | 13 +
.idea/libraries/Maven__log4j_log4j_1_2_17.xml | 13 +
...aven__mysql_mysql_connector_java_5_1_6.xml | 13 +
..._hydromatic_eigenbase_properties_1_1_5.xml | 13 +
...aven__net_java_dev_jets3t_jets3t_0_7_1.xml | 13 +
.../Maven__net_jpountz_lz4_lz4_1_3_0.xml | 13 +
.../Maven__net_razorvine_pyrolite_4_4.xml | 13 +
.../Maven__net_sf_opencsv_opencsv_2_3.xml | 13 +
.../Maven__net_sf_py4j_py4j_0_8_2_1.xml | 13 +
.../libraries/Maven__org_antlr_ST4_4_0_4.xml | 13 +
.../Maven__org_antlr_antlr_runtime_3_4.xml | 13 +
.../Maven__org_antlr_stringtemplate_3_2_1.xml | 13 +
.../Maven__org_apache_avro_avro_1_7_7.xml | 13 +
.../Maven__org_apache_avro_avro_ipc_1_7_7.xml | 13 +
...__org_apache_avro_avro_ipc_tests_1_7_7.xml | 13 +
..._apache_avro_avro_mapred_hadoop2_1_7_7.xml | 13 +
...lcite_calcite_avatica_1_2_0_incubating.xml | 13 +
..._calcite_calcite_core_1_2_0_incubating.xml | 13 +
...alcite_calcite_linq4j_1_2_0_incubating.xml | 13 +
..._apache_commons_commons_compress_1_4_1.xml | 13 +
...org_apache_commons_commons_lang3_3_3_2.xml | 13 +
...org_apache_commons_commons_math3_3_4_1.xml | 13 +
...urator_curator_client_2_1_0_incubating.xml | 13 +
...apache_curator_curator_framework_2_4_0.xml | 13 +
...g_apache_curator_curator_recipes_2_4_0.xml | 13 +
...aven__org_apache_derby_derby_10_10_2_0.xml | 13 +
...e_directory_api_api_asn1_api_1_0_0_M20.xml | 13 +
...pache_directory_api_api_util_1_0_0_M20.xml | 13 +
...rectory_server_apacheds_i18n_2_0_0_M15.xml | 13 +
...rver_apacheds_kerberos_codec_2_0_0_M15.xml | 13 +
...apache_hadoop_hadoop_annotations_2_6_4.xml | 13 +
...n__org_apache_hadoop_hadoop_auth_2_6_4.xml | 13 +
..._org_apache_hadoop_hadoop_client_2_6_4.xml | 13 +
..._org_apache_hadoop_hadoop_common_2_6_4.xml | 13 +
...n__org_apache_hadoop_hadoop_hdfs_2_6_4.xml | 13 +
...doop_hadoop_mapreduce_client_app_2_6_4.xml | 13 +
...p_hadoop_mapreduce_client_common_2_6_4.xml | 13 +
...oop_hadoop_mapreduce_client_core_2_6_4.xml | 13 +
...adoop_mapreduce_client_jobclient_2_6_4.xml | 13 +
..._hadoop_mapreduce_client_shuffle_2_6_4.xml | 13 +
...rg_apache_hadoop_hadoop_yarn_api_2_6_4.xml | 13 +
...apache_hadoop_hadoop_yarn_client_2_6_4.xml | 13 +
...apache_hadoop_hadoop_yarn_common_2_6_4.xml | 13 +
...hadoop_hadoop_yarn_server_common_2_6_4.xml | 13 +
...apache_httpcomponents_httpclient_4_3_2.xml | 13 +
...g_apache_httpcomponents_httpcore_4_3_1.xml | 13 +
.../Maven__org_apache_ivy_ivy_2_4_0.xml | 13 +
...n__org_apache_kafka_kafka_2_10_0_8_2_1.xml | 13 +
...org_apache_kafka_kafka_clients_0_8_2_1.xml | 13 +
...che_mesos_mesos_shaded_protobuf_0_21_1.xml | 13 +
...rg_apache_parquet_parquet_column_1_7_0.xml | 13 +
...rg_apache_parquet_parquet_common_1_7_0.xml | 13 +
..._apache_parquet_parquet_encoding_1_7_0.xml | 13 +
...arquet_parquet_format_2_3_0_incubating.xml | 13 +
...apache_parquet_parquet_generator_1_7_0.xml | 13 +
...rg_apache_parquet_parquet_hadoop_1_7_0.xml | 13 +
...g_apache_parquet_parquet_jackson_1_7_0.xml | 13 +
...apache_spark_spark_catalyst_2_10_1_5_1.xml | 13 +
...org_apache_spark_spark_core_2_10_1_5_1.xml | 13 +
...org_apache_spark_spark_hive_2_10_1_5_1.xml | 13 +
...apache_spark_spark_launcher_2_10_1_5_1.xml | 13 +
..._spark_spark_network_common_2_10_1_5_1.xml | 13 +
...spark_spark_network_shuffle_2_10_1_5_1.xml | 13 +
..._org_apache_spark_spark_sql_2_10_1_5_1.xml | 13 +
...pache_spark_spark_streaming_2_10_1_5_1.xml | 13 +
...spark_spark_streaming_kafka_2_10_1_5_1.xml | 13 +
...g_apache_spark_spark_unsafe_2_10_1_5_1.xml | 13 +
...aven__org_apache_thrift_libfb303_0_9_2.xml | 13 +
...ven__org_apache_thrift_libthrift_0_9_2.xml | 13 +
...__org_apache_zookeeper_zookeeper_3_4_5.xml | 13 +
...__org_codehaus_groovy_groovy_all_2_1_6.xml | 13 +
...dehaus_jackson_jackson_core_asl_1_9_13.xml | 13 +
..._codehaus_jackson_jackson_jaxrs_1_9_13.xml | 13 +
...haus_jackson_jackson_mapper_asl_1_9_13.xml | 13 +
...org_codehaus_jackson_jackson_xc_1_9_13.xml | 13 +
...codehaus_janino_commons_compiler_2_7_6.xml | 13 +
...aven__org_codehaus_janino_janino_2_7_8.xml | 13 +
..._datanucleus_datanucleus_api_jdo_3_2_6.xml | 13 +
...rg_datanucleus_datanucleus_core_3_2_10.xml | 13 +
...rg_datanucleus_datanucleus_rdbms_3_2_9.xml | 13 +
...rbit_javax_servlet_3_0_0_v201112011016.xml | 13 +
...sesource_leveldbjni_leveldbjni_all_1_8.xml | 13 +
.../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 +
.../Maven__org_htrace_htrace_core_3_0_4.xml | 13 +
.../Maven__org_iq80_snappy_snappy_0_2.xml | 13 +
.../Maven__org_jodd_jodd_core_3_5_2.xml | 13 +
...ven__org_json4s_json4s_ast_2_10_3_2_10.xml | 13 +
...en__org_json4s_json4s_core_2_10_3_2_10.xml | 13 +
..._org_json4s_json4s_jackson_2_10_3_2_10.xml | 13 +
.../Maven__org_json_json_20090211.xml | 13 +
...n__org_mortbay_jetty_jetty_util_6_1_26.xml | 13 +
.../Maven__org_objenesis_objenesis_1_2.xml | 13 +
..._org_roaringbitmap_RoaringBitmap_0_4_5.xml | 13 +
...__org_scala_lang_scala_compiler_2_10_0.xml | 13 +
...n__org_scala_lang_scala_library_2_10_4.xml | 13 +
...n__org_scala_lang_scala_reflect_2_10_4.xml | 13 +
.../Maven__org_scala_lang_scalap_2_10_0.xml | 13 +
...Maven__org_slf4j_jcl_over_slf4j_1_7_10.xml | 13 +
.../Maven__org_slf4j_jul_to_slf4j_1_7_10.xml | 13 +
.../Maven__org_slf4j_slf4j_api_1_7_10.xml | 13 +
.../Maven__org_slf4j_slf4j_log4j12_1_7_10.xml | 13 +
...ark_project_hive_hive_exec_1_2_1_spark.xml | 13 +
...roject_hive_hive_metastore_1_2_1_spark.xml | 13 +
...__org_spark_project_spark_unused_1_0_0.xml | 13 +
...rg_tachyonproject_tachyon_client_0_7_1.xml | 13 +
...hyonproject_tachyon_underfs_hdfs_0_7_1.xml | 13 +
...yonproject_tachyon_underfs_local_0_7_1.xml | 13 +
.idea/libraries/Maven__org_tukaani_xz_1_0.xml | 13 +
...uncommons_maths_uncommons_maths_1_2_2a.xml | 13 +
..._org_xerial_snappy_snappy_java_1_1_1_7.xml | 13 +
.idea/libraries/Maven__oro_oro_2_0_8.xml | 13 +
.../libraries/Maven__stax_stax_api_1_0_1.xml | 13 +
.../Maven__xerces_xercesImpl_2_9_1.xml | 13 +
.../Maven__xml_apis_xml_apis_1_3_04.xml | 13 +
.idea/libraries/Maven__xmlenc_xmlenc_0_52.xml | 13 +
.idea/workspace.xml | 202 ++++++++++++-
UserActionAnalyzePlatform.iml | 182 ++++++++++-
src/main/java/cn/edu/hust/util/DateUtils.java | 284 +++++++++++-------
.../java/cn/edu/hust/util/NumberUtils.java | 41 ++-
.../java/cn/edu/hust/util/ParamUtils.java | 80 +++--
.../java/cn/edu/hust/util/StringUtils.java | 212 +++++++------
.../java/cn/edu/hust/util/ValidUtils.java | 232 +++++++++-----
src/main/resources/conf.properties | 19 +-
.../cn/edu/hust/utils/ParamUtilsTest.java | 44 ++-
188 files changed, 3261 insertions(+), 347 deletions(-)
create mode 100644 .idea/jarRepositories.xml
create mode 100644 .idea/libraries/Maven__antlr_antlr_2_7_7.xml
create mode 100644 .idea/libraries/Maven__asm_asm_3_1.xml
create mode 100644 .idea/libraries/Maven__com_101tec_zkclient_0_3.xml
create mode 100644 .idea/libraries/Maven__com_alibaba_fastjson_1_1_41.xml
create mode 100644 .idea/libraries/Maven__com_clearspring_analytics_stream_2_7_0.xml
create mode 100644 .idea/libraries/Maven__com_esotericsoftware_kryo_kryo_2_21.xml
create mode 100644 .idea/libraries/Maven__com_esotericsoftware_minlog_minlog_1_2.xml
create mode 100644 .idea/libraries/Maven__com_esotericsoftware_reflectasm_reflectasm_shaded_1_07.xml
create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_3.xml
create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_3.xml
create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml
create mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_scala_2_10_2_4_4.xml
create mode 100644 .idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
create mode 100644 .idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
create mode 100644 .idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
create mode 100644 .idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml
create mode 100644 .idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_3_2.xml
create mode 100644 .idea/libraries/Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml
create mode 100644 .idea/libraries/Maven__com_ning_compress_lzf_1_0_3.xml
create mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml
create mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml
create mode 100644 .idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml
create mode 100644 .idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_6.xml
create mode 100644 .idea/libraries/Maven__com_twitter_chill_2_10_0_5_0.xml
create mode 100644 .idea/libraries/Maven__com_twitter_chill_java_0_5_0.xml
create mode 100644 .idea/libraries/Maven__com_twitter_parquet_hadoop_bundle_1_6_0.xml
create mode 100644 .idea/libraries/Maven__com_typesafe_akka_akka_actor_2_10_2_3_11.xml
create mode 100644 .idea/libraries/Maven__com_typesafe_akka_akka_remote_2_10_2_3_11.xml
create mode 100644 .idea/libraries/Maven__com_typesafe_akka_akka_slf4j_2_10_2_3_11.xml
create mode 100644 .idea/libraries/Maven__com_typesafe_config_1_2_1.xml
create mode 100644 .idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml
create mode 100644 .idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml
create mode 100644 .idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml
create mode 100644 .idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
create mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
create mode 100644 .idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
create mode 100644 .idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
create mode 100644 .idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml
create mode 100644 .idea/libraries/Maven__commons_digester_commons_digester_1_8.xml
create mode 100644 .idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
create mode 100644 .idea/libraries/Maven__commons_io_commons_io_2_4.xml
create mode 100644 .idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
create mode 100644 .idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
create mode 100644 .idea/libraries/Maven__commons_net_commons_net_2_2.xml
create mode 100644 .idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml
create mode 100644 .idea/libraries/Maven__io_dropwizard_metrics_metrics_core_3_1_2.xml
create mode 100644 .idea/libraries/Maven__io_dropwizard_metrics_metrics_graphite_3_1_2.xml
create mode 100644 .idea/libraries/Maven__io_dropwizard_metrics_metrics_json_3_1_2.xml
create mode 100644 .idea/libraries/Maven__io_dropwizard_metrics_metrics_jvm_3_1_2.xml
create mode 100644 .idea/libraries/Maven__io_netty_netty_3_8_0_Final.xml
create mode 100644 .idea/libraries/Maven__io_netty_netty_all_4_0_29_Final.xml
create mode 100644 .idea/libraries/Maven__javax_activation_activation_1_1.xml
create mode 100644 .idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml
create mode 100644 .idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
create mode 100644 .idea/libraries/Maven__javax_transaction_jta_1_1.xml
create mode 100644 .idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml
create mode 100644 .idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
create mode 100644 .idea/libraries/Maven__javolution_javolution_5_5_1.xml
create mode 100644 .idea/libraries/Maven__jline_jline_2_12.xml
create mode 100644 .idea/libraries/Maven__joda_time_joda_time_2_5.xml
create mode 100644 .idea/libraries/Maven__junit_junit_4_13_2.xml
create mode 100644 .idea/libraries/Maven__log4j_apache_log4j_extras_1_2_17.xml
create mode 100644 .idea/libraries/Maven__log4j_log4j_1_2_17.xml
create mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml
create mode 100644 .idea/libraries/Maven__net_hydromatic_eigenbase_properties_1_1_5.xml
create mode 100644 .idea/libraries/Maven__net_java_dev_jets3t_jets3t_0_7_1.xml
create mode 100644 .idea/libraries/Maven__net_jpountz_lz4_lz4_1_3_0.xml
create mode 100644 .idea/libraries/Maven__net_razorvine_pyrolite_4_4.xml
create mode 100644 .idea/libraries/Maven__net_sf_opencsv_opencsv_2_3.xml
create mode 100644 .idea/libraries/Maven__net_sf_py4j_py4j_0_8_2_1.xml
create mode 100644 .idea/libraries/Maven__org_antlr_ST4_4_0_4.xml
create mode 100644 .idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
create mode 100644 .idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_avro_avro_1_7_7.xml
create mode 100644 .idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_7.xml
create mode 100644 .idea/libraries/Maven__org_apache_avro_avro_ipc_tests_1_7_7.xml
create mode 100644 .idea/libraries/Maven__org_apache_avro_avro_mapred_hadoop2_1_7_7.xml
create mode 100644 .idea/libraries/Maven__org_apache_calcite_calcite_avatica_1_2_0_incubating.xml
create mode 100644 .idea/libraries/Maven__org_apache_calcite_calcite_core_1_2_0_incubating.xml
create mode 100644 .idea/libraries/Maven__org_apache_calcite_calcite_linq4j_1_2_0_incubating.xml
create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
create mode 100644 .idea/libraries/Maven__org_apache_commons_commons_math3_3_4_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_curator_curator_client_2_1_0_incubating.xml
create mode 100644 .idea/libraries/Maven__org_apache_curator_curator_framework_2_4_0.xml
create mode 100644 .idea/libraries/Maven__org_apache_curator_curator_recipes_2_4_0.xml
create mode 100644 .idea/libraries/Maven__org_apache_derby_derby_10_10_2_0.xml
create mode 100644 .idea/libraries/Maven__org_apache_directory_api_api_asn1_api_1_0_0_M20.xml
create mode 100644 .idea/libraries/Maven__org_apache_directory_api_api_util_1_0_0_M20.xml
create mode 100644 .idea/libraries/Maven__org_apache_directory_server_apacheds_i18n_2_0_0_M15.xml
create mode 100644 .idea/libraries/Maven__org_apache_directory_server_apacheds_kerberos_codec_2_0_0_M15.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_client_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_app_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_common_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_core_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_jobclient_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_shuffle_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_api_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_client_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_common_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_server_common_2_6_4.xml
create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_2.xml
create mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_ivy_ivy_2_4_0.xml
create mode 100644 .idea/libraries/Maven__org_apache_kafka_kafka_2_10_0_8_2_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_kafka_kafka_clients_0_8_2_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_mesos_mesos_shaded_protobuf_0_21_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_column_1_7_0.xml
create mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_common_1_7_0.xml
create mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_encoding_1_7_0.xml
create mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_format_2_3_0_incubating.xml
create mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_generator_1_7_0.xml
create mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_hadoop_1_7_0.xml
create mode 100644 .idea/libraries/Maven__org_apache_parquet_parquet_jackson_1_7_0.xml
create mode 100644 .idea/libraries/Maven__org_apache_spark_spark_catalyst_2_10_1_5_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_spark_spark_core_2_10_1_5_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_spark_spark_hive_2_10_1_5_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_spark_spark_launcher_2_10_1_5_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_spark_spark_network_common_2_10_1_5_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_spark_spark_network_shuffle_2_10_1_5_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_spark_spark_sql_2_10_1_5_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_spark_spark_streaming_2_10_1_5_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_spark_spark_streaming_kafka_2_10_1_5_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_spark_spark_unsafe_2_10_1_5_1.xml
create mode 100644 .idea/libraries/Maven__org_apache_thrift_libfb303_0_9_2.xml
create mode 100644 .idea/libraries/Maven__org_apache_thrift_libthrift_0_9_2.xml
create mode 100644 .idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_5.xml
create mode 100644 .idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_1_6.xml
create mode 100644 .idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml
create mode 100644 .idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_9_13.xml
create mode 100644 .idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml
create mode 100644 .idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_9_13.xml
create mode 100644 .idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml
create mode 100644 .idea/libraries/Maven__org_codehaus_janino_janino_2_7_8.xml
create mode 100644 .idea/libraries/Maven__org_datanucleus_datanucleus_api_jdo_3_2_6.xml
create mode 100644 .idea/libraries/Maven__org_datanucleus_datanucleus_core_3_2_10.xml
create mode 100644 .idea/libraries/Maven__org_datanucleus_datanucleus_rdbms_3_2_9.xml
create mode 100644 .idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml
create mode 100644 .idea/libraries/Maven__org_fusesource_leveldbjni_leveldbjni_all_1_8.xml
create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
create mode 100644 .idea/libraries/Maven__org_htrace_htrace_core_3_0_4.xml
create mode 100644 .idea/libraries/Maven__org_iq80_snappy_snappy_0_2.xml
create mode 100644 .idea/libraries/Maven__org_jodd_jodd_core_3_5_2.xml
create mode 100644 .idea/libraries/Maven__org_json4s_json4s_ast_2_10_3_2_10.xml
create mode 100644 .idea/libraries/Maven__org_json4s_json4s_core_2_10_3_2_10.xml
create mode 100644 .idea/libraries/Maven__org_json4s_json4s_jackson_2_10_3_2_10.xml
create mode 100644 .idea/libraries/Maven__org_json_json_20090211.xml
create mode 100644 .idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml
create mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_1_2.xml
create mode 100644 .idea/libraries/Maven__org_roaringbitmap_RoaringBitmap_0_4_5.xml
create mode 100644 .idea/libraries/Maven__org_scala_lang_scala_compiler_2_10_0.xml
create mode 100644 .idea/libraries/Maven__org_scala_lang_scala_library_2_10_4.xml
create mode 100644 .idea/libraries/Maven__org_scala_lang_scala_reflect_2_10_4.xml
create mode 100644 .idea/libraries/Maven__org_scala_lang_scalap_2_10_0.xml
create mode 100644 .idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_10.xml
create mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_10.xml
create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_10.xml
create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_10.xml
create mode 100644 .idea/libraries/Maven__org_spark_project_hive_hive_exec_1_2_1_spark.xml
create mode 100644 .idea/libraries/Maven__org_spark_project_hive_hive_metastore_1_2_1_spark.xml
create mode 100644 .idea/libraries/Maven__org_spark_project_spark_unused_1_0_0.xml
create mode 100644 .idea/libraries/Maven__org_tachyonproject_tachyon_client_0_7_1.xml
create mode 100644 .idea/libraries/Maven__org_tachyonproject_tachyon_underfs_hdfs_0_7_1.xml
create mode 100644 .idea/libraries/Maven__org_tachyonproject_tachyon_underfs_local_0_7_1.xml
create mode 100644 .idea/libraries/Maven__org_tukaani_xz_1_0.xml
create mode 100644 .idea/libraries/Maven__org_uncommons_maths_uncommons_maths_1_2_2a.xml
create mode 100644 .idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_1_7.xml
create mode 100644 .idea/libraries/Maven__oro_oro_2_0_8.xml
create mode 100644 .idea/libraries/Maven__stax_stax_api_1_0_1.xml
create mode 100644 .idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
create mode 100644 .idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml
create mode 100644 .idea/libraries/Maven__xmlenc_xmlenc_0_52.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index dcba7cb..6e7df1b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -10,7 +10,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index b26911b..af673e7 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,5 +2,7 @@
+
+
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..712ab9d
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
new file mode 100644
index 0000000..b8d93d8
--- /dev/null
+++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__asm_asm_3_1.xml b/.idea/libraries/Maven__asm_asm_3_1.xml
new file mode 100644
index 0000000..3386f10
--- /dev/null
+++ b/.idea/libraries/Maven__asm_asm_3_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_101tec_zkclient_0_3.xml b/.idea/libraries/Maven__com_101tec_zkclient_0_3.xml
new file mode 100644
index 0000000..f202d28
--- /dev/null
+++ b/.idea/libraries/Maven__com_101tec_zkclient_0_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_1_41.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_1_41.xml
new file mode 100644
index 0000000..08dbed5
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_1_41.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_clearspring_analytics_stream_2_7_0.xml b/.idea/libraries/Maven__com_clearspring_analytics_stream_2_7_0.xml
new file mode 100644
index 0000000..1980df6
--- /dev/null
+++ b/.idea/libraries/Maven__com_clearspring_analytics_stream_2_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_esotericsoftware_kryo_kryo_2_21.xml b/.idea/libraries/Maven__com_esotericsoftware_kryo_kryo_2_21.xml
new file mode 100644
index 0000000..517684f
--- /dev/null
+++ b/.idea/libraries/Maven__com_esotericsoftware_kryo_kryo_2_21.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_esotericsoftware_minlog_minlog_1_2.xml b/.idea/libraries/Maven__com_esotericsoftware_minlog_minlog_1_2.xml
new file mode 100644
index 0000000..f926eec
--- /dev/null
+++ b/.idea/libraries/Maven__com_esotericsoftware_minlog_minlog_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_esotericsoftware_reflectasm_reflectasm_shaded_1_07.xml b/.idea/libraries/Maven__com_esotericsoftware_reflectasm_reflectasm_shaded_1_07.xml
new file mode 100644
index 0000000..39b43af
--- /dev/null
+++ b/.idea/libraries/Maven__com_esotericsoftware_reflectasm_reflectasm_shaded_1_07.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_3.xml
new file mode 100644
index 0000000..42a8d5b
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_3.xml
new file mode 100644
index 0000000..fc3ea3f
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml
new file mode 100644
index 0000000..567d7e5
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_scala_2_10_2_4_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_scala_2_10_2_4_4.xml
new file mode 100644
index 0000000..29ba609
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_scala_2_10_2_4_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
new file mode 100644
index 0000000..0e66824
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
new file mode 100644
index 0000000..4533c1b
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml b/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
new file mode 100644
index 0000000..b71e220
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_guava_guava_14_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml
new file mode 100644
index 0000000..c06d3a1
--- /dev/null
+++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_5_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_3_2.xml b/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_3_2.xml
new file mode 100644
index 0000000..061f3a1
--- /dev/null
+++ b/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_3_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml b/.idea/libraries/Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml
new file mode 100644
index 0000000..c24800a
--- /dev/null
+++ b/.idea/libraries/Maven__com_jolbox_bonecp_0_8_0_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_ning_compress_lzf_1_0_3.xml b/.idea/libraries/Maven__com_ning_compress_lzf_1_0_3.xml
new file mode 100644
index 0000000..322a3c2
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_compress_lzf_1_0_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml
new file mode 100644
index 0000000..4c22f08
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml
new file mode 100644
index 0000000..abd3e5d
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml
new file mode 100644
index 0000000..717467f
--- /dev/null
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_6.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_6.xml
new file mode 100644
index 0000000..465a468
--- /dev/null
+++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_twitter_chill_2_10_0_5_0.xml b/.idea/libraries/Maven__com_twitter_chill_2_10_0_5_0.xml
new file mode 100644
index 0000000..08c3ced
--- /dev/null
+++ b/.idea/libraries/Maven__com_twitter_chill_2_10_0_5_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_twitter_chill_java_0_5_0.xml b/.idea/libraries/Maven__com_twitter_chill_java_0_5_0.xml
new file mode 100644
index 0000000..2f68aba
--- /dev/null
+++ b/.idea/libraries/Maven__com_twitter_chill_java_0_5_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_twitter_parquet_hadoop_bundle_1_6_0.xml b/.idea/libraries/Maven__com_twitter_parquet_hadoop_bundle_1_6_0.xml
new file mode 100644
index 0000000..7ec1c2f
--- /dev/null
+++ b/.idea/libraries/Maven__com_twitter_parquet_hadoop_bundle_1_6_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_typesafe_akka_akka_actor_2_10_2_3_11.xml b/.idea/libraries/Maven__com_typesafe_akka_akka_actor_2_10_2_3_11.xml
new file mode 100644
index 0000000..7036476
--- /dev/null
+++ b/.idea/libraries/Maven__com_typesafe_akka_akka_actor_2_10_2_3_11.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_typesafe_akka_akka_remote_2_10_2_3_11.xml b/.idea/libraries/Maven__com_typesafe_akka_akka_remote_2_10_2_3_11.xml
new file mode 100644
index 0000000..dc47d0c
--- /dev/null
+++ b/.idea/libraries/Maven__com_typesafe_akka_akka_remote_2_10_2_3_11.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_typesafe_akka_akka_slf4j_2_10_2_3_11.xml b/.idea/libraries/Maven__com_typesafe_akka_akka_slf4j_2_10_2_3_11.xml
new file mode 100644
index 0000000..4e40647
--- /dev/null
+++ b/.idea/libraries/Maven__com_typesafe_akka_akka_slf4j_2_10_2_3_11.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_typesafe_config_1_2_1.xml b/.idea/libraries/Maven__com_typesafe_config_1_2_1.xml
new file mode 100644
index 0000000..cc78721
--- /dev/null
+++ b/.idea/libraries/Maven__com_typesafe_config_1_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml b/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml
new file mode 100644
index 0000000..fc159c5
--- /dev/null
+++ b/.idea/libraries/Maven__com_yammer_metrics_metrics_core_2_2_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml
new file mode 100644
index 0000000..1cb64ed
--- /dev/null
+++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml
new file mode 100644
index 0000000..3fda2c0
--- /dev/null
+++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
new file mode 100644
index 0000000..cec2493
--- /dev/null
+++ b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
new file mode 100644
index 0000000..27424a1
--- /dev/null
+++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
new file mode 100644
index 0000000..13afda2
--- /dev/null
+++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
new file mode 100644
index 0000000..ae96781
--- /dev/null
+++ b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml
new file mode 100644
index 0000000..49c39ce
--- /dev/null
+++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml b/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml
new file mode 100644
index 0000000..49f1def
--- /dev/null
+++ b/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
new file mode 100644
index 0000000..66e6537
--- /dev/null
+++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
new file mode 100644
index 0000000..bc2aad0
--- /dev/null
+++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
new file mode 100644
index 0000000..5e8b8d3
--- /dev/null
+++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
new file mode 100644
index 0000000..01c7b8e
--- /dev/null
+++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_net_commons_net_2_2.xml b/.idea/libraries/Maven__commons_net_commons_net_2_2.xml
new file mode 100644
index 0000000..cdd400d
--- /dev/null
+++ b/.idea/libraries/Maven__commons_net_commons_net_2_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml
new file mode 100644
index 0000000..ab20721
--- /dev/null
+++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_core_3_1_2.xml b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_core_3_1_2.xml
new file mode 100644
index 0000000..e25f69c
--- /dev/null
+++ b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_core_3_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_graphite_3_1_2.xml b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_graphite_3_1_2.xml
new file mode 100644
index 0000000..fe7ca23
--- /dev/null
+++ b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_graphite_3_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_json_3_1_2.xml b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_json_3_1_2.xml
new file mode 100644
index 0000000..8b11059
--- /dev/null
+++ b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_json_3_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_dropwizard_metrics_metrics_jvm_3_1_2.xml b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_jvm_3_1_2.xml
new file mode 100644
index 0000000..32625f0
--- /dev/null
+++ b/.idea/libraries/Maven__io_dropwizard_metrics_metrics_jvm_3_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_3_8_0_Final.xml b/.idea/libraries/Maven__io_netty_netty_3_8_0_Final.xml
new file mode 100644
index 0000000..d77c5c9
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_3_8_0_Final.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__io_netty_netty_all_4_0_29_Final.xml b/.idea/libraries/Maven__io_netty_netty_all_4_0_29_Final.xml
new file mode 100644
index 0000000..eaf53f6
--- /dev/null
+++ b/.idea/libraries/Maven__io_netty_netty_all_4_0_29_Final.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml
new file mode 100644
index 0000000..180d587
--- /dev/null
+++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml b/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml
new file mode 100644
index 0000000..ee6078c
--- /dev/null
+++ b/.idea/libraries/Maven__javax_jdo_jdo_api_3_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml b/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
new file mode 100644
index 0000000..679e09a
--- /dev/null
+++ b/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_transaction_jta_1_1.xml b/.idea/libraries/Maven__javax_transaction_jta_1_1.xml
new file mode 100644
index 0000000..3047243
--- /dev/null
+++ b/.idea/libraries/Maven__javax_transaction_jta_1_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml
new file mode 100644
index 0000000..a3054d2
--- /dev/null
+++ b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_2_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
new file mode 100644
index 0000000..2a4dd7a
--- /dev/null
+++ b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__javolution_javolution_5_5_1.xml b/.idea/libraries/Maven__javolution_javolution_5_5_1.xml
new file mode 100644
index 0000000..374563d
--- /dev/null
+++ b/.idea/libraries/Maven__javolution_javolution_5_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__jline_jline_2_12.xml b/.idea/libraries/Maven__jline_jline_2_12.xml
new file mode 100644
index 0000000..eaff5ff
--- /dev/null
+++ b/.idea/libraries/Maven__jline_jline_2_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_5.xml b/.idea/libraries/Maven__joda_time_joda_time_2_5.xml
new file mode 100644
index 0000000..7eb240e
--- /dev/null
+++ b/.idea/libraries/Maven__joda_time_joda_time_2_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_13_2.xml b/.idea/libraries/Maven__junit_junit_4_13_2.xml
new file mode 100644
index 0000000..606c352
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_13_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__log4j_apache_log4j_extras_1_2_17.xml b/.idea/libraries/Maven__log4j_apache_log4j_extras_1_2_17.xml
new file mode 100644
index 0000000..170743e
--- /dev/null
+++ b/.idea/libraries/Maven__log4j_apache_log4j_extras_1_2_17.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
new file mode 100644
index 0000000..e383c1b
--- /dev/null
+++ b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml
new file mode 100644
index 0000000..2b062b5
--- /dev/null
+++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_hydromatic_eigenbase_properties_1_1_5.xml b/.idea/libraries/Maven__net_hydromatic_eigenbase_properties_1_1_5.xml
new file mode 100644
index 0000000..388b7eb
--- /dev/null
+++ b/.idea/libraries/Maven__net_hydromatic_eigenbase_properties_1_1_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_java_dev_jets3t_jets3t_0_7_1.xml b/.idea/libraries/Maven__net_java_dev_jets3t_jets3t_0_7_1.xml
new file mode 100644
index 0000000..a301a5b
--- /dev/null
+++ b/.idea/libraries/Maven__net_java_dev_jets3t_jets3t_0_7_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_jpountz_lz4_lz4_1_3_0.xml b/.idea/libraries/Maven__net_jpountz_lz4_lz4_1_3_0.xml
new file mode 100644
index 0000000..7e9fceb
--- /dev/null
+++ b/.idea/libraries/Maven__net_jpountz_lz4_lz4_1_3_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_razorvine_pyrolite_4_4.xml b/.idea/libraries/Maven__net_razorvine_pyrolite_4_4.xml
new file mode 100644
index 0000000..84ff505
--- /dev/null
+++ b/.idea/libraries/Maven__net_razorvine_pyrolite_4_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_3.xml b/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_3.xml
new file mode 100644
index 0000000..6abe098
--- /dev/null
+++ b/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_py4j_py4j_0_8_2_1.xml b/.idea/libraries/Maven__net_sf_py4j_py4j_0_8_2_1.xml
new file mode 100644
index 0000000..b771ebc
--- /dev/null
+++ b/.idea/libraries/Maven__net_sf_py4j_py4j_0_8_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_ST4_4_0_4.xml b/.idea/libraries/Maven__org_antlr_ST4_4_0_4.xml
new file mode 100644
index 0000000..6633680
--- /dev/null
+++ b/.idea/libraries/Maven__org_antlr_ST4_4_0_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
new file mode 100644
index 0000000..fd0779a
--- /dev/null
+++ b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
new file mode 100644
index 0000000..6998bac
--- /dev/null
+++ b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_1_7_7.xml b/.idea/libraries/Maven__org_apache_avro_avro_1_7_7.xml
new file mode 100644
index 0000000..1cef8eb
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_avro_avro_1_7_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_7.xml b/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_7.xml
new file mode 100644
index 0000000..2d2e5e6
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_avro_avro_ipc_1_7_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_ipc_tests_1_7_7.xml b/.idea/libraries/Maven__org_apache_avro_avro_ipc_tests_1_7_7.xml
new file mode 100644
index 0000000..077445c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_avro_avro_ipc_tests_1_7_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_avro_avro_mapred_hadoop2_1_7_7.xml b/.idea/libraries/Maven__org_apache_avro_avro_mapred_hadoop2_1_7_7.xml
new file mode 100644
index 0000000..0abd56e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_avro_avro_mapred_hadoop2_1_7_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_calcite_calcite_avatica_1_2_0_incubating.xml b/.idea/libraries/Maven__org_apache_calcite_calcite_avatica_1_2_0_incubating.xml
new file mode 100644
index 0000000..21ff29c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_calcite_calcite_avatica_1_2_0_incubating.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_calcite_calcite_core_1_2_0_incubating.xml b/.idea/libraries/Maven__org_apache_calcite_calcite_core_1_2_0_incubating.xml
new file mode 100644
index 0000000..99d56fa
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_calcite_calcite_core_1_2_0_incubating.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_calcite_calcite_linq4j_1_2_0_incubating.xml b/.idea/libraries/Maven__org_apache_calcite_calcite_linq4j_1_2_0_incubating.xml
new file mode 100644
index 0000000..79cca19
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_calcite_calcite_linq4j_1_2_0_incubating.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
new file mode 100644
index 0000000..190209e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
new file mode 100644
index 0000000..83cba3e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_4_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_4_1.xml
new file mode 100644
index 0000000..19bf20f
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_curator_curator_client_2_1_0_incubating.xml b/.idea/libraries/Maven__org_apache_curator_curator_client_2_1_0_incubating.xml
new file mode 100644
index 0000000..f32bd7d
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_curator_curator_client_2_1_0_incubating.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_curator_curator_framework_2_4_0.xml b/.idea/libraries/Maven__org_apache_curator_curator_framework_2_4_0.xml
new file mode 100644
index 0000000..26704ed
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_curator_curator_framework_2_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_curator_curator_recipes_2_4_0.xml b/.idea/libraries/Maven__org_apache_curator_curator_recipes_2_4_0.xml
new file mode 100644
index 0000000..a2a0cb9
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_curator_curator_recipes_2_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_derby_derby_10_10_2_0.xml b/.idea/libraries/Maven__org_apache_derby_derby_10_10_2_0.xml
new file mode 100644
index 0000000..c317510
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_derby_derby_10_10_2_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_directory_api_api_asn1_api_1_0_0_M20.xml b/.idea/libraries/Maven__org_apache_directory_api_api_asn1_api_1_0_0_M20.xml
new file mode 100644
index 0000000..bd5ac37
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_directory_api_api_asn1_api_1_0_0_M20.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_directory_api_api_util_1_0_0_M20.xml b/.idea/libraries/Maven__org_apache_directory_api_api_util_1_0_0_M20.xml
new file mode 100644
index 0000000..b3d86af
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_directory_api_api_util_1_0_0_M20.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_i18n_2_0_0_M15.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_i18n_2_0_0_M15.xml
new file mode 100644
index 0000000..7a73f45
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_i18n_2_0_0_M15.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_kerberos_codec_2_0_0_M15.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_kerberos_codec_2_0_0_M15.xml
new file mode 100644
index 0000000..5378216
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_kerberos_codec_2_0_0_M15.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_4.xml
new file mode 100644
index 0000000..1c70866
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_4.xml
new file mode 100644
index 0000000..bd259f5
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_client_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_client_2_6_4.xml
new file mode 100644
index 0000000..d878f24
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_client_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_4.xml
new file mode 100644
index 0000000..7fc38ff
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_4.xml
new file mode 100644
index 0000000..7e8e8d4
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_app_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_app_2_6_4.xml
new file mode 100644
index 0000000..f76a61b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_app_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_common_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_common_2_6_4.xml
new file mode 100644
index 0000000..505bf7b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_common_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_core_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_core_2_6_4.xml
new file mode 100644
index 0000000..c341de1
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_core_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_jobclient_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_jobclient_2_6_4.xml
new file mode 100644
index 0000000..8908c24
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_jobclient_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_shuffle_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_shuffle_2_6_4.xml
new file mode 100644
index 0000000..354c2e8
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_mapreduce_client_shuffle_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_api_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_api_2_6_4.xml
new file mode 100644
index 0000000..e39cdc3
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_api_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_client_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_client_2_6_4.xml
new file mode 100644
index 0000000..c489e2f
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_client_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_common_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_common_2_6_4.xml
new file mode 100644
index 0000000..a661d98
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_common_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_server_common_2_6_4.xml b/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_server_common_2_6_4.xml
new file mode 100644
index 0000000..d1b944c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_server_common_2_6_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_2.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_2.xml
new file mode 100644
index 0000000..08ee7c0
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_3_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml
new file mode 100644
index 0000000..877b5aa
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_3_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_ivy_ivy_2_4_0.xml b/.idea/libraries/Maven__org_apache_ivy_ivy_2_4_0.xml
new file mode 100644
index 0000000..0d13de2
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_ivy_ivy_2_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_kafka_kafka_2_10_0_8_2_1.xml b/.idea/libraries/Maven__org_apache_kafka_kafka_2_10_0_8_2_1.xml
new file mode 100644
index 0000000..b04d7b9
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_kafka_kafka_2_10_0_8_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_kafka_kafka_clients_0_8_2_1.xml b/.idea/libraries/Maven__org_apache_kafka_kafka_clients_0_8_2_1.xml
new file mode 100644
index 0000000..e902765
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_kafka_kafka_clients_0_8_2_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_mesos_mesos_shaded_protobuf_0_21_1.xml b/.idea/libraries/Maven__org_apache_mesos_mesos_shaded_protobuf_0_21_1.xml
new file mode 100644
index 0000000..bad994a
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_mesos_mesos_shaded_protobuf_0_21_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_column_1_7_0.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_column_1_7_0.xml
new file mode 100644
index 0000000..9d9f5ad
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_parquet_parquet_column_1_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_common_1_7_0.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_common_1_7_0.xml
new file mode 100644
index 0000000..8602c2d
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_parquet_parquet_common_1_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_encoding_1_7_0.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_encoding_1_7_0.xml
new file mode 100644
index 0000000..7d52648
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_parquet_parquet_encoding_1_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_format_2_3_0_incubating.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_format_2_3_0_incubating.xml
new file mode 100644
index 0000000..1261e56
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_parquet_parquet_format_2_3_0_incubating.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_generator_1_7_0.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_generator_1_7_0.xml
new file mode 100644
index 0000000..943cb6d
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_parquet_parquet_generator_1_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_hadoop_1_7_0.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_hadoop_1_7_0.xml
new file mode 100644
index 0000000..20a7e2e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_parquet_parquet_hadoop_1_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_parquet_parquet_jackson_1_7_0.xml b/.idea/libraries/Maven__org_apache_parquet_parquet_jackson_1_7_0.xml
new file mode 100644
index 0000000..31d6a08
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_parquet_parquet_jackson_1_7_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_catalyst_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_catalyst_2_10_1_5_1.xml
new file mode 100644
index 0000000..b157e29
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_spark_spark_catalyst_2_10_1_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_core_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_core_2_10_1_5_1.xml
new file mode 100644
index 0000000..f078dfd
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_spark_spark_core_2_10_1_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_hive_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_hive_2_10_1_5_1.xml
new file mode 100644
index 0000000..d8dc75e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_spark_spark_hive_2_10_1_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_launcher_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_launcher_2_10_1_5_1.xml
new file mode 100644
index 0000000..0c6463e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_spark_spark_launcher_2_10_1_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_network_common_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_network_common_2_10_1_5_1.xml
new file mode 100644
index 0000000..15537c9
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_spark_spark_network_common_2_10_1_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_network_shuffle_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_network_shuffle_2_10_1_5_1.xml
new file mode 100644
index 0000000..c7748f6
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_spark_spark_network_shuffle_2_10_1_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_sql_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_sql_2_10_1_5_1.xml
new file mode 100644
index 0000000..05a746e
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_spark_spark_sql_2_10_1_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_streaming_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_streaming_2_10_1_5_1.xml
new file mode 100644
index 0000000..820272a
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_spark_spark_streaming_2_10_1_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_streaming_kafka_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_streaming_kafka_2_10_1_5_1.xml
new file mode 100644
index 0000000..786238b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_spark_spark_streaming_kafka_2_10_1_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_spark_spark_unsafe_2_10_1_5_1.xml b/.idea/libraries/Maven__org_apache_spark_spark_unsafe_2_10_1_5_1.xml
new file mode 100644
index 0000000..b60a3c0
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_spark_spark_unsafe_2_10_1_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_thrift_libfb303_0_9_2.xml b/.idea/libraries/Maven__org_apache_thrift_libfb303_0_9_2.xml
new file mode 100644
index 0000000..9f31c6b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_thrift_libfb303_0_9_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_thrift_libthrift_0_9_2.xml b/.idea/libraries/Maven__org_apache_thrift_libthrift_0_9_2.xml
new file mode 100644
index 0000000..ac1ee5b
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_thrift_libthrift_0_9_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_5.xml b/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_5.xml
new file mode 100644
index 0000000..3019b0a
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_zookeeper_zookeeper_3_4_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_1_6.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_1_6.xml
new file mode 100644
index 0000000..8b11cf4
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_all_2_1_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml
new file mode 100644
index 0000000..98eb549
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_9_13.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_9_13.xml
new file mode 100644
index 0000000..43fc6ed
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_9_13.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml
new file mode 100644
index 0000000..77f3bad
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_9_13.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_9_13.xml
new file mode 100644
index 0000000..107a62f
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_9_13.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml
new file mode 100644
index 0000000..2ab4145
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_8.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_8.xml
new file mode 100644
index 0000000..0774e41
--- /dev/null
+++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_datanucleus_datanucleus_api_jdo_3_2_6.xml b/.idea/libraries/Maven__org_datanucleus_datanucleus_api_jdo_3_2_6.xml
new file mode 100644
index 0000000..bf61e91
--- /dev/null
+++ b/.idea/libraries/Maven__org_datanucleus_datanucleus_api_jdo_3_2_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_datanucleus_datanucleus_core_3_2_10.xml b/.idea/libraries/Maven__org_datanucleus_datanucleus_core_3_2_10.xml
new file mode 100644
index 0000000..a2a6cdf
--- /dev/null
+++ b/.idea/libraries/Maven__org_datanucleus_datanucleus_core_3_2_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_datanucleus_datanucleus_rdbms_3_2_9.xml b/.idea/libraries/Maven__org_datanucleus_datanucleus_rdbms_3_2_9.xml
new file mode 100644
index 0000000..eb3ddf9
--- /dev/null
+++ b/.idea/libraries/Maven__org_datanucleus_datanucleus_rdbms_3_2_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml b/.idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml
new file mode 100644
index 0000000..7dc899a
--- /dev/null
+++ b/.idea/libraries/Maven__org_eclipse_jetty_orbit_javax_servlet_3_0_0_v201112011016.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_fusesource_leveldbjni_leveldbjni_all_1_8.xml b/.idea/libraries/Maven__org_fusesource_leveldbjni_leveldbjni_all_1_8.xml
new file mode 100644
index 0000000..4a829d2
--- /dev/null
+++ b/.idea/libraries/Maven__org_fusesource_leveldbjni_leveldbjni_all_1_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
new file mode 100644
index 0000000..f58bbc1
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_htrace_htrace_core_3_0_4.xml b/.idea/libraries/Maven__org_htrace_htrace_core_3_0_4.xml
new file mode 100644
index 0000000..db0f8c1
--- /dev/null
+++ b/.idea/libraries/Maven__org_htrace_htrace_core_3_0_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_iq80_snappy_snappy_0_2.xml b/.idea/libraries/Maven__org_iq80_snappy_snappy_0_2.xml
new file mode 100644
index 0000000..2a828ac
--- /dev/null
+++ b/.idea/libraries/Maven__org_iq80_snappy_snappy_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jodd_jodd_core_3_5_2.xml b/.idea/libraries/Maven__org_jodd_jodd_core_3_5_2.xml
new file mode 100644
index 0000000..825acad
--- /dev/null
+++ b/.idea/libraries/Maven__org_jodd_jodd_core_3_5_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_json4s_json4s_ast_2_10_3_2_10.xml b/.idea/libraries/Maven__org_json4s_json4s_ast_2_10_3_2_10.xml
new file mode 100644
index 0000000..d4b2d55
--- /dev/null
+++ b/.idea/libraries/Maven__org_json4s_json4s_ast_2_10_3_2_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_json4s_json4s_core_2_10_3_2_10.xml b/.idea/libraries/Maven__org_json4s_json4s_core_2_10_3_2_10.xml
new file mode 100644
index 0000000..d7ed1d0
--- /dev/null
+++ b/.idea/libraries/Maven__org_json4s_json4s_core_2_10_3_2_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_json4s_json4s_jackson_2_10_3_2_10.xml b/.idea/libraries/Maven__org_json4s_json4s_jackson_2_10_3_2_10.xml
new file mode 100644
index 0000000..518a4ef
--- /dev/null
+++ b/.idea/libraries/Maven__org_json4s_json4s_jackson_2_10_3_2_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_json_json_20090211.xml b/.idea/libraries/Maven__org_json_json_20090211.xml
new file mode 100644
index 0000000..e57dc0a
--- /dev/null
+++ b/.idea/libraries/Maven__org_json_json_20090211.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml b/.idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml
new file mode 100644
index 0000000..f6ec2b9
--- /dev/null
+++ b/.idea/libraries/Maven__org_mortbay_jetty_jetty_util_6_1_26.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml
new file mode 100644
index 0000000..74d2abc
--- /dev/null
+++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_roaringbitmap_RoaringBitmap_0_4_5.xml b/.idea/libraries/Maven__org_roaringbitmap_RoaringBitmap_0_4_5.xml
new file mode 100644
index 0000000..171c39e
--- /dev/null
+++ b/.idea/libraries/Maven__org_roaringbitmap_RoaringBitmap_0_4_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_scala_lang_scala_compiler_2_10_0.xml b/.idea/libraries/Maven__org_scala_lang_scala_compiler_2_10_0.xml
new file mode 100644
index 0000000..61fd00a
--- /dev/null
+++ b/.idea/libraries/Maven__org_scala_lang_scala_compiler_2_10_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_scala_lang_scala_library_2_10_4.xml b/.idea/libraries/Maven__org_scala_lang_scala_library_2_10_4.xml
new file mode 100644
index 0000000..f159907
--- /dev/null
+++ b/.idea/libraries/Maven__org_scala_lang_scala_library_2_10_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_scala_lang_scala_reflect_2_10_4.xml b/.idea/libraries/Maven__org_scala_lang_scala_reflect_2_10_4.xml
new file mode 100644
index 0000000..7774384
--- /dev/null
+++ b/.idea/libraries/Maven__org_scala_lang_scala_reflect_2_10_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_scala_lang_scalap_2_10_0.xml b/.idea/libraries/Maven__org_scala_lang_scalap_2_10_0.xml
new file mode 100644
index 0000000..55c2916
--- /dev/null
+++ b/.idea/libraries/Maven__org_scala_lang_scalap_2_10_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_10.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_10.xml
new file mode 100644
index 0000000..5f42bd6
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_10.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_10.xml
new file mode 100644
index 0000000..941ba8b
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_10.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_10.xml
new file mode 100644
index 0000000..2b13f0f
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_10.xml b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_10.xml
new file mode 100644
index 0000000..fb9c8a4
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_10.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_spark_project_hive_hive_exec_1_2_1_spark.xml b/.idea/libraries/Maven__org_spark_project_hive_hive_exec_1_2_1_spark.xml
new file mode 100644
index 0000000..74a2215
--- /dev/null
+++ b/.idea/libraries/Maven__org_spark_project_hive_hive_exec_1_2_1_spark.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_spark_project_hive_hive_metastore_1_2_1_spark.xml b/.idea/libraries/Maven__org_spark_project_hive_hive_metastore_1_2_1_spark.xml
new file mode 100644
index 0000000..2c91222
--- /dev/null
+++ b/.idea/libraries/Maven__org_spark_project_hive_hive_metastore_1_2_1_spark.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_spark_project_spark_unused_1_0_0.xml b/.idea/libraries/Maven__org_spark_project_spark_unused_1_0_0.xml
new file mode 100644
index 0000000..9fbe28c
--- /dev/null
+++ b/.idea/libraries/Maven__org_spark_project_spark_unused_1_0_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_tachyonproject_tachyon_client_0_7_1.xml b/.idea/libraries/Maven__org_tachyonproject_tachyon_client_0_7_1.xml
new file mode 100644
index 0000000..e14969f
--- /dev/null
+++ b/.idea/libraries/Maven__org_tachyonproject_tachyon_client_0_7_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_tachyonproject_tachyon_underfs_hdfs_0_7_1.xml b/.idea/libraries/Maven__org_tachyonproject_tachyon_underfs_hdfs_0_7_1.xml
new file mode 100644
index 0000000..cd16342
--- /dev/null
+++ b/.idea/libraries/Maven__org_tachyonproject_tachyon_underfs_hdfs_0_7_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_tachyonproject_tachyon_underfs_local_0_7_1.xml b/.idea/libraries/Maven__org_tachyonproject_tachyon_underfs_local_0_7_1.xml
new file mode 100644
index 0000000..845d2cb
--- /dev/null
+++ b/.idea/libraries/Maven__org_tachyonproject_tachyon_underfs_local_0_7_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_tukaani_xz_1_0.xml b/.idea/libraries/Maven__org_tukaani_xz_1_0.xml
new file mode 100644
index 0000000..8b8042f
--- /dev/null
+++ b/.idea/libraries/Maven__org_tukaani_xz_1_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_uncommons_maths_uncommons_maths_1_2_2a.xml b/.idea/libraries/Maven__org_uncommons_maths_uncommons_maths_1_2_2a.xml
new file mode 100644
index 0000000..26568be
--- /dev/null
+++ b/.idea/libraries/Maven__org_uncommons_maths_uncommons_maths_1_2_2a.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_1_7.xml b/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_1_7.xml
new file mode 100644
index 0000000..61c0f2b
--- /dev/null
+++ b/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_1_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__oro_oro_2_0_8.xml b/.idea/libraries/Maven__oro_oro_2_0_8.xml
new file mode 100644
index 0000000..25203a0
--- /dev/null
+++ b/.idea/libraries/Maven__oro_oro_2_0_8.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
new file mode 100644
index 0000000..0b13335
--- /dev/null
+++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml b/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
new file mode 100644
index 0000000..19d39db
--- /dev/null
+++ b/.idea/libraries/Maven__xerces_xercesImpl_2_9_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml
new file mode 100644
index 0000000..891caa2
--- /dev/null
+++ b/.idea/libraries/Maven__xml_apis_xml_apis_1_3_04.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__xmlenc_xmlenc_0_52.xml b/.idea/libraries/Maven__xmlenc_xmlenc_0_52.xml
new file mode 100644
index 0000000..59d176d
--- /dev/null
+++ b/.idea/libraries/Maven__xmlenc_xmlenc_0_52.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1d56c6f..8ff9c29 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,12 +1,198 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -463,7 +649,14 @@
1734357362481
-
+
+ 1734361788229
+
+
+
+ 1734361788229
+
+
@@ -584,7 +777,8 @@
-
+
+
diff --git a/UserActionAnalyzePlatform.iml b/UserActionAnalyzePlatform.iml
index 1cd9bcc..65c4040 100644
--- a/UserActionAnalyzePlatform.iml
+++ b/UserActionAnalyzePlatform.iml
@@ -1,8 +1,8 @@
-
-
-
+
+
+
@@ -14,5 +14,181 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/util/DateUtils.java b/src/main/java/cn/edu/hust/util/DateUtils.java
index 1bfde96..6a8496d 100644
--- a/src/main/java/cn/edu/hust/util/DateUtils.java
+++ b/src/main/java/cn/edu/hust/util/DateUtils.java
@@ -1,150 +1,226 @@
-package cn.edu.hust.util;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
+//开始
+package cn.edu.hust.util;//申明
+//
+import java.text.ParseException;//申明
+import java.text.SimpleDateFormat;//申明
+import java.util.Calendar;//申明
+import java.util.Date;//申明
+//
/**
* 日期时间工具类
+ * 提供了多个静态方法来处理日期和时间的相关操作
* @author Administrator111222
*
*/
-public class DateUtils {
-
- public static final SimpleDateFormat TIME_FORMAT =
+public class DateUtils {//申明
+//
+ // 时间格式化:年月日 时分秒
+ public static final SimpleDateFormat TIME_FORMAT =
new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- public static final SimpleDateFormat DATE_FORMAT =
+ //
+ // 日期格式化:年月日
+ public static final SimpleDateFormat DATE_FORMAT =
new SimpleDateFormat("yyyy-MM-dd");
- public static ThreadLocal simpleDateFormatThreadLocal=new ThreadLocal(){
- @Override
+//
+ // ThreadLocal 用于线程安全地存储 SimpleDateFormat 实例
+ public static ThreadLocal simpleDateFormatThreadLocal = new ThreadLocal(){
+ //
+ @Override//
+ //
protected SimpleDateFormat initialValue() {
+ // 初始化 SimpleDateFormat 实例,格式为 yyyy-MM-dd HH:mm:ss
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- }
- };
-
+ //
+ }//
+ //
+ };//
+ //
+//
/**
* 判断一个时间是否在另一个时间之前
* @param time1 第一个时间
* @param time2 第二个时间
- * @return 判断结果
+ * @return 判断结果:如果 time1 在 time2 之前,返回 true,否则返回 false
*/
- public static boolean before(String time1, String time2) {
- try {
- Date dateTime1 = TIME_FORMAT.parse(time1);
- Date dateTime2 = TIME_FORMAT.parse(time2);
-
- if(dateTime1.before(dateTime2)) {
- return true;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
- }
-
+ public static boolean before(String time1, String time2) {//申明
+ //
+ try {//申明
+ // 解析时间字符串为 Date 对象
+ Date dateTime1 = TIME_FORMAT.parse(time1);//解析字符串
+ //
+ Date dateTime2 = TIME_FORMAT.parse(time2);//解析字符串
+//
+ // 判断 dateTime1 是否在 dateTime2 之前
+ if(dateTime1.before(dateTime2)) {//
+ //
+ return true;//返回正确
+ }//
+ } catch (Exception e) {//
+ //
+ e.printStackTrace(); // 捕获异常并打印堆栈信息
+ }//
+ //
+ return false; // 如果发生异常或判断结果不为 true,返回 false
+ }//
+//
+ //
/**
* 判断一个时间是否在另一个时间之后
* @param time1 第一个时间
* @param time2 第二个时间
- * @return 判断结果
+ * @return 判断结果:如果 time1 在 time2 之后,返回 true,否则返回 false
*/
- public static boolean after(String time1, String time2) {
+ public static boolean after(String time1, String time2) {//
try {
- Date dateTime1 = TIME_FORMAT.parse(time1);
- Date dateTime2 = TIME_FORMAT.parse(time2);
-
- if(dateTime1.after(dateTime2)) {
- return true;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return false;
+ //
+ // 解析时间字符串为 Date 对象
+ Date dateTime1 = TIME_FORMAT.parse(time1);//解析字符串
+ //
+ Date dateTime2 = TIME_FORMAT.parse(time2);//解析字符串
+ //
+//
+ // 判断 dateTime1 是否在 dateTime2 之后
+ if(dateTime1.after(dateTime2)) {//
+ //
+ return true;//返回正确
+ //
+ }//
+ //
+ } catch (Exception e) {//
+ //
+ e.printStackTrace(); // 捕获异常并打印堆栈信息
+ }//
+ //
+ return false; // 如果发生异常或判断结果不为 true,返回 false
}
-
+
/**
* 计算时间差值(单位为秒)
* @param time1 时间1
* @param time2 时间2
- * @return 差值
+ * @return 时间差值,单位为秒
*/
- public static int minus(String time1, String time2) {
+ public static int minus(String time1, String time2) {//
+ //
try {
- Date datetime1 = TIME_FORMAT.parse(time1);
- Date datetime2 = TIME_FORMAT.parse(time2);
-
- long millisecond = datetime1.getTime() - datetime2.getTime();
-
- return Integer.valueOf(String.valueOf(millisecond / 1000));
- } catch (Exception e) {
- e.printStackTrace();
+ // 解析时间字符串为 Date 对象
+ Date datetime1 = TIME_FORMAT.parse(time1);// 解析时间字符串
+ //
+ Date datetime2 = TIME_FORMAT.parse(time2);// 解析时间字符串
+ //
+//
+ // 计算时间差,单位为毫秒
+ long millisecond = datetime1.getTime() - datetime2.getTime();//计算时间差,单位为毫秒
+//
+ // 转换为秒,并返回
+ return Integer.valueOf(String.valueOf(millisecond / 1000));//
+ //
+ } catch (Exception e) {//
+ //
+ e.printStackTrace(); // 捕获异常并打印堆栈信息
+ //
}
- return 0;
+ return 0; // 如果发生异常,返回 0
+ //
}
-
+
/**
- * 获取年月日和小时
- * @param datetime 时间(yyyy-MM-dd HH:mm:ss)
- * @return 结果
+ * 获取年月日和小时(如:yyyy-MM-dd_HH)
+ * @param datetime 时间(格式:yyyy-MM-dd HH:mm:ss)
+ * @return 格式化后的结果,形如 yyyy-MM-dd_HH
*/
- public static String getDateHour(String datetime) {
- String date = datetime.split(" ")[0];
- String hourMinuteSecond = datetime.split(" ")[1];
- String hour = hourMinuteSecond.split(":")[0];
- return date + "_" + hour;
- }
-
+ public static String getDateHour(String datetime) {//
+ // 获取日期部分:yyyy-MM-dd
+ String date = datetime.split(" ")[0];//
+ // 获取时间部分:HH:mm:ss
+ String hourMinuteSecond = datetime.split(" ")[1];//
+ // 获取小时部分
+ String hour = hourMinuteSecond.split(":")[0];//
+ // 返回格式化后的日期和小时
+ return date + "_" + hour;//
+ //
+ }
+//
/**
* 获取当天日期(yyyy-MM-dd)
- * @return 当天日期
+ * @return 当前日期,格式为 yyyy-MM-dd
*/
- public static String getTodayDate() {
- return DATE_FORMAT.format(new Date());
- }
-
+ public static String getTodayDate() {//
+ //
+ // 获取当前日期并格式化
+ return DATE_FORMAT.format(new Date());//
+ //
+ }//
+//
/**
* 获取昨天的日期(yyyy-MM-dd)
- * @return 昨天的日期
+ * @return 昨天的日期,格式为 yyyy-MM-dd
*/
- public static String getYesterdayDate() {
- Calendar cal = Calendar.getInstance();
- cal.setTime(new Date());
- cal.add(Calendar.DAY_OF_YEAR, -1);
-
- Date date = cal.getTime();
-
- return DATE_FORMAT.format(date);
- }
-
+ public static String getYesterdayDate() {/
+ //
+ // 获取当前时间的 Calendar 实例
+ Calendar cal = Calendar.getInstance();//
+ //
+ // 设置当前时间
+ cal.setTime(new Date());//
+ //
+ // 当前日期减去一天
+ cal.add(Calendar.DAY_OF_YEAR, -1);//
+ //
+//
+ // 获取昨天的日期
+ Date date = cal.getTime();//
+//
+ // 格式化并返回昨天的日期
+ return DATE_FORMAT.format(date);//
+ }//
+//
/**
* 格式化日期(yyyy-MM-dd)
* @param date Date对象
- * @return 格式化后的日期
+ * @return 格式化后的日期字符串
*/
- public static String formatDate(Date date) {
- return DATE_FORMAT.format(date);
+ public static String formatDate(Date date) {//
+ //
+ // 使用日期格式化器格式化 Date 对象
+ return DATE_FORMAT.format(date);//
+ //
}
-
+
/**
* 格式化时间(yyyy-MM-dd HH:mm:ss)
* @param date Date对象
- * @return 格式化后的时间
+ * @return 格式化后的时间字符串
*/
- public static String formatTime(Date date) {
- return TIME_FORMAT.format(date);
- }
-
- public static Date parseTime(String time)
- {
- try {
- Date result=simpleDateFormatThreadLocal.get().parse(time);
- simpleDateFormatThreadLocal.remove();
- return result;
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return null;
- }
-
-}
+ public static String formatTime(Date date) {//
+ // 使用时间格式化器格式化 Date 对象
+ return TIME_FORMAT.format(date);//
+ //
+ }//
+//
+ /**
+ * 将时间字符串解析为 Date 对象
+ * @param time 时间字符串,格式为 yyyy-MM-dd HH:mm:ss
+ * @return 解析后的 Date 对象
+ */
+ public static Date parseTime(String time) {//
+ //
+ try {//
+ // 使用 ThreadLocal 提供的 SimpleDateFormat 解析时间字符串
+ //
+ Date result = simpleDateFormatThreadLocal.get().parse(time);//
+ //
+ // 移除 ThreadLocal 中的 SimpleDateFormat 实例
+ simpleDateFormatThreadLocal.remove();//
+ //
+ return result; // 返回解析后的 Date 对象
+ //
+ } catch (ParseException e) {//
+ //
+ e.printStackTrace(); // 捕获异常并打印堆栈信息
+ }//
+ return null; // 如果解析失败,返回 null
+ }//
+//
+}//
+//
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/util/NumberUtils.java b/src/main/java/cn/edu/hust/util/NumberUtils.java
index 14a5341..cee15ef 100644
--- a/src/main/java/cn/edu/hust/util/NumberUtils.java
+++ b/src/main/java/cn/edu/hust/util/NumberUtils.java
@@ -1,23 +1,32 @@
-package cn.edu.hust.util;
-
-import java.math.BigDecimal;
-
+//start
+package cn.edu.hust.util; // 引入包,指定该类所在的包
+//引入包,指定该类所在的包
+import java.math.BigDecimal; // 导入 BigDecimal 类,用于高精度的浮点数运算
+//引入包,指定该类所在的包
+//s
/**
* 数字格工具类
* @author Administrator
- *
+ * 该类提供了一个静态方法用于格式化小数
*/
-public class NumberUtils {
-
+public class NumberUtils {//
+ //s
+ //ss
+ //sss
+//
/**
* 格式化小数
- * @param num 数字
- * @param scale 四舍五入的位数
- * @return 格式化小数
+ * @param num 数字 需要格式化的数字
+ * @param scale 四舍五入的位数 保留的小数位数
+ * @return 格式化小数 返回四舍五入后的数字
*/
- public static double formatDouble(double num, int scale) {
- BigDecimal bd = new BigDecimal(num);
- return bd.setScale(scale, BigDecimal.ROUND_HALF_UP).doubleValue();
- }
-
-}
+ public static double formatDouble(double num, int scale) {//shengming
+ //kellly
+ BigDecimal bd = new BigDecimal(num); // 将输入的数字转换为 BigDecimal 对象,以提高计算精度
+ //将输入的数字转换为 BigDecimal 对象,以提高计算精度
+ return bd.setScale(scale, BigDecimal.ROUND_HALF_UP).doubleValue(); // 设置四舍五入的精度并返回对应的 double 值
+ //设置四舍五入的精度并返回对应的 double 值
+ }//
+//
+}//
+//结束
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/util/ParamUtils.java b/src/main/java/cn/edu/hust/util/ParamUtils.java
index 77cddc2..47eba11 100644
--- a/src/main/java/cn/edu/hust/util/ParamUtils.java
+++ b/src/main/java/cn/edu/hust/util/ParamUtils.java
@@ -1,42 +1,60 @@
-package cn.edu.hust.util;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
+package cn.edu.hust.util; // 定义类所在的包名,方便包管理和组织
+//
+import com.alibaba.fastjson.JSONArray; // 引入 fastjson 库中的 JSONArray 类,用于处理 JSON 数组
+// 引入 fastjson 库中的 JSONArray 类用于处理 JSON 数组
+import com.alibaba.fastjson.JSONObject; // 引入 fastjson 库中的 JSONObject 类,用于处理 JSON 对象
+// 引入 fastjson 库中的 JSONObject 类用于处理 JSON 对象
+//
/**
* 参数工具类
+ * 该类提供了从命令行参数或 JSON 对象中提取参数的方法
* @author Administrator
*
*/
-public class ParamUtils {
-
+public class ParamUtils {//
+//
/**
* 从命令行参数中提取任务id
- * @param args 命令行参数
- * @return 任务id
+ * @param args 命令行参数,通常是启动程序时传递的参数
+ * @return 返回任务ID,如果没有找到返回 null
*/
- public static Long getTaskIdFromArgs(String[] args) {
- try {
- if(args != null && args.length > 0) {
- return Long.valueOf(args[0]);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
+ public static Long getTaskIdFromArgs(String[] args) { // 定义静态方法,接受命令行参数数组 args
+ //
+ try { // 尝试执行以下代码
+ //尝试
+ if(args != null && args.length > 0) { // 如果参数数组不为空且长度大于0
+ //
+ return Long.valueOf(args[0]); // 将第一个参数转化为 Long 类型并返回
+ //
+ }//
+ } catch (Exception e) { // 捕获任何异常
+ //
+ e.printStackTrace(); // 打印堆栈信息,便于调试
+ //
+ }//
+ return null; // 如果未能提取到有效的任务 ID,则返回 null
+ //
}
-
+//
/**
- * 从JSON对象中提取参数
- * @param jsonObject JSON对象
- * @return 参数
+ * 从 JSON 对象中提取指定字段的第一个值
+ * @param jsonObject JSON 对象,包含了需要提取的字段数据
+ * @param field 字段名,表示要从 JSON 对象中提取的字段
+ * @return 返回字段对应的第一个值,如果字段不存在或者值为空返回 null
*/
- public static String getParam(JSONObject jsonObject, String field) {
- JSONArray jsonArray = jsonObject.getJSONArray(field);
- if(jsonArray != null && jsonArray.size() > 0) {
- return jsonArray.getString(0);
- }
- return null;
- }
-
-}
+ public static String getParam(JSONObject jsonObject, String field) { // 定义静态方法,接受一个 JSON 对象和一个字段名
+ //
+ JSONArray jsonArray = jsonObject.getJSONArray(field); // 从 JSON 对象中获取指定字段的 JSON 数组
+ //
+ if(jsonArray != null && jsonArray.size() > 0) { // 如果该字段存在且 JSON 数组非空
+ //
+ return jsonArray.getString(0); // 返回 JSON 数组的第一个字符串值
+ //
+ }//测试完成
+ //
+ return null; // 如果字段不存在或数组为空,返回 null
+ //
+ }//
+//
+}//
+//结束
diff --git a/src/main/java/cn/edu/hust/util/StringUtils.java b/src/main/java/cn/edu/hust/util/StringUtils.java
index 0919d52..5d82007 100644
--- a/src/main/java/cn/edu/hust/util/StringUtils.java
+++ b/src/main/java/cn/edu/hust/util/StringUtils.java
@@ -1,110 +1,152 @@
-package cn.edu.hust.util;
-
+//start
+package cn.edu.hust.util; // 定义类所在的包名,便于组织和管理代码
+//
/**
* 字符串工具类
+ * 提供了一些常见的字符串操作方法
* @author Administrator
*
*/
-public class StringUtils {
-
+public class StringUtils {//尝试编写
+//
/**
* 判断字符串是否为空
* @param str 字符串
- * @return 是否为空
+ * @return 如果字符串为空或为 null,返回 true;否则返回 false
*/
- public static boolean isEmpty(String str) {
- return str == null || "".equals(str);
- }
-
+ public static boolean isEmpty(String str) {//
+ //申明
+ return str == null || "".equals(str); // 如果字符串为 null 或者是空字符串,返回 true
+ //
+ }//
+//
/**
* 判断字符串是否不为空
* @param str 字符串
- * @return 是否不为空
+ * @return 如果字符串不为空且不为 null,返回 true;否则返回 false
*/
- public static boolean isNotEmpty(String str) {
- return str != null && !"".equals(str);
- }
-
+ public static boolean isNotEmpty(String str) {//
+ //
+ return str != null && !"".equals(str); // 如果字符串非空且非 null,返回 true
+ }//
+//
/**
* 截断字符串两侧的逗号
* @param str 字符串
- * @return 字符串
+ * @return 去掉两侧逗号后的字符串
*/
- public static String trimComma(String str) {
- if(str.startsWith(",")) {
- str = str.substring(1);
- }
- if(str.endsWith(",")) {
- str = str.substring(0, str.length() - 1);
- }
- return str;
- }
-
+ public static String trimComma(String str) {//
+ //
+ if(str.startsWith(",")) { // 如果字符串以逗号开始
+ //
+ str = str.substring(1); // 去掉开头的逗号
+ }//
+ if(str.endsWith(",")) { // 如果字符串以逗号结束
+ //
+ str = str.substring(0, str.length() - 1); // 去掉结尾的逗号
+ }//
+ //
+ return str; // 返回处理后的字符串
+ }//
+//
/**
- * 补全两位数字
- * @param str
- * @return
+ * 补全两位数字(如果输入是单个数字,前面加零)
+ * @param str 输入的数字字符串
+ * @return 返回两位数字的字符串
*/
- public static String fulfuill(String str) {
- if(str.length() == 2) {
- return str;
- } else {
- return "0" + str;
- }
- }
-
+ public static String fulfuill(String str) {//
+ //
+ if(str.length() == 2) { // 如果字符串已经是两位数字
+ //
+ return str; // 直接返回该字符串
+ //
+ } else {//
+ return "0" + str; // 否则,在前面加上一个零
+ //
+ }//
+ }//
+//
/**
- * 从拼接的字符串中提取字段
- * @param str 字符串
- * @param delimiter 分隔符
- * @param field 字段
- * @return 字段值
+ * 从拼接的字符串中提取字段值
+ * 例如:str = "field1=value1|field2=value2",delimiter="|",field="field1"
+ * 该方法返回 "value1"
+ * @param str 拼接的字符串
+ * @param delimiter 分隔符
+ * @param field 字段名
+ * @return 字段值,如果不存在返回 null
*/
- public static String getFieldFromConcatString(String str,
- String delimiter, String field) {
- String[] fields = str.split(delimiter);
- for(String concatField : fields) {
- if(concatField.split("=").length==2) {
- String fieldName = concatField.split("=")[0];
- String fieldValue = concatField.split("=")[1];
- if (fieldName.equals(field)) {
- return fieldValue;
- }
- }
- }
- return null;
- }
-
+ public static String getFieldFromConcatString(String str,//申明
+ //
+ String delimiter, String field) {//
+ String[] fields = str.split(delimiter); // 根据分隔符将字符串分割成数组
+ //
+ for(String concatField : fields) { // 遍历每个分割后的字段
+ //
+ if(concatField.split("=").length==2) { // 判断字段是否符合 "key=value" 形式
+ //
+ String fieldName = concatField.split("=")[0]; // 获取字段名
+ //
+ String fieldValue = concatField.split("=")[1]; // 获取字段值
+ //
+ if (fieldName.equals(field)) { // 如果字段名匹配
+ //
+ return fieldValue; // 返回该字段的值
+ //
+ }//
+ }//
+ }//
+ return null; // 如果没有找到匹配的字段,返回 null
+ //
+ }//
+//
/**
- * 从拼接的字符串中给字段设置值
- * @param str 字符串
- * @param delimiter 分隔符
+ * 从拼接的字符串中给指定字段设置新值
+ * 例如:str = "field1=value1|field2=value2",delimiter="|",field="field1",newFieldValue="newValue"
+ * 该方法返回 "field1=newValue|field2=value2"
+ * @param str 拼接的字符串
+ * @param delimiter 分隔符
* @param field 字段名
- * @param newFieldValue 新的field值
- * @return 字段值
+ * @param newFieldValue 新的字段值
+ * @return 修改后的拼接字符串
*/
- public static String setFieldInConcatString(String str,
- String delimiter, String field, String newFieldValue) {
- String[] fields = str.split(delimiter);
-
- for(int i = 0; i < fields.length; i++) {
- String fieldName = fields[i].split("=")[0];
- if(fieldName.equals(field)) {
- String concatField = fieldName + "=" + newFieldValue;
- fields[i] = concatField;
- break;
- }
- }
-
+ public static String setFieldInConcatString(String str,//申明
+ //
+ String delimiter, String field, String newFieldValue) {//
+ //
+ String[] fields = str.split(delimiter); // 根据分隔符将字符串分割成数组
+//
+ for(int i = 0; i < fields.length; i++) { // 遍历每个字段
+ //
+ String fieldName = fields[i].split("=")[0]; // 获取字段名
+ //
+ if(fieldName.equals(field)) { // 如果字段名匹配
+ //
+ String concatField = fieldName + "=" + newFieldValue; // 创建新的字段
+ //
+ fields[i] = concatField; // 替换原字段
+ //
+ break; // 找到并修改后跳出循环
+ //
+ }//
+ }//
+//
+ // 使用 StringBuffer 构建修改后的拼接字符串
StringBuffer buffer = new StringBuffer("");
- for(int i = 0; i < fields.length; i++) {
- buffer.append(fields[i]);
- if(i < fields.length - 1) {
- buffer.append("|");
- }
- }
-
- return buffer.toString();
- }
-
-}
+ //
+ for(int i = 0; i < fields.length; i++) { // 遍历修改后的字段数组
+ //
+ buffer.append(fields[i]); // 将字段拼接到 buffer 中
+ //
+ if(i < fields.length - 1) { // 如果不是最后一个字段
+ //
+ buffer.append("|"); // 添加分隔符
+ //
+ }//
+ }//
+//
+ return buffer.toString(); // 返回修改后的拼接字符串
+ //
+ }//
+//
+}//
+//结束
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hust/util/ValidUtils.java b/src/main/java/cn/edu/hust/util/ValidUtils.java
index df4da76..26a4ebf 100644
--- a/src/main/java/cn/edu/hust/util/ValidUtils.java
+++ b/src/main/java/cn/edu/hust/util/ValidUtils.java
@@ -1,12 +1,15 @@
-package cn.edu.hust.util;
-
+//导入包
+package cn.edu.hust.util;//
+//
+//
/**
* 校验工具类
+ * 提供了校验数据字段是否符合某些条件的常用方法
* @author Administrator
*
*/
-public class ValidUtils {
-
+public class ValidUtils {//
+//
/**
* 校验数据中的指定字段,是否在指定范围内
* @param data 数据
@@ -14,95 +17,162 @@ public class ValidUtils {
* @param parameter 参数
* @param startParamField 起始参数字段
* @param endParamField 结束参数字段
- * @return 校验结果
+ * @return 校验结果,如果在范围内返回 true,否则返回 false
*/
- public static boolean between(String data, String dataField,
- String parameter, String startParamField, String endParamField) {
- String startParamFieldStr = StringUtils.getFieldFromConcatString(
- parameter, "\\|", startParamField);
- String endParamFieldStr = StringUtils.getFieldFromConcatString(
- parameter, "\\|", endParamField);
- if(startParamFieldStr == null || endParamFieldStr == null) {
- return true;
- }
-
- int startParamFieldValue = Integer.valueOf(startParamFieldStr);
- int endParamFieldValue = Integer.valueOf(endParamFieldStr);
-
- String dataFieldStr = StringUtils.getFieldFromConcatString(
- data, "\\|", dataField);
- if(dataFieldStr != null) {
- int dataFieldValue = Integer.valueOf(dataFieldStr);
- if(dataFieldValue >= startParamFieldValue &&
- dataFieldValue <= endParamFieldValue) {
- return true;
- } else {
- return false;
- }
- }
-
- return false;
- }
-
+ public static boolean between(String data, String dataField,//
+ //
+ String parameter, String startParamField, String endParamField) {//尝试编写
+ // 获取参数中的起始范围值
+ String startParamFieldStr = StringUtils.getFieldFromConcatString(//
+ //
+ parameter, "\\|", startParamField);//
+ // 获取参数中的结束de范围值
+ // 获取参数中的结束范围值
+ String endParamFieldStr = StringUtils.getFieldFromConcatString(//
+ //
+ parameter, "\\|", endParamField);//
+//
+ // 如果起始值或结束值为空,直接返回 true
+ if(startParamFieldStr == null || endParamFieldStr == null) {//
+ //
+ return true;//返回正确值
+ }//
+//
+ // 将起始和结束值转换为整数
+ int startParamFieldValue = Integer.valueOf(startParamFieldStr);//
+ //转换
+ int endParamFieldValue = Integer.valueOf(endParamFieldStr);//
+ //转换
+//
+ // 获取数据字段的值
+ String dataFieldStr = StringUtils.getFieldFromConcatString(//
+ //
+ data, "\\|", dataField);//
+//
+ // 如果数据字段值不为空,进行范围校验
+ if(dataFieldStr != null) {//
+ //
+ int dataFieldValue = Integer.valueOf(dataFieldStr);//
+ // 校验数据字段值是否在指定范围内
+ if(dataFieldValue >= startParamFieldValue &&//
+ //
+ dataFieldValue <= endParamFieldValue) {//
+ //
+ return true;//返回
+ //
+ } else {//
+ //
+ return false; // 如果数据字段值超出范围,返回 false
+ //
+ }//
+ }//
+//
+ // 如果数据字段值为空,返回 false
+ return false;//返回错误
+ //
+ }//
+//
/**
* 校验数据中的指定字段,是否有值与参数字段的值相同
* @param data 数据
* @param dataField 数据字段
* @param parameter 参数
* @param paramField 参数字段
- * @return 校验结果
+ * @return 校验结果,如果匹配返回 true,否则返回 false
*/
- public static boolean in(String data, String dataField,
- String parameter, String paramField) {
- String paramFieldValue = StringUtils.getFieldFromConcatString(
- parameter, "\\|", paramField);
- if(paramFieldValue == null) {
- return true;
- }
- String[] paramFieldValueSplited = paramFieldValue.split(",");
-
- String dataFieldValue = StringUtils.getFieldFromConcatString(
- data, "\\|", dataField);
- if(dataFieldValue != null) {
+ //申明
+ public static boolean in(String data, String dataField,//申明
+ // 申明
+ // 申明
+ //申明
+ String parameter, String paramField) {//
+ //
+ // 获取参数字段的值
+ String paramFieldValue = StringUtils.getFieldFromConcatString(//
+ //
+ parameter, "\\|", paramField);//
+ //
+ // 如果参数字段值为空,直接返回 true
+ if(paramFieldValue == null) {//
+ //
+ return true;//
+ //
+ }//
+ // 将参数字段的值按逗号分隔成数组
+ String[] paramFieldValueSplited = paramFieldValue.split(",");//
+ //
+//sdzf
+ // 获取数据字段的值
+ String dataFieldValue = StringUtils.getFieldFromConcatString(//
+ //
+ data, "\\|", dataField);//
+ //
+ // 如果数据字段值不为空,进行匹配校验
+ if(dataFieldValue != null) {//
+ //
+ // 将数据字段值按逗号分隔成数组
String[] dataFieldValueSplited = dataFieldValue.split(",");
-
- for(String singleDataFieldValue : dataFieldValueSplited) {
- for(String singleParamFieldValue : paramFieldValueSplited) {
- if(singleDataFieldValue.equals(singleParamFieldValue)) {
- return true;
- }
- }
- }
- }
-
- return false;
- }
-
+//
+ // 遍历数据字段值和参数字段值,检查是否存在匹配
+ for(String singleDataFieldValue : dataFieldValueSplited) {//
+ //
+ for(String singleParamFieldValue : paramFieldValueSplited) {//
+ //
+ // 如果有一个匹配项,返回 true
+ if(singleDataFieldValue.equals(singleParamFieldValue)) {//
+ //
+ return true;//返回正确
+ }//
+ }//
+ }//
+ }//
+//
+ // 如果没有任何匹配项,返回 false
+ return false;//返回错误
+ }//
+//
/**
- * 校验数据中的指定字段,是否在指定范围内
+ * 校验数据中的指定字段,是否等于参数字段的值
* @param data 数据
* @param dataField 数据字段
* @param parameter 参数
* @param paramField 参数字段
- * @return 校验结果
+ * @return 校验结果,如果等于返回 true,否则返回 false
*/
- public static boolean equal(String data, String dataField,
- String parameter, String paramField) {
- String paramFieldValue = StringUtils.getFieldFromConcatString(
- parameter, "\\|", paramField);
- if(paramFieldValue == null) {
- return true;
- }
-
- String dataFieldValue = StringUtils.getFieldFromConcatString(
- data, "\\|", dataField);
- if(dataFieldValue != null) {
- if(dataFieldValue.equals(paramFieldValue)) {
- return true;
- }
- }
-
- return false;
- }
-
-}
+ public static boolean equal(String data, String dataField,//申明
+ //
+ String parameter, String paramField) {//
+ //
+ // 获取参数字段的值
+ String paramFieldValue = StringUtils.getFieldFromConcatString(//
+ //
+ parameter, "\\|", paramField);//
+ // 如果参数字段值为空,直接返回 true
+ if(paramFieldValue == null) {//
+ //
+ return true;//返回正确
+ //
+ }//
+//
+ // 获取数据字段的值
+ String dataFieldValue = StringUtils.getFieldFromConcatString(//
+ //
+ data, "\\|", dataField);//
+ //
+ // 如果数据字段值不为空,进行值匹配校验
+ if(dataFieldValue != null) {//
+ //
+ // 如果数据字段值等于参数字段的值,返回 true
+ if(dataFieldValue.equals(paramFieldValue)) {//
+ //
+ return true;//返回正确
+ //
+ }//
+ }//
+
+ // 如果数据字段值与参数字段值不匹配,返回 false
+ return false;//返回错误
+ }//
+//
+}//
+//结束
\ No newline at end of file
diff --git a/src/main/resources/conf.properties b/src/main/resources/conf.properties
index 2e8b6dd..9dbcba9 100644
--- a/src/main/resources/conf.properties
+++ b/src/main/resources/conf.properties
@@ -1,6 +1,13 @@
-jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://10.211.55.16:3306/BigDataPlatm?useUnicode=true&&characterEncoding=UTF-8
-jdbc.username=root
-jdbc.password=root
-jdbc.active=20
-spark.local=true;
+#
+jdbc.driver=com.mysql.jdbc.Driver # JDBCָ࣬ʹõݿMySQLJDBC
+#
+jdbc.url=jdbc:mysql://10.211.55.16:3306/BigDataPlatm?useUnicode=true&&characterEncoding=UTF-8 # ݿURLָMySQLݿIPַ˿ڡݿƼַ
+#
+jdbc.username=root # ݿûݿʱʹõûroot
+#
+jdbc.password=root # ݿ룬ݿʱʹõ룬root\
+#
+jdbc.active=20 # ݿӳصĻԾʾݿӳлԾӵ
+#
+spark.local=true; # SparkģʽãʾǷʹSparkıģʽ
+#
diff --git a/src/test/java/cn/edu/hust/utils/ParamUtilsTest.java b/src/test/java/cn/edu/hust/utils/ParamUtilsTest.java
index 215dd1a..163eafc 100644
--- a/src/test/java/cn/edu/hust/utils/ParamUtilsTest.java
+++ b/src/test/java/cn/edu/hust/utils/ParamUtilsTest.java
@@ -1,16 +1,28 @@
-package cn.edu.hust.utils;
-
-import cn.edu.hust.util.ParamUtils;
-import com.alibaba.fastjson.JSONObject;
-import org.junit.Test;
-
-public class ParamUtilsTest {
- @Test
- public void test2()
- {
- String json="{\"startAge\":[\"10\"],\"endAge\":[\"34\"],\"startDate\":[\"2018-06-22\"],\"endDate\":[\"2018-06-22\"]}";
- JSONObject param=JSONObject.parseObject(json);
- //param.getJSONArray("startAge");
- System.out.println(ParamUtils.getParam(param,"startDate"));
- }
-}
+//开始
+package cn.edu.hust.utils; // 定义类所在的包,包名为cn.edu.hust.utils
+//
+import cn.edu.hust.util.ParamUtils; // 导入ParamUtils工具类,假设该类中包含用于处理参数的实用方法
+//
+import com.alibaba.fastjson.JSONObject; // 导入fastjson库中的JSONObject类,用于处理JSON数据
+//
+import org.junit.Test; // 导入JUnit的Test注解,标识该方法为JUnit测试方法
+//
+//
+public class ParamUtilsTest { // 定义测试类ParamUtilsTest,主要用于测试ParamUtils类的方法
+ //
+ @Test // 使用JUnit的Test注解,标识该方法为一个测试方法
+ //
+ public void test2() // 定义测试方法test2
+ //
+ {//
+ String json="{\"startAge\":[\"10\"],\"endAge\":[\"34\"],\"startDate\":[\"2018-06-22\"],\"endDate\":[\"2018-06-22\"]}"; // 定义一个JSON格式的字符串,包含多个键值对,其中包含了年龄范围和日期范围
+ //运行
+ JSONObject param=JSONObject.parseObject(json); // 将JSON字符串转换为JSONObject对象,方便后续操作
+ //
+ //param.getJSONArray("startAge"); // 这行代码被注释掉了,原本是获取JSON中的"startAge"数组
+ //
+ System.out.println(ParamUtils.getParam(param,"startDate")); // 调用ParamUtils类中的getParam方法,获取"startDate"参数的值并输出到控制台
+ //
+ }//
+}//
+//结束
\ No newline at end of file
From 2ea9c89fccdb0b5c0f883f47fedd42b8833d4082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=B0=8F=E5=A8=9C?= <1253094786@qq.com>
Date: Tue, 17 Dec 2024 01:00:02 +0800
Subject: [PATCH 32/43] =?UTF-8?q?=E7=BC=96=E5=86=992?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/cn/edu/hust/util/ValidUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/cn/edu/hust/util/ValidUtils.java b/src/main/java/cn/edu/hust/util/ValidUtils.java
index 26a4ebf..1aca9de 100644
--- a/src/main/java/cn/edu/hust/util/ValidUtils.java
+++ b/src/main/java/cn/edu/hust/util/ValidUtils.java
@@ -175,4 +175,4 @@ public class ValidUtils {//
}//
//
}//
-//结束
\ No newline at end of file
+//jieshu
\ No newline at end of file
From 7ef91d76cfdbda8acb3b17f33f841d130f298f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9D=E9=85=92=E5=8D=83=E7=99=BE?= <3489241516@qq.com>
Date: Tue, 17 Dec 2024 01:03:37 +0800
Subject: [PATCH 33/43] =?UTF-8?q?1.=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=202.=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E7=B1=BB=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90=203.?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B1=BB?=
=?UTF-8?q?=E7=BC=96=E5=86=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 19 +-
.../cn/edu/hust/session/UserVisitAnalyze.java | 1524 ++++++++++++-----
2 files changed, 1121 insertions(+), 422 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ad194c8..f2b3985 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
-
+
@@ -478,7 +478,8 @@
-
+
+
1529592741848
@@ -598,7 +599,15 @@
1734363388179
-
+
+
+ 1734365844392
+
+
+
+ 1734365844392
+
+
@@ -721,10 +730,10 @@
-
-
+
+
diff --git a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
index 1d62b3b..95ecb8c 100644
--- a/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
+++ b/src/main/java/cn/edu/hust/session/UserVisitAnalyze.java
@@ -956,214 +956,482 @@ public class UserVisitAnalyze {
// 之后针对每个小时,创建或获取对应的随机索引列表,通过随机函数生成指定数量(extractSize)的唯一随机索引并添加到列表中。
// 最终目的是构建好dateRandomExtractMap这个数据结构,为后续依据这些随机索引从原始会话数据中真正抽取相应的会话数据提供依据,实现按照一定规则随机抽取会话数据的功能,以便进行例如抽样分析等相关业务操作。
-
- //2.将上面计算的RDD进行分组,然后使用FlatMap进行压平,然后判断是否在索引中,如果在,那么将这个信息持久化
- JavaPairRDD> time2GroupRDD=mapDataRDD.groupByKey();
- //将抽取的信息持久化到数据库,并返回SessionIds对,然后和以前的信息Join
- JavaPairRDD sessionIds= time2GroupRDD.flatMapToPair(new PairFlatMapFunction>, String, String>() {
+// 2.将上面计算的RDD进行分组,然后使用FlatMap进行压平,然后判断是否在索引中,如果在,那么将这个信息持久化
+ JavaPairRDD> time2GroupRDD = mapDataRDD.groupByKey();
+// 调用mapDataRDD(应该是之前已经存在且经过一定处理的JavaPairRDD)的groupByKey方法进行分组操作。
+// 按照元素的键进行分组,将具有相同键的元素的对应值汇聚在一起,形成新的键值对存储在time2GroupRDD中,
+// 新的JavaPairRDD中键的类型为String,值的类型为Iterable,表示对应键的多个值组成的可迭代集合。
+ // 将抽取的信息持久化到数据库,并返回SessionIds对,然后和以前的信息Join
+ JavaPairRDD sessionIds = time2GroupRDD.flatMapToPair(new PairFlatMapFunction>, String, String>() {
+ // 调用time2GroupRDD的flatMapToPair方法,传入一个实现了PairFlatMapFunction接口的匿名内部类实例,
+ // 用于定义将输入的键值对(这里输入类型是Tuple2>,即前面分组后的结果类型)
+ // 转换为零个、一个或多个新的键值对(输出类型是Tuple2,也就是新的JavaPairRDD的键值对类型)的逻辑。
@Override
public Iterable> call(Tuple2> tuple2) throws Exception {
- String dateStr=tuple2._1;
- String date=dateStr.split("_")[0];
- String hour=dateStr.split("_")[1];
- //使用一个List存储sessionId
- List> sessionIds=new ArrayList>();
- List indexList=dateRandomExtractMap.get(date).get(hour);
- //使用一个list保存需要持久化到数据库的对象
- List sessionRandomExtractList=new ArrayList();
- int index=0;
- for (String infos:tuple2._2) {
- if(indexList.contains(Long.valueOf(index)))
- {
- //构建SessionRandomExtract
- SessionRandomExtract sessionRandomExtract=new SessionRandomExtract();
- final String sessionId=StringUtils.getFieldFromConcatString(infos,"\\|",Constants.FIELD_SESSIONID);
- String startTime=StringUtils.getFieldFromConcatString(infos,"\\|",Constants.FIELD_START_TIME);
- String searchKeyWards=StringUtils.getFieldFromConcatString(infos,"\\|",Constants.FIELD_SERACH_KEYWORDS);
- String clickCategoryIds=StringUtils.getFieldFromConcatString(infos,"\\|",Constants.FIELD_CLICK_CATEGORYIDS);
+ // 当执行flatMapToPair操作时,会针对time2GroupRDD中的每一个元素(即每个键值对)调用这个call方法,
+ // 参数tuple2就是当前正在处理的那个键值对元素,其类型符合接口定义中的Tuple2>。
+ String dateStr = tuple2._1;
+ // 从传入的键值对tuple2中获取其键(Key)部分,并将其赋值给dateStr变量,
+ // 从后续代码对dateStr的处理来看,这个键应该是按照特定格式组织的字符串,可能包含日期和时间等相关信息。
+ String date = dateStr.split("_")[0];
+ // 调用split方法,以“_”作为分隔符,对dateStr字符串进行拆分操作,取拆分后得到的第一个子字符串,
+ // 并将其赋值给date变量,按照推测,这个部分应该是代表日期的信息,具体格式依实际业务而定。
+ String hour = dateStr.split("_")[1];
+ // 同样以“_”作为分隔符拆分dateStr,取拆分后的第二个子字符串,赋值给hour变量,
+ // 通常其代表的是小时相关的内容,具体含义要结合业务场景判断。通过这样的拆分操作,后续可依据日期和小时查找对应索引等信息来进一步处理数据。
+ // 使用一个List存储sessionId
+ List> sessionIds = new ArrayList>();
+ // 创建一个名为sessionIds的ArrayList列表,用于存储特定格式的键值对,其键和值的类型都是String,
+ // 主要用来存放与sessionId相关的键值对,方便后续和其他数据集基于sessionId进行关联等操作,提前整理好对应的数据格式进行存储。
+ List indexList = dateRandomExtractMap.get(date).get(hour);
+ // 这里涉及到dateRandomExtractMap这个变量,推测它是类似嵌套的映射结构(可能是Map>>类型),
+ // 外层的键对应日期,内层的键对应小时,值是由Long类型元素组成的列表。
+ // 首先通过dateRandomExtractMap.get(date)依据前面获取到的date(代表日期的字符串)查找对应日期下的内层映射,
+ // 再通过.get(hour)根据hour(代表小时的字符串)从内层映射中获取对应小时下存储的Long类型元素组成的列表,此列表就是indexList,
+ // 后续将用它作为判断当前处理的数据中哪些元素需要进行持久化等操作的依据。
+ // 使用一个list保存需要持久化到数据库的对象
+ List sessionRandomExtractList = new ArrayList();
+ // 创建一个名为sessionRandomExtractList的ArrayList列表,用于存放SessionRandomExtract类型的对象。
+ // SessionRandomExtract是自定义的实体类,用于封装从输入数据中提取出来、准备持久化到数据库的业务相关数据。
+ // 后续会把符合特定条件的数据封装成该类的对象,并添加到这个列表中,虽当前代码没展示具体持久化数据库的操作,但整体是为后续做准备。
+ int index = 0;
+ // 初始化一个名为index的整型变量,并将其初始值设为0,用于在后续遍历tuple2的值(Iterable部分)中的每个元素时,
+ // 作为元素的索引计数,方便和前面获取到的indexList中的索引值进行比较,以判断每个元素是否需要进行相应处理操作。
+ for (String infos : tuple2._2) {
+ // 开始一个for循环,用于遍历tuple2键值对中的值部分(即tuple2._2,其类型是Iterable),
+ // 在每次循环中,会取出其中一个字符串元素赋值给infos变量,后续就在循环体内部对每个infos字符串进行相关解析和处理操作。
+ if (indexList.contains(Long.valueOf(index))) {
+ // 在循环体中,先将当前的index(正在遍历的元素在tuple2._2中的索引位置)转换为Long类型(因为indexList是Long类型的列表),
+ // 然后通过contains方法判断这个索引值是否在indexList中。若在其中,意味着当前遍历到的infos对应的元素需进行后续特定处理,
+ // 如下文构建对象、提取信息并持久化等操作。
+ // 构建SessionRandomExtract
+ SessionRandomExtract sessionRandomExtract = new SessionRandomExtract();
+ // 创建一个SessionRandomExtract类型的对象sessionRandomExtract,它用于封装从infos字符串中提取的业务相关信息,
+ // 后续会对其各个属性进行赋值操作,再将其添加到sessionRandomExtractList列表中,最终实现将业务信息持久化到数据库的目的。
+ final String sessionId = StringUtils.getFieldFromConcatString(infos,"\\|",Constants.FIELD_SESSIONID);
+ // 通过调用StringUtils工具类(自定义的用于字符串操作的工具类)的getFieldFromConcatString方法,
+ // 从infos字符串中按照“|”作为分隔符提取出对应Constants.FIELD_SESSIONID这个字段对应的内容,
+ // Constants.FIELD_SESSIONID应是在Constants类中定义好的常量,用于标识sessionId在字符串中的位置等信息,
+ // 提取出的内容赋值给sessionId变量。
+ String startTime = StringUtils.getFieldFromConcatString(infos,"\\|",Constants.FIELD_START_TIME);
+ // 同理,从infos字符串中提取出代表开始时间相关字段内容,赋值给startTime变量,用于后续给sessionRandomExtract对象设置属性值。
+ String searchKeyWards = StringUtils.getFieldFromConcatString(infos,"\\|",Constants.FIELD_SERACH_KEYWORDS);
+ // 从infos字符串中提取出代表搜索关键词相关字段内容,赋值给searchKeyWards变量,为后续设置对象属性做准备。
+ String clickCategoryIds = StringUtils.getFieldFromConcatString(infos,"\\|",Constants.FIELD_CLICK_CATEGORYIDS);
+ // 从infos字符串中提取出代表点击类别IDs相关字段内容,赋值给clickCategoryIds变量,以便后续设置对象属性。
sessionRandomExtract.set(taskId,sessionId,startTime,searchKeyWards,clickCategoryIds);
- //添加到List中然后持久化到数据库中
+ // 调用sessionRandomExtract对象的set方法(假设SessionRandomExtract类有此方法用于设置各属性值),
+ // 将前面提取出来的各个业务相关信息以及外部定义好的taskId(与当前任务相关的标识,外部已赋值确定)设置到sessionRandomExtract对象中,
+ // 完成对该对象的属性赋值操作,使其封装好要持久化的数据信息。
+ // 添加到List中然后持久化到数据库中
sessionRandomExtractList.add(sessionRandomExtract);
+ // 将已经封装好业务信息的sessionRandomExtract对象添加到sessionRandomExtractList列表中,
+ // 后续应会有其他代码利用这个列表中的对象进行数据库持久化操作,将这些对象代表的数据插入数据库相应表中存储。
sessionIds.add(new Tuple2(sessionId,sessionId));
+ // 创建一个键值对,其键和值都是当前提取出来的sessionId,然后将这个键值对添加到前面创建的sessionIds列表中,
+ // 这样做可能是为了后续和其他数据集基于sessionId进行关联操作(如Join操作)时方便整理出对应的关联数据对,便于后续整合和分析数据。
}
index++;
+ // 在每次循环结束后,将index变量的值自增1,使其指向下一个元素在tuple2._2中的索引位置,
+ // 以便在下一轮循环中正确判断对应元素是否在indexList中,从而继续对下一个元素进行相应处理操作。
}
- //持久化到数据库
- DaoFactory.getSessionRandomExtractDao().batchInsert(sessionRandomExtractList);
return sessionIds;
+ // 返回包含sessionId键值对的列表sessionIds,这是flatMapToPair方法要求的返回类型,
+ // 最终这些返回的键值对会构成新的JavaPairRDD(即前面定义的sessionIds变量所代表的RDD)。
}
});
-
- //3. 获取session的明细数据保存到数据库
- JavaPairRDD> sessionDetailRDD= sessionIds.join(sessionInfoPairRDD);
- sessionDetailRDD.foreachPartition(new VoidFunction>>>() {
- @Override
- public void call(Iterator>> tuple2Iterator) throws Exception {
- List sessionDetailList=new ArrayList();
- while(tuple2Iterator.hasNext())
- {
- Tuple2> tuple2=tuple2Iterator.next();
- Row row=tuple2._2._2;
- String sessionId=tuple2._1;
- Long userId=row.getLong(1);
- Long pageId=row.getLong(3);
- String actionTime=row.getString(4);
- String searchKeyWard=row.getString(5);
- Long clickCategoryId=row.getLong(6);
- Long clickProducetId=row.getLong(7);
- String orderCategoryId=row.getString(8);
- String orderProducetId=row.getString(9);
- String payCategoryId=row.getString(10);
- String payProducetId=row.getString(11);
- SessionDetail sessionDetail=new SessionDetail();
- sessionDetail.set(taskId,userId,sessionId,pageId,actionTime,searchKeyWard,clickCategoryId,clickProducetId,orderCategoryId,orderProducetId,payCategoryId,payProducetId);
- sessionDetailList.add(sessionDetail);
- }
- DaoFactory.getSessionDetailDao().batchInsert(sessionDetailList);
- }
- });
-
}
//计算各个范围的占比,并持久化到数据库
- private static void calculateAndPersist(String value,Long taskId) {
+ private static void calculateAndPersist(String value, Long taskId) {
+ // 此方法用于根据传入的字符串value和任务ID taskId进行相关数据的计算,
+ // 并将计算结果封装成对象后持久化到数据库中,整体是数据处理及存储相关的逻辑。
+
//System.out.println(value);
- Long sessionCount=Long.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.SESSION_COUNT));
- //各个范围的访问时长
- Double visit_Length_1s_3s=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_1s_3s));
- Double visit_Length_4s_6s=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_4s_6s));
- Double visit_Length_7s_9s=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_7s_9s));
- Double visit_Length_10s_30s=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_10s_30s));
- Double visit_Length_30s_60s=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_30s_60s));
- Double visit_Length_1m_3m=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_1m_3m));
- Double visit_Length_3m_10m=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_3m_10m));
- Double visit_Length_10m_30m=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_10m_30m));
- Double visit_Length_30m=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_30m));
-
- //各个范围的访问步长
- Double step_Length_1_3=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.STEP_PERIOD_1_3));
- Double step_Length_4_6=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.STEP_PERIOD_4_6));
- Double step_Length_7_9=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.STEP_PERIOD_7_9));
- Double step_Length_10_30=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.STEP_PERIOD_10_30));
- Double step_Length_30_60=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.STEP_PERIOD_30_60));
- Double step_Length_60=Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.STEP_PERIOD_60));
-
- //访问时长对应的sesison占比,保留3位小数
- double visit_Length_1s_3s_ratio=NumberUtils.formatDouble(visit_Length_1s_3s/sessionCount,3);
- double visit_Length_4s_6s_ratio=NumberUtils.formatDouble(visit_Length_4s_6s/sessionCount,3);
- double visit_Length_7s_9s_ratio=NumberUtils.formatDouble(visit_Length_7s_9s/sessionCount,3);
- double visit_Length_10s_30s_ratio=NumberUtils.formatDouble(visit_Length_10s_30s/sessionCount,3);
- double visit_Length_30s_60s_ratio=NumberUtils.formatDouble(visit_Length_30s_60s/sessionCount,3);
- double visit_Length_1m_3m_ratio=NumberUtils.formatDouble(visit_Length_1m_3m/sessionCount,3);
- double visit_Length_3m_10m_ratio=NumberUtils.formatDouble(visit_Length_3m_10m/sessionCount,3);
- double visit_Length_10m_30m_ratio=NumberUtils.formatDouble(visit_Length_10m_30m/sessionCount,3);
- double visit_Length_30m_ratio=NumberUtils.formatDouble(visit_Length_30m/sessionCount,3);
-
- //访问步长对应的session占比,保留3位小数
- double step_Length_1_3_ratio= NumberUtils.formatDouble(step_Length_1_3/sessionCount,3);
- double step_Length_4_6_ratio=NumberUtils.formatDouble(step_Length_4_6/sessionCount,3);
- double step_Length_7_9_ratio=NumberUtils.formatDouble(step_Length_7_9/sessionCount,3);
- double c=NumberUtils.formatDouble(step_Length_10_30/sessionCount,3);
- double step_Length_30_60_ratio=NumberUtils.formatDouble(step_Length_30_60/sessionCount,3);
- double step_Length_60_ratio=NumberUtils.formatDouble(step_Length_60/sessionCount,3);
-
- SessionAggrStat sessionAggrStat=new SessionAggrStat();
- sessionAggrStat.set(taskId,sessionCount,visit_Length_1s_3s_ratio,visit_Length_4s_6s_ratio,
- visit_Length_7s_9s_ratio,visit_Length_10s_30s_ratio,visit_Length_30s_60s_ratio,
- visit_Length_1m_3m_ratio,visit_Length_3m_10m_ratio,visit_Length_10m_30m_ratio,visit_Length_30m_ratio
- ,step_Length_1_3_ratio,step_Length_4_6_ratio,step_Length_7_9_ratio,step_Length_7_9_ratio,step_Length_30_60_ratio,step_Length_60_ratio);
- List sessionAggrStatList=new ArrayList();
+ // 这行代码被注释掉了,原本可能是用于调试输出value的值,查看传入的字符串具体内容。
+
+ Long sessionCount = Long.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.SESSION_COUNT));
+ // 通过StringUtils工具类(自定义的用于字符串操作的工具类)的getFieldFromConcatString方法,
+ // 按照“|”作为分隔符从传入的value字符串中提取出对应Constants.SESSION_COUNT(应该是在Constants类中定义好的常量,
+ // 用于标识sessionCount在字符串中的位置等信息)这个字段对应的内容,然后将其转换为Long类型,赋值给sessionCount变量,
+ // 该变量用于记录会话数量相关信息。
+
+ // 各个范围的访问时长
+ Double visit_Length_1s_3s = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_1s_3s));
+ // 同样使用StringUtils工具类按照“|”分隔符从value字符串中提取出对应Constants.TIME_PERIOD_1s_3s字段对应的内容,
+ // 并转换为Double类型,赋值给visit_Length_1s_3s变量,用于记录访问时长在1秒到3秒这个范围的相关数据。
+
+ Double visit_Length_4s_6s = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_4s_6s));
+ // 从value字符串中提取对应Constants.TIME_PERIOD_4s_6s字段内容并转换为Double类型,赋值给visit_Length_4s_6s变量,
+ // 用于记录访问时长在4秒到6秒范围的数据。
+
+ Double visit_Length_7s_9s = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_7s_9s));
+ // 提取value字符串中对应Constants.TIME_PERIOD_7s_9s字段内容转换为Double类型,赋值给visit_Length_7s_9s变量,
+ // 代表访问时长在7秒到9秒范围的数据。
+
+ Double visit_Length_10s_30s = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_10s_30s));
+ // 按指定分隔符从value字符串中提取对应字段内容并转换为Double类型,赋值给visit_Length_10s_30s变量,
+ // 用于记录访问时长在10秒到30秒范围的数据。
+
+ Double visit_Length_30s_60s = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_30s_60s));
+ // 从value字符串提取对应字段内容转换为Double类型后赋值给visit_Length_30s_60s变量,
+ // 表示访问时长在30秒到60秒范围的数据。
+
+ Double visit_Length_1m_3m = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_1m_3m));
+ // 提取value字符串中对应Constants.TIME_PERIOD_1m_3m字段内容转换为Double类型,赋值给visit_Length_1m_3m变量,
+ // 用于记录访问时长在1分钟到3分钟范围的数据(这里的“m”应该表示分钟,结合业务场景理解时长范围)。
+
+ Double visit_Length_3m_10m = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_3m_10m));
+ // 按照分隔符从value字符串获取对应字段内容转换为Double类型,赋值给visit_Length_3m_10m变量,
+ // 代表访问时长在3分钟到10分钟范围的数据。
+
+ Double visit_Length_10m_30m = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_10m_30m));
+ // 从value字符串提取对应字段内容转换为Double类型后赋值给visit_Length_10m_30m变量,
+ // 用于记录访问时长在10分钟到30分钟范围的数据。
+
+ Double visit_Length_30m = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.TIME_PERIOD_30m));
+ // 提取value字符串中对应Constants.TIME_PERIOD_30m字段内容转换为Double类型,赋值给visit_Length_30m变量,
+ // 表示访问时长大于30分钟的数据(这里根据变量名及业务逻辑推测其含义)。
+
+ // 各个范围的访问步长
+ Double step_Length_1_3 = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.STEP_PERIOD_1_3));
+ // 使用StringUtils工具类从value字符串中提取对应Constants.STEP_PERIOD_1_3字段内容并转换为Double类型,
+ // 赋值给step_Length_1_3变量,用于记录访问步长在1到3这个范围的数据(具体单位等需结合业务确定)。
+
+ Double step_Length_4_6 = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.STEP_PERIOD_4_6));
+ // 从value字符串提取对应Constants.STEP_PERIOD_4_6字段内容转换为Double类型,赋值给step_Length_4_6变量,
+ // 代表访问步长在4到6范围的数据。
+
+ Double step_Length_7_9 = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.STEP_PERIOD_7_9));
+ // 按照分隔符从value字符串中获取对应字段内容转换为Double类型,赋值给step_Length_7_9变量,
+ // 用于记录访问步长在7到9范围的数据。
+
+ Double step_Length_10_30 = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.STEP_PERIOD_10_30));
+ // 提取value字符串中对应Constants.STEP_PERIOD_10_30字段内容转换为Double类型,赋值给step_Length_10_30变量,
+ // 表示访问步长在10到30范围的数据。
+
+ Double step_Length_30_60 = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.STEP_PERIOD_30_60));
+ // 从value字符串获取对应字段内容转换为Double类型后赋值给step_Length_30_60变量,
+ // 用于记录访问步长在30到60范围的数据。
+
+ Double step_Length_60 = Double.valueOf(StringUtils.getFieldFromConcatString(value,"\\|",Constants.STEP_PERIOD_60));
+ // 提取value字符串中对应Constants.STEP_PERIOD_60字段内容转换为Double类型,赋值给step_Length_60变量,
+ // 代表访问步长大于60的数据(根据变量名及业务场景推测其含义)。
+
+ // 访问时长对应的sesison占比,保留3位小数
+ double visit_Length_1s_3s_ratio = NumberUtils.formatDouble(visit_Length_1s_3s / sessionCount, 3);
+ // 先计算访问时长在1秒到3秒范围的数据(visit_Length_1s_3s)与会话数量(sessionCount)的比值,
+ // 然后通过NumberUtils工具类(自定义的用于数字处理的工具类,推测有格式化数字的功能)的formatDouble方法,
+ // 将该比值保留3位小数,结果赋值给visit_Length_1s_3s_ratio变量,用于表示此访问时长范围对应的会话占比情况。
+
+ double visit_Length_4s_6s_ratio = NumberUtils.formatDouble(visit_Length_4s_6s / sessionCount, 3);
+ // 计算访问时长在4秒到6秒范围的数据与会话数量的比值,并使用NumberUtils工具类保留3位小数,
+ // 赋值给visit_Length_4s_6s_ratio变量,代表该时长范围对应的会话占比。
+
+ double visit_Length_7s_9s_ratio = NumberUtils.formatDouble(visit_Length_7s_9s / sessionCount, 3);
+ // 计算访问时长在7秒到9秒范围的数据和会话数量的比值,经NumberUtils工具类格式化保留3位小数后,
+ // 赋值给visit_Length_7s_9s_ratio变量,用于记录此范围对应的会话占比情况。
+
+ double visit_Length_10s_30s_ratio = NumberUtils.formatDouble(visit_Length_10s_30s / sessionCount, 3);
+ // 计算访问时长在10秒到30秒范围的数据与会话数量的比值,通过NumberUtils工具类保留3位小数,
+ // 赋值给visit_Length_10s_30s_ratio变量,表示该时长范围对应的会话占比。
+
+ double visit_Length_30s_60s_ratio = NumberUtils.formatDouble(visit_Length_30s_60s / sessionCount, 3);
+ // 计算访问时长在30秒到60秒范围的数据和会话数量的比值,利用NumberUtils工具类保留3位小数后,
+ // 赋值给visit_Length_30s_60s_ratio变量,用于记录此范围对应的会话占比情况。
+
+ double visit_Length_1m_3m_ratio = NumberUtils.formatDouble(visit_Length_1m_3m / sessionCount, 3);
+ // 计算访问时长在1分钟到3分钟范围的数据与会话数量的比值,经NumberUtils工具类格式化保留3位小数,
+ // 赋值给visit_Length_1m_3m_ratio变量,代表该时长范围对应的会话占比。
+
+ double visit_Length_3m_10m_ratio = NumberUtils.formatDouble(visit_Length_3m_10m / sessionCount, 3);
+ // 计算访问时长在3分钟到10分钟范围的数据和会话数量的比值,使用NumberUtils工具类保留3位小数,
+ // 赋值给visit_Length_3m_10m_ratio变量,用于记录此范围对应的会话占比情况。
+
+ double visit_Length_10m_30m_ratio = NumberUtils.formatDouble(visit_Length_10m_30m / sessionCount, 3);
+ // 计算访问时长在10分钟到30分钟范围的数据与会话数量的比值,通过NumberUtils工具类保留3位小数,
+ // 赋值给visit_Length_10m_30m_ratio变量,表示该时长范围对应的会话占比。
+
+ double visit_Length_30m_ratio = NumberUtils.formatDouble(visit_Length_30m / sessionCount, 3);
+ // 计算访问时长大于30分钟的数据与会话数量的比值,利用NumberUtils工具类保留3位小数,
+ // 赋值给visit_Length_30m_ratio变量,用于记录此情况对应的会话占比。
+
+ // 访问步长对应的session占比,保留3位小数
+ double step_Length_1_3_ratio = NumberUtils.formatDouble(step_Length_1_3 / sessionCount, 3);
+ // 计算访问步长在1到3范围的数据(step_Length_1_3)与会话数量(sessionCount)的比值,
+ // 借助NumberUtils工具类的formatDouble方法保留3位小数,赋值给step_Length_1_3_ratio变量,
+ // 用于表示该访问步长范围对应的会话占比情况。
+
+ double step_Length_4_6_ratio = NumberUtils.formatDouble(step_Length_4_6 / sessionCount, 3);
+ // 计算访问步长在4到6范围的数据与会话数量的比值,经NumberUtils工具类格式化保留3位小数后,
+ // 赋值给step_Length_4_6_ratio变量,代表该步长范围对应的会话占比。
+
+ double step_Length_7_9_ratio = NumberUtils.formatDouble(step_Length_7_9 / sessionCount, 3);
+ // 计算访问步长在7到9范围的数据和会话数量的比值,使用NumberUtils工具类保留3位小数,
+ // 赋值给step_Length_7_9_ratio变量,用于记录此范围对应的会话占比情况。
+
+ double c = NumberUtils.formatDouble(step_Length_10_30 / sessionCount, 3);
+ // 计算访问步长在10到30范围的数据与会话数量的比值,通过NumberUtils工具类保留3位小数,
+ // 赋值给c变量(这里变量名可能不太符合规范,推测应该是step_Length_10_30_ratio之类更表意清晰的名称,需根据实际情况确认),
+ // 用于表示该步长范围对应的会话占比情况。
+
+ double step_Length_30_60_ratio = NumberUtils.formatDouble(step_Length_30_60 / sessionCount, 3);
+ // 计算访问步长在30到60范围的数据和会话数量的比值,利用NumberUtils工具类保留3位小数后,
+ // 赋值给step_Length_30_60_ratio变量,用于记录此范围对应的会话占比情况。
+
+ double step_Length_60_ratio = NumberUtils.formatDouble(step_Length_60 / sessionCount, 3);
+ // 计算访问步长大于60的数据与会话数量的比值,经NumberUtils工具类格式化保留3位小数,
+ // 赋值给step_Length_60_ratio变量,代表该情况对应的会话占比。
+
+ SessionAggrStat sessionAggrStat = new SessionAggrStat();
+ // 创建一个SessionAggrStat类型的对象sessionAggrStat,此类应该是自定义的用于封装要持久化到数据库的相关数据的实体类。
+
+ sessionAggrStat.set(taskId, sessionCount, visit_Length_1s_3s_ratio, visit_Length_4s_6s_ratio,
+ visit_Length_7s_9s_ratio, visit_Length_10s_30s_ratio, visit_Length_30s_60s_ratio,
+ visit_Length_1m_3m_ratio, visit_Length_3m_10m_ratio, visit_Length_10m_30m_ratio, visit_Length_30m_ratio
+ , step_Length_1_3_ratio, step_Length_4_6_ratio, step_Length_7_9_ratio, step_Length_7_9_ratio, step_Length_30_60_ratio, step_Length_60_ratio);
+ // 调用sessionAggrStat对象的set方法(假设SessionAggrStat类有此方法用于设置对象的各个属性值),
+ // 将前面计算好的任务ID、会话数量、各访问时长及访问步长对应的会话占比等数据设置到sessionAggrStat对象中,
+ // 完成对该对象属性的赋值操作,使其封装好要持久化到数据库的全部数据信息。
+
+ List sessionAggrStatList = new ArrayList();
+ // 创建一个名为sessionAggrStatList的ArrayList列表,用于存放SessionAggrStat类型的对象,
+ // 在这里主要是为了方便后续批量插入数据库操作,将单个封装好数据的对象放入列表中进行统一处理。
+
sessionAggrStatList.add(sessionAggrStat);
+ // 将前面创建并赋值好的sessionAggrStat对象添加到sessionAggrStatList列表中,准备进行批量插入数据库操作。
+
// 插入数据库
DaoFactory.getSessionAggrStatDao().batchInsert(sessionAggrStatList);
+ // 通过DaoFactory(应该是自定义的数据访问工厂类,用于获取数据库操作相关的DAO对象)的getSessionAggrStatDao方法,
+ // 获取到用于操作SessionAggrStat数据的DAO对象,然后调用其batchInsert方法,
+ // 将包含要持久化数据的sessionAggrStatList列表传入,实现将数据批量插入到数据库中的功能,完成整个数据持久化流程。
}
+
+
/**
* 获取top10热门品类
* @param taskId
* @param sessionId2DetailRDD
*/
- private static List> getTop10Category(Long taskId, JavaPairRDD sessionId2DetailRDD) {
- //1.第一步已抽离出方法getFilterFullInfoRDD
- //2。获取访问的品类id,访问过表示点击,下单,支付
- JavaPairRDD categoryRDD=sessionId2DetailRDD.flatMapToPair(new PairFlatMapFunction, Long, Long>() {
+ private static List> getTop10Category(Long taskId, JavaPairRDD sessionId2DetailRDD) {
+ // 此方法名为getTop10Category,作用是获取排名前10的品类相关信息(具体从返回值及后续代码逻辑推测),
+ // 接收一个任务ID(taskId)和一个JavaPairRDD类型的sessionId2DetailRDD作为参数,
+ // 下面的代码将基于这个RDD逐步提取、处理品类相关数据,这里先从获取访问的品类id开始着手处理。
+
+ // 1.第一步已抽离出方法getFilterFullInfoRDD
+ // 此处表明前面应该有一个名为getFilterFullInfoRDD的方法已经执行过了,它完成了一部分前置的数据处理操作,
+ // 不过这里并没有展示该方法具体的实现内容,但本方法是在此基础上继续后续流程的。
+
+ // 2。获取访问的品类id,访问过表示点击,下单,支付
+ JavaPairRDD categoryRDD = sessionId2DetailRDD.flatMapToPair(new PairFlatMapFunction, Long, Long>() {
+ // 调用sessionId2DetailRDD的flatMapToPair方法,传入一个实现了PairFlatMapFunction接口的匿名内部类实例。
+ // 这个接口用于定义将输入的键值对(此处输入类型是Tuple2,也就是sessionId2DetailRDD里元素的类型)
+ // 转换为零个、一个或多个新的键值对(输出类型为Tuple2,是即将生成的新JavaPairRDD的键值对类型)的逻辑,
+ // 目的在于从原始的RDD数据中提取出与访问品类相关的信息,并整理成新的键值对形式方便后续处理。
+
@Override
public Iterable> call(Tuple2 stringRowTuple2) throws Exception {
- Row row=stringRowTuple2._2;
- List> visitCategoryList=new ArrayList>();
- Long clickCategoryId=row.getLong(6);
- //点击品类的id
- if(clickCategoryId!=null)
- visitCategoryList.add(new Tuple2(clickCategoryId,clickCategoryId));
-
- if(row.get(8)!=null){
- String[] orderCategoryIdsSplited=row.getString(8).split(",");
- for (String orderCategoryId:
+ // 重写了PairFlatMapFunction接口中的call方法,当执行flatMapToPair操作时,针对sessionId2DetailRDD中的每一个元素(每个键值对),
+ // 都会调用这个call方法进行处理,参数stringRowTuple2就是当前正在处理的那个键值对元素,其类型符合接口定义中的Tuple2。
+
+ Row row = stringRowTuple2._2;
+ // 从传入的键值对stringRowTuple2中获取其值部分(是Row类型的数据),赋值给row变量。
+ // Row类型通常代表一行包含多个字段的数据,后续会从这个row中提取出与品类相关的各个字段信息,例如点击品类的id等。
+
+ List> visitCategoryList = new ArrayList>();
+ // 创建一个名为visitCategoryList的ArrayList列表,用于存放即将提取出来的与访问品类相关的键值对信息,
+ // 其键和值的类型都为Long,后续会根据不同的业务场景(点击、下单、支付)把相应的品类ID信息封装成键值对添加到这个列表中。
+
+ Long clickCategoryId = row.getLong(6);
+ // 从row数据行中获取索引为6的字段值(从代码上下文推测这个字段应该代表点击品类的ID),并将其转换为Long类型,赋值给clickCategoryId变量。
+ // 通过索引获取字段的方式表明Row对象内部的数据结构类似数组或者列表,每个索引位置对应不同的业务含义的字段,具体需要结合数据来源和定义来确定。
+
+ // 点击品类的id
+ if (clickCategoryId!= null)
+ visitCategoryList.add(new Tuple2(clickCategoryId, clickCategoryId));
+ // 判断点击品类的ID是否为空,如果不为空,说明存在点击品类相关的信息,
+ // 那么就创建一个键值对,其键和值都设置为该点击品类的ID(clickCategoryId),然后将这个键值对添加到visitCategoryList列表中,
+ // 这样做方便后续统计点击品类相关的情况以及和其他品类相关操作(如下单、支付品类信息)进行整合处理。
+
+ if (row.get(8)!= null) {
+ String[] orderCategoryIdsSplited = row.getString(8).split(",");
+ // 从row数据行中获取索引为8的字段(根据代码逻辑推测这个字段存储的是下单品类的ID集合,以逗号分隔的字符串形式存在),先判断其是否为空,
+ // 如果不为空,就通过split方法以逗号作为分隔符,将这个字符串拆分成一个字符串数组orderCategoryIdsSplited,数组中的每个元素就是一个下单品类的ID(以字符串形式呈现)。
+
+ for (String orderCategoryId :
orderCategoryIdsSplited) {
- visitCategoryList.add(new Tuple2(Long.valueOf(orderCategoryId),Long.valueOf(orderCategoryId)));
+ visitCategoryList.add(new Tuple2(Long.valueOf(orderCategoryId), Long.valueOf(orderCategoryId)));
+ // 遍历拆分后的下单品类ID字符串数组orderCategoryIdsSplited,对于其中的每个字符串形式的下单品类ID(orderCategoryId),
+ // 先将其转换为Long类型,然后创建一个键值对,键和值都设置为这个转换后的Long类型的下单品类ID,
+ // 最后将这个键值对添加到visitCategoryList列表中,用于记录下单的品类相关信息,方便后续统计和分析下单品类的情况。
}
}
- if(row.get(10)!=null){
- String[] payCategoryIdsSplited=row.getString(10).split(",");
- for (String payCategoryId:
+ if (row.get(10)!= null) {
+ String[] payCategoryIdsSplited = row.getString(10).split(",");
+ // 同样地,从row数据行中获取索引为10的字段(推测这个字段存储的是支付品类的ID集合,也是以逗号分隔的字符串形式),判断其是否为空,
+ // 若不为空,使用split方法以逗号作为分隔符将其拆分成字符串数组payCategoryIdsSplited,数组中的每个元素就是一个支付品类的ID(字符串形式)。
+
+ for (String payCategoryId :
payCategoryIdsSplited) {
- visitCategoryList.add(new Tuple2(Long.valueOf(payCategoryId),Long.valueOf(payCategoryId)));
+ visitCategoryList.add(new Tuple2(Long.valueOf(payCategoryId), Long.valueOf(payCategoryId)));
+ // 遍历支付品类ID字符串数组payCategoryIdsSplited,针对每个字符串形式的支付品类ID(payCategoryId),
+ // 将其转换为Long类型后创建一个键值对,键和值都设置为这个转换后的Long类型的支付品类ID,
+ // 再把这个键值对添加到visitCategoryList列表中,以此记录支付的品类相关信息,便于后续对支付品类情况进行统计和处理。
}
}
return visitCategoryList;
+ // 将包含了点击、下单、支付等访问品类相关键值对信息的visitCategoryList列表返回,
+ // 这些键值对将会构成新的JavaPairRDD(也就是前面定义的categoryRDD)中的元素,用于后续进一步的数据处理操作,比如去重、统计等。
}
});
- //需要去重
- categoryRDD=categoryRDD.distinct();
- //3。计算各个品类的点击,下单和支付次数
- // 3.1 计算点击品类的数量
- JavaPairRDD clickCategoryRDD = getLClickCategoryRDD(sessionId2DetailRDD);
-
- // 3.2 计算下单的品类的数量
- JavaPairRDD orderCategoryRDD= getOrderCategoryRDD(sessionId2DetailRDD);
- // 3.3 计算支付的品类的数量
- JavaPairRDD payCategoryRDD=getPayCategoryRDD(sessionId2DetailRDD);
- //4.将上述计算的三个字段进行join,注意这里是LeftOuterJoin,因为有些品类只是点击了
- JavaPairRDD categoryCountRDD=joinCategoryAndData(categoryRDD,clickCategoryRDD,orderCategoryRDD,payCategoryRDD);
- //5.自定义二次排序的key
- JavaPairRDD sortKeyCountRDD=categoryCountRDD.mapToPair(new PairFunction, CategorySortKey, String>() {
+ // 需要去重
+ categoryRDD = categoryRDD.distinct();
+// 调用categoryRDD的distinct方法对其进行去重操作。因为之前通过flatMapToPair操作提取品类ID信息时,
+// 可能存在重复的品类ID记录,去重可以保证后续基于品类ID进行的各种统计、计算及分析等操作数据的准确性,
+// 经过去重后categoryRDD中每个品类ID将是唯一的,方便后续处理步骤使用。
+
+// 3。计算各个品类的点击,下单和支付次数
+// 3.1 计算点击品类的数量
+ JavaPairRDD clickCategoryRDD = getLClickCategoryRDD(sessionId2DetailRDD);
+// 调用名为getLClickCategoryRDD的自定义方法,传入sessionId2DetailRDD作为参数,
+// 该方法的作用应该是从sessionId2DetailRDD这个包含详细会话数据的RDD中提取出与点击品类数量相关的信息,
+// 并返回一个JavaPairRDD类型的RDD(即clickCategoryRDD),其中键值对可能表示品类ID以及对应的点击次数等信息,
+// 用于后续和其他品类相关统计数据进行整合分析。
+
+// 3.2 计算下单的品类的数量
+ JavaPairRDD orderCategoryRDD = getOrderCategoryRDD(sessionId2DetailRDD);
+// 同样地,调用自定义的getOrderCategoryRDD方法,以sessionId2DetailRDD为参数,
+// 此方法旨在从给定的RDD中提取出与下单品类数量相关的数据,返回一个JavaPairRDD类型的orderCategoryRDD,
+// 其键值对大概包含了品类ID以及对应的下单次数等内容,方便后续综合统计各个品类的不同行为次数情况。
+
+// 3.3 计算支付的品类的数量
+ JavaPairRDD payCategoryRDD = getPayCategoryRDD(sessionId2DetailRDD);
+// 调用getPayCategoryRDD这个自定义方法,输入sessionId2DetailRDD,
+// 该方法负责从传入的RDD中提取出与支付品类数量相关的信息,生成并返回JavaPairRDD类型的payCategoryRDD,
+// 其中的键值对可能体现了品类ID和对应的支付次数等信息,为后续全面分析品类相关行为数据做准备。
+
+// 4.将上述计算的三个字段进行join,注意这里是LeftOuterJoin,因为有些品类只是点击了
+ JavaPairRDD categoryCountRDD = joinCategoryAndData(categoryRDD, clickCategoryRDD, orderCategoryRDD, payCategoryRDD);
+// 调用自定义的joinCategoryAndData方法,将前面已经获取到的categoryRDD(经过去重后包含品类ID的RDD)、
+// clickCategoryRDD(点击品类数量相关的RDD)、orderCategoryRDD(下单品类数量相关的RDD)以及payCategoryRDD(支付品类数量相关的RDD)作为参数传入,
+// 进行LeftOuterJoin(左外连接)操作。左外连接的意义在于,即使某些品类只有点击行为(也就是在下单和支付相关的RDD中不存在对应记录),
+// 也能在连接结果中保留这些品类的信息,确保最终得到的categoryCountRDD包含了所有品类的综合情况(点击、下单、支付次数等信息整合在一起),
+// 其返回的JavaPairRDD类型的categoryCountRDD,键可能是品类ID,值可能是整合了点击、下单、支付次数等相关信息的字符串,方便后续进一步处理。
+
+// 5.自定义二次排序的key
+ JavaPairRDD sortKeyCountRDD = categoryCountRDD.mapToPair(new PairFunction, CategorySortKey, String>() {
+ // 调用categoryCountRDD的mapToPair方法,传入一个实现了PairFunction接口的匿名内部类实例,
+ // 这个操作的目的是基于categoryCountRDD中的元素(类型为Tuple2),按照自定义的逻辑转换生成新的键值对,
+ // 新键值对的类型是Tuple2,也就是即将生成的sortKeyCountRDD的元素类型,通过自定义键的规则来为后续排序做准备。
@Override
public Tuple2 call(Tuple2 longStringTuple2) throws Exception {
- String countInfo=longStringTuple2._2;
- Long clickCount=Long.valueOf(StringUtils.getFieldFromConcatString(countInfo,"\\|",Constants.FIELD_CLICK_CATEGORY));
- Long orderCount=Long.valueOf(StringUtils.getFieldFromConcatString(countInfo,"\\|",Constants.FIELD_ORDER_CATEGORY));
- Long payCount=Long.valueOf(StringUtils.getFieldFromConcatString(countInfo,"\\|",Constants.FIELD_ORDER_CATEGORY));
- CategorySortKey key=new CategorySortKey();
- key.set(clickCount,orderCount,payCount);
- return new Tuple2(key,countInfo);
+ // 重写了PairFunction接口中的call方法,当执行mapToPair操作时,会针对categoryCountRDD中的每一个元素(每个Tuple2类型的键值对),
+ // 调用这个call方法来执行具体的转换逻辑,参数longStringTuple2就是当前正在处理的那个键值对元素。
+
+ String countInfo = longStringTuple2._2;
+ // 从传入的键值对longStringTuple2中获取其值部分(是一个字符串类型的数据,从变量名countInfo推测它包含了品类相关的各种统计信息,比如点击、下单、支付次数等),
+ // 并将其赋值给countInfo变量,后续将从这个字符串中提取出具体的次数信息用于构建排序的关键对象。
+
+ Long clickCount = Long.valueOf(StringUtils.getFieldFromConcatString(countInfo, "\\|", Constants.FIELD_CLICK_CATEGORY));
+ // 通过StringUtils工具类(自定义的用于字符串操作的工具类)的getFieldFromConcatString方法,
+ // 按照“|”作为分隔符从countInfo字符串中提取出对应Constants.FIELD_CLICK_CATEGORY(应该是在Constants类中定义好的常量,
+ // 用于标识点击品类次数在字符串中的位置等信息)这个字段对应的内容,然后将其转换为Long类型,赋值给clickCount变量,从而获取到点击品类的次数信息。
+
+ Long orderCount = Long.valueOf(StringUtils.getFieldFromConcatString(countInfo, "\\|", Constants.FIELD_ORDER_CATEGORY));
+ // 同样利用StringUtils工具类,从countInfo字符串中提取对应Constants.FIELD_ORDER_CATEGORY字段对应的内容,将其转换为Long类型,
+ // 赋值给orderCount变量,以此获取下单品类的次数信息(此处代码中两次使用了Constants.FIELD_ORDER_CATEGORY来提取字段,可能存在错误,
+ // 正常应该分别对应不同的常量来准确提取下单次数和支付次数,需结合实际Constants类定义来确认)。
+
+ Long payCount = Long.valueOf(StringUtils.getFieldFromConcatString(countInfo, "\\|", Constants.FIELD_ORDER_CATEGORY));
+ // 再次使用相同方式从countInfo字符串中提取对应Constants.FIELD_ORDER_CATEGORY字段对应的内容并转换为Long类型,赋值给payCount变量,
+ // 获取支付品类的次数信息(同样可能存在提取字段常量使用不当的问题,需检查修正)。
+
+ CategorySortKey key = new CategorySortKey();
+ key.set(clickCount, orderCount, payCount);
+ // 创建一个CategorySortKey类型的对象key,此类应该是自定义的用于封装排序关键信息的实体类,
+ // 通过调用其set方法(假设CategorySortKey类有这样的方法用于设置对象属性值),将前面获取到的点击品类次数、下单品类次数、支付品类次数等信息设置到key对象中,
+ // 以此构建出用于排序的关键对象,后续可以根据这个对象中包含的品类次数信息来决定数据的排序规则。
+
+ return new Tuple2(key, countInfo);
+ // 返回一个新的键值对,其键为构建好的CategorySortKey类型的排序关键对象key,值为原来的countInfo字符串(包含完整的品类统计信息),
+ // 这些新生成的键值对将构成新的JavaPairRDD(即前面定义的sortKeyCountRDD),用于后续按照自定义规则进行排序操作。
}
});
- JavaPairRDD sortedCategoryRDD=sortKeyCountRDD.sortByKey(false);
- //取出前10个,写入数据库
- List> top10CategoryList=sortedCategoryRDD.take(10);
- List top10Categories=new ArrayList();
- for(Tuple2 tuple2:top10CategoryList)
- {
- String countInfo=tuple2._2;
- Long categoryId=Long.valueOf(StringUtils.getFieldFromConcatString(countInfo,"\\|",Constants.FIELD_CATEGORY_ID));
- Long clickCount=Long.valueOf(StringUtils.getFieldFromConcatString(countInfo,"\\|",Constants.FIELD_CLICK_CATEGORY));
- Long orderCount=Long.valueOf(StringUtils.getFieldFromConcatString(countInfo,"\\|",Constants.FIELD_ORDER_CATEGORY));
- Long payCount=Long.valueOf(StringUtils.getFieldFromConcatString(countInfo,"\\|",Constants.FIELD_ORDER_CATEGORY));
- Top10Category top10Category=new Top10Category();
- top10Category.set(taskId,categoryId,clickCount,orderCount,payCount);
+
+
+
+ JavaPairRDD sortedCategoryRDD = sortKeyCountRDD.sortByKey(false);
+// 调用sortKeyCountRDD的sortByKey方法,传入参数false,表示按照键(CategorySortKey类型)进行降序排序。
+// 这里的键(CategorySortKey)包含了之前构建的与品类相关的点击、下单、支付次数等用于排序的关键信息,
+// 通过这种排序方式,可以将品类数据按照设定的规则有序排列,使得访问量等综合情况更突出的品类排在前面,方便后续取出排名靠前的品类信息,
+// 排序后的结果存储在新的JavaPairRDD类型的sortedCategoryRDD中。
+
+// 取出前10个,写入数据库
+ List> top10CategoryList = sortedCategoryRDD.take(10);
+// 调用sortedCategoryRDD的take方法,该方法会从已经排好序的sortedCategoryRDD中取出前10个元素,
+// 每个元素是一个Tuple2类型的键值对,包含了品类相关的排序关键信息(键部分)以及完整的品类统计信息(值部分),
+// 取出的这10个元素组成的列表被赋值给top10CategoryList变量,这个列表就代表了访问量等综合情况排名前10的品类相关信息,后续将基于这些信息进行数据库持久化等操作。
+
+ List top10Categories = new ArrayList();
+// 创建一个名为top10Categories的ArrayList列表,用于存放Top10Category类型的对象。
+// Top10Category应该是自定义的用于封装要持久化到数据库的前10品类详细信息的实体类,接下来的循环操作会将提取出来的相关数据封装成此类对象添加到这个列表中,
+// 以便后续进行批量插入数据库的操作。
+
+ for (Tuple2 tuple2 : top10CategoryList) {
+ // 开始遍历top10CategoryList列表,其中每个元素tuple2就是包含了排名前10品类相关信息的键值对,通过遍历可以依次提取每个品类的详细信息进行封装处理。
+ String countInfo = tuple2._2;
+ // 从当前遍历的键值对tuple2中获取其值部分(也就是包含品类详细统计信息的字符串,从前面代码逻辑可知这个字符串包含了品类ID、点击次数等多种信息),
+ // 并将其赋值给countInfo变量,后续将从这个字符串中按照特定分隔符提取出具体的各项信息,用于构建Top10Category对象。
+
+ Long categoryId = Long.valueOf(StringUtils.getFieldFromConcatString(countInfo, "\\|", Constants.FIELD_CATEGORY_ID));
+ // 通过StringUtils工具类(自定义的用于字符串操作的工具类)的getFieldFromConcatString方法,
+ // 按照“|”作为分隔符从countInfo字符串中提取出对应Constants.FIELD_CATEGORY_ID(应该是在Constants类中定义好的常量,用于标识品类ID在字符串中的位置等信息)
+ // 这个字段对应的内容,然后将其转换为Long类型,赋值给categoryId变量,从而获取到当前品类的ID信息。
+
+ Long clickCount = Long.valueOf(StringUtils.getFieldFromConcatString(countInfo, "\\|", Constants.FIELD_CLICK_CATEGORY));
+ // 同样利用StringUtils工具类,从countInfo字符串中提取对应Constants.FIELD_CLICK_CATEGORY字段对应的内容,并转换为Long类型,
+ // 赋值给clickCount变量,以此获取该品类的点击次数信息,方便后续将这些准确的业务数据封装到对象中持久化到数据库。
+
+ Long orderCount = Long.valueOf(StringUtils.getFieldFromConcatString(countInfo, "\\|", Constants.FIELD_ORDER_CATEGORY));
+ // 从countInfo字符串中提取对应Constants.FIELD_ORDER_CATEGORY字段对应的内容并转换为Long类型,赋值给orderCount变量,
+ // 这样就获取到了该品类的下单次数信息,用于构建完整的Top10Category对象,记录品类的下单行为情况。
+
+ Long payCount = Long.valueOf(StringUtils.getFieldFromConcatString(countInfo, "\\|", Constants.FIELD_ORDER_CATEGORY));
+ // 再次使用StringUtils工具类按照相同分隔符从countInfo字符串中提取对应Constants.FIELD_ORDER_CATEGORY字段对应的内容,将其转换为Long类型,
+ // 赋值给payCount变量,获取该品类的支付次数信息(此处代码中两次使用Constants.FIELD_ORDER_CATEGORY来提取字段,可能存在错误,
+ // 正常应该分别对应不同的常量来准确提取下单次数和支付次数,需结合实际Constants类定义来确认)。
+
+ Top10Category top10Category = new Top10Category();
+ // 创建一个Top10Category类型的对象top10Category,此类是用于封装前10品类详细数据的自定义实体类,接下来将把提取到的各项品类信息设置到这个对象中。
+
+ top10Category.set(taskId, categoryId, clickCount, orderCount, payCount);
+ // 调用top10Category对象的set方法(假设Top10Category类有此方法用于设置对象的各个属性值),
+ // 将外部传入的任务ID(taskId)以及前面提取出来的品类ID、点击次数、下单次数、支付次数等信息设置到top10Category对象中,
+ // 完成对该对象的属性赋值操作,使其封装好了要持久化到数据库的前10品类的详细数据信息。
+
top10Categories.add(top10Category);
+ // 将封装好数据的top10Category对象添加到top10Categories列表中,通过循环不断添加,最终这个列表将包含所有排名前10品类的完整封装对象,
+ // 准备进行批量插入数据库的操作。
}
- //插入数据库
+
+// 插入数据库
DaoFactory.getTop10CategoryDao().batchInsert(top10Categories);
+// 通过DaoFactory(应该是自定义的数据访问工厂类,用于获取数据库操作相关的DAO对象)的getTop10CategoryDao方法,
+// 获取到用于操作Top10Category数据的DAO对象,然后调用其batchInsert方法,
+// 将包含要持久化数据的top10Categories列表传入,实现将排名前10品类的详细信息批量插入到数据库中的功能,完成数据持久化的操作流程。
+
return top10CategoryList;
- }
+// 最后将包含排名前10品类相关信息(以Tuple2类型的键值对形式存在)的top10CategoryList列表返回,
+// 方便外部代码根据需要进一步使用这些数据,比如在其他地方展示、进行关联分析等操作。
@@ -1175,300 +1443,722 @@ public class UserVisitAnalyze {
* @param payCategoryRDD
* @return
*/
- private static JavaPairRDD joinCategoryAndData(JavaPairRDD categoryRDD, JavaPairRDD clickCategoryRDD, JavaPairRDD orderCategoryRDD, JavaPairRDD payCategoryRDD) {
- JavaPairRDD>> tmpJoinRDD=categoryRDD.leftOuterJoin(clickCategoryRDD);
+ private static JavaPairRDD joinCategoryAndData(JavaPairRDD categoryRDD, JavaPairRDD clickCategoryRDD, JavaPairRDD orderCategoryRDD, JavaPairRDD payCategoryRDD) {
+ // 此方法名为joinCategoryAndData,作用是将不同来源的品类相关数据(品类ID以及对应的点击、下单、支付次数等信息)进行关联整合,
+ // 接收四个JavaPairRDD类型的参数,分别是categoryRDD(包含品类ID信息)、clickCategoryRDD(点击品类次数相关信息)、
+ // orderCategoryRDD(下单品类次数相关信息)以及payCategoryRDD(支付品类次数相关信息),最终返回一个整合好数据的JavaPairRDD类型的结果。
+
+ JavaPairRDD>> tmpJoinRDD = categoryRDD.leftOuterJoin(clickCategoryRDD);
+ // 首先对categoryRDD和clickCategoryRDD进行左外连接(leftOuterJoin)操作。左外连接的特点是,以categoryRDD中的元素为基础,
+ // 对于categoryRDD中的每个品类ID,尝试在clickCategoryRDD中查找对应的点击次数信息,如果能找到,则将品类ID与对应的点击次数信息组合在一起;
+ // 如果在clickCategoryRDD中找不到对应的点击次数(即该品类可能没有点击行为),则点击次数部分会用com.google.common.base.Optional类型表示,
+ // 其中Optional用于处理可能存在或不存在的值的情况(在这里表示可能不存在点击次数的情况)。连接后的结果是一个新的JavaPairRDD,
+ // 其键依然是品类ID(Long类型),值是一个包含两个元素的Tuple2,第一个元素是品类ID(与键相同,重复出现,方便后续处理),
+ // 第二个元素是Optional类型,表示对应的点击次数(可能存在也可能不存在),这个新的RDD被赋值给tmpJoinRDD变量,用于后续进一步处理。
+
+ JavaPairRDD tmpRDD = tmpJoinRDD.mapToPair(new PairFunction>>, Long, String>() {
+ // 调用tmpJoinRDD的mapToPair方法,传入一个实现了PairFunction接口的匿名内部类实例,目的是基于tmpJoinRDD中的元素(类型为Tuple2>>),
+ // 按照自定义的逻辑转换生成新的键值对,新键值对的类型是Tuple2,也就是即将生成的tmpRDD的元素类型,这里主要是将前面连接后的复杂数据结构进行整理,提取关键信息并转换格式。
+
+ @Override
+ public Tuple2 call(Tuple2>> longTuple2Tuple2) throws Exception {
+ // 重写了PairFunction接口中的call方法,当执行mapToPair操作时,会针对tmpJoinRDD中的每一个元素(每个Tuple2>>类型的键值对),
+ // 调用这个call方法来执行具体的转换逻辑,参数longTuple2Tuple2就是当前正在处理的那个键值对元素。
+
+ Long categoryId = longTuple2Tuple2._1;
+ // 从传入的键值对longTuple2Tuple2中获取其键部分(也就是品类ID),赋值给categoryId变量,后续将基于这个品类ID来构建最终整合后的数据信息。
+
+ com.google.common.base.Optional clickIOptional = longTuple2Tuple2._2._2;
+ // 从longTuple2Tuple2的值部分(是一个Tuple2>类型)中获取第二个元素,即表示点击次数的Optional类型的对象,
+ // 赋值给clickIOptional变量,用于判断是否存在点击次数以及获取具体的点击次数值(如果存在的话)。
+
+ Long clickCount = 0L;
+ // 初始化一个Long类型的变量clickCount,并赋值为0,用于后续在点击次数不存在(Optional中无值)的情况下作为默认值使用,保证数据结构的一致性。
+
+ if (clickIOptional.isPresent()) {
+ clickCount = clickIOptional.get();
+ }
+ // 通过调用isPresent方法判断clickIOptional中是否存在值(也就是是否有对应的点击次数),如果存在,则通过get方法获取其中存储的点击次数值,
+ // 并赋值给clickCount变量,这样就得到了当前品类的实际点击次数(如果有的话)。
- JavaPairRDD tmpRDD=tmpJoinRDD.mapToPair(new PairFunction>>, Long, String>() {
- @Override
- public Tuple2 call(Tuple2>> longTuple2Tuple2) throws Exception {
- Long categoryId=longTuple2Tuple2._1;
- com.google.common.base.Optional clickIOptional=longTuple2Tuple2._2._2;
- Long clickCount=0L;
- if(clickIOptional.isPresent())
- {
- clickCount=clickIOptional.get();
+ String value = Constants.FIELD_CATEGORY_ID + "=" + categoryId + "|" + Constants.FIELD_CLICK_CATEGORY + "=" + clickCount;
+ // 根据一定的格式规则构建一个字符串value,将品类ID(通过Constants.FIELD_CATEGORY_ID常量标识,应该是在Constants类中定义好的用于表示品类ID字段的相关常量)和实际的点击次数(clickCount)
+ // 以“字段名=值”的形式,并用“|”作为分隔符连接起来,形成一个包含品类ID和点击次数信息的字符串,方便后续继续整合下单、支付次数等信息以及持久化等操作使用。
+
+ return new Tuple2(categoryId, value);
+ // 返回一个新的键值对,键为当前的品类ID(categoryId),值为构建好的包含品类ID和点击次数信息的字符串(value),
+ // 这些新生成的键值对将构成新的JavaPairRDD(即前面定义的tmpRDD),用于后续继续和下单、支付次数等数据进行关联整合操作。
}
+ });
- String value=Constants.FIELD_CATEGORY_ID+"="+categoryId+"|"+Constants.FIELD_CLICK_CATEGORY+"="+clickCount;
- return new Tuple2(categoryId,value);
- }
- });
- //join下单的次数
- tmpRDD=tmpRDD.leftOuterJoin(orderCategoryRDD).mapToPair(new PairFunction>>, Long, String>() {
- @Override
- public Tuple2 call(Tuple2>> longTuple2Tuple2) throws Exception {
- Long categoryId=longTuple2Tuple2._1;
- com.google.common.base.Optional clickIOptional=longTuple2Tuple2._2._2;
- Long clickCount=0L;
- String value=longTuple2Tuple2._2._1;
- if(clickIOptional.isPresent())
- {
- clickCount=clickIOptional.get();
+ // join下单的次数
+ tmpRDD = tmpRDD.leftOuterJoin(orderCategoryRDD).mapToPair(new PairFunction>>, Long, String>() {
+ // 在上一步得到的tmpRDD基础上,先对其与orderCategoryRDD进行左外连接操作,然后再调用mapToPair方法,传入一个实现了PairFunction接口的匿名内部类实例,
+ // 目的同样是对连接后的结果数据进行整理转换,将下单次数信息整合到之前已经包含品类ID和点击次数信息的字符串中,进一步完善每个品类的综合数据信息。
+
+ @Override
+ public Tuple2 call(Tuple2>> longTuple2Tuple2) throws Exception {
+ // 重写的call方法,在执行相关操作时针对连接后的数据元素(每个元素是Tuple2>>类型的键值对)进行处理,
+ // 参数longTuple2Tuple2就是当前正在处理的那个键值对元素。
+
+ Long categoryId = longTuple2Tuple2._1;
+ // 从传入的键值对longTuple2Tuple2中获取其键部分,也就是品类ID,赋值给categoryId变量,用于后续构建整合后的数据信息,确保数据始终围绕同一个品类进行处理。
+
+ com.google.common.base.Optional clickIOptional = longTuple2Tuple2._2._2;
+ // 从longTuple2Tuple2的值部分(Tuple2>类型)中获取第二个元素,即表示下单次数的Optional类型的对象,
+ // 赋值给clickIOptional变量,用于判断是否存在下单次数以及后续获取具体的下单次数值(如果存在的话)。
+
+ Long clickCount = 0L;
+ // 初始化一个Long类型的变量clickCount并赋值为0,作为下单次数不存在时的默认值,保证数据结构完整性,方便后续统一处理不同情况的数据。
+
+ String value = longTuple2Tuple2._2._1;
+ // 从longTuple2Tuple2的值部分中获取第一个元素,也就是之前已经整合好的包含品类ID和点击次数信息的字符串,赋值给value变量,
+ // 后续将在这个字符串基础上继续添加下单次数等信息,逐步完善每个品类的完整数据记录。
+
+ if (clickIOptional.isPresent()) {
+ clickCount = clickIOptional.get();
+ }
+ // 通过调用isPresent方法判断clickIOptional中是否存在值(即是否有对应的下单次数),若存在,则使用get方法获取其中存储的下单次数值,
+ // 并赋值给clickCount变量,这样就得到了当前品类的实际下单次数(如果有的话)。
+
+ value = value + "|" + Constants.FIELD_ORDER_CATEGORY + "=" + clickCount;
+ // 将获取到的下单次数信息按照“字段名=值”的格式(通过Constants.FIELD_ORDER_CATEGORY常量标识下单次数字段相关信息),
+ // 并用“|”作为分隔符添加到之前的value字符串后面,使得value字符串进一步整合了下单次数信息,形成包含品类ID、点击次数、下单次数的综合信息字符串。
+
+ return new Tuple2(categoryId, value);
+ // 返回一个新的键值对,键为品类ID(categoryId),值为更新后的包含品类ID、点击次数、下单次数信息的字符串(value),
+ // 这些新的键值对将重新构成tmpRDD(覆盖之前的tmpRDD内容),使其包含更全面的品类相关数据,用于后续继续整合支付次数等信息。
}
+ });
- value=value+"|"+Constants.FIELD_ORDER_CATEGORY+"="+clickCount;
- return new Tuple2(categoryId,value);
- }
- });
- //join支付的次数
- tmpRDD=tmpRDD.leftOuterJoin(payCategoryRDD).mapToPair(new PairFunction>>, Long, String>() {
- @Override
- public Tuple2 call(Tuple2>> longTuple2Tuple2) throws Exception {
- Long categoryId=longTuple2Tuple2._1;
- com.google.common.base.Optional clickIOptional=longTuple2Tuple2._2._2;
- Long clickCount=0L;
- String value=longTuple2Tuple2._2._1;
- if(clickIOptional.isPresent())
- {
- clickCount=clickIOptional.get();
+ // join支付的次数
+ tmpRDD = tmpRDD.leftOuterJoin(payCategoryRDD).mapToPair(new PairFunction>>, Long, String>() {
+ // 继续在已经整合了品类ID、点击次数、下单次数信息的tmpRDD基础上,与payCategoryRDD进行左外连接操作,然后调用mapToPair方法,
+ // 通过传入的匿名内部类实例定义的逻辑,将支付次数信息也整合到现有的每个品类的数据字符串中,最终形成完整的包含品类各种行为次数信息的综合数据结构。
+
+ @Override
+ public Tuple2 call(Tuple2>> longTuple2Tuple2) throws Exception {
+ // 重写的call方法,用于处理当前连接后的数据元素(每个元素是Tuple2>>类型的键值对),
+ // 参数longTuple2Tuple2就是正在处理的那个键值对元素。
+
+ Long categoryId = longTuple2Tuple2._1;
+ // 从传入的键值对longTuple2Tuple2中获取其键部分,也就是品类ID,赋值给categoryId变量,确保后续所有操作都是围绕这个品类ID对应的信息进行整合完善。
+
+ com.google.common.base.Optional clickIOptional = longTuple2Tuple2._2._2;
+ // 从longTuple2Tuple2的值部分(Tuple2>类型)中获取第二个元素,即表示支付次数的Optional类型的对象,
+ // 赋值给clickIOptional变量,用于判断是否存在支付次数以及后续获取具体的支付次数值(如果存在的话)。
+
+ Long clickCount = 0L;
+ // 初始化一个Long类型的变量clickCount并赋值为0,作为支付次数不存在时的默认值,保证数据结构统一,便于统一处理不同情况的数据记录。
+
+ String value = longTuple2Tuple2._2._1;
+ // 从longTuple2Tuple2的值部分获取第一个元素,也就是已经整合了品类ID、点击次数、下单次数信息的字符串,赋值给value变量,
+ // 后续将在此字符串基础上添加支付次数信息,形成最终完整的品类综合数据字符串。
+
+ if (clickIOptional.isPresent()) {
+ clickCount = clickIOptional.get();
+ }
+ // 通过调用isPresent方法判断clickIOptional中是否存在值(即是否有对应的支付次数),若存在,则使用get方法获取其中存储的支付次数值,
+ // 并赋值给clickCount变量,这样就得到了当前品类的实际支付次数(如果有的话)。
+
+ value = value + "|" + Constants.FIELD_PAY_CATEGORY + "=" + clickCount;
+ // 按照“字段名=值”的格式(通过Constants.FIELD_PAY_CATEGORY常量标识支付次数字段相关信息),
+ // 以“|”作为分隔符将支付次数信息添加到value字符串后面,使得value字符串最终整合了品类ID、点击次数、下单次数、支付次数等所有相关信息,形成完整的综合数据记录字符串。
+
+ return new Tuple2(categoryId, value);
+ // 返回一个新的键值对,键为品类ID(categoryId),值为包含了品类ID以及点击、下单、支付次数等完整信息的字符串(value),
+ // 这些新生成的键值对构成更新后的tmpRDD,现在tmpRDD中每个元素的字符串值包含了该品类的全面行为次数统计信息,准备返回给调用者使用。
}
+ });
+
+ return tmpRDD;
+ // 将经过多次连接和数据整合操作后得到的tmpRDD返回,这个RDD的元素是键值对,键为品类ID,值为一个包含了该品类的点击、下单、支付次数等详细统计信息的字符串,
+ // 方便外部代码基于这个整合好的数据进行后续操作,比如排序、取前N条数据、持久化到数据库等处理。
+ }
+
+
- value=value+"|"+Constants.FIELD_PAY_CATEGORY+"="+clickCount;
- return new Tuple2(categoryId,value);
- }
- });
- return tmpRDD;
- }
//后去支付品类RDD
- private static JavaPairRDD getPayCategoryRDD(JavaPairRDD sessionId2DetailRDD) {
- JavaPairRDD payActionRDD=sessionId2DetailRDD.filter(new Function, Boolean>() {
- @Override
- public Boolean call(Tuple2 stringRowTuple2) throws Exception {
- Row row=stringRowTuple2._2;
- String categoryIds=row.getString(10);
- if(categoryIds==null||"".equals(categoryIds)) return false;
- return true;
- }
- });
- //映射成为新的Pair
- JavaPairRDD payCategoryRDD=payActionRDD.flatMapToPair(new PairFlatMapFunction, Long, Long>() {
- @Override
- public Iterable> call(Tuple2 stringRowTuple2) throws Exception {
- List> orderCategoryIds=new ArrayList>();
- Row row=stringRowTuple2._2;
- String payCategoryIdsSplited[]=row.getString(10).split(",");
- for (String payCategoryId:
- payCategoryIdsSplited) {
- orderCategoryIds.add(new Tuple2(Long.valueOf(payCategoryId),Long.valueOf(payCategoryId)));
+ private static JavaPairRDD getPayCategoryRDD(JavaPairRDD sessionId2DetailRDD) {
+ // 此方法名为getPayCategoryRDD,其目的是从给定的JavaPairRDD类型的sessionId2DetailRDD中提取出与支付品类相关的信息,
+ // 经过一系列处理后,最终返回一个JavaPairRDD类型的结果,其中键和值大概率都与支付品类相关(比如品类ID以及对应的支付次数等,从后续代码逻辑推测)。
+
+ JavaPairRDD payActionRDD = sessionId2DetailRDD.filter(new Function, Boolean>() {
+ // 调用sessionId2DetailRDD的filter方法,传入一个实现了Function接口的匿名内部类实例,
+ // 这个filter操作的作用是对sessionId2DetailRDD中的元素(每个元素是Tuple2类型的键值对)进行筛选,
+ // 只保留满足特定条件的元素,生成一个新的JavaPairRDD类型的payActionRDD,用于后续进一步提取支付品类相关数据。
+
+ @Override
+ public Boolean call(Tuple2 stringRowTuple2) throws Exception {
+ // 重写了Function接口中的call方法,当执行filter操作时,会针对sessionId2DetailRDD中的每一个元素(即每个Tuple2类型的键值对)调用这个call方法,
+ // 参数stringRowTuple2就是当前正在处理的那个键值对元素,其类型符合接口定义中的Tuple2。
+
+ Row row = stringRowTuple2._2;
+ // 从传入的键值对stringRowTuple2中获取其值部分(也就是Row类型的数据),赋值给row变量,
+ // Row类型通常代表一行包含多个字段的数据,后续将从这个row中提取出与支付品类相关的字段信息。
+
+ String categoryIds = row.getString(10);
+ // 从row数据行中获取索引为10的字段(从代码上下文推测这个字段存储的是支付品类的ID集合,以字符串形式存在,不过具体要结合数据结构定义确定),
+ // 并将其赋值给categoryIds变量,后续将基于这个变量来判断是否存在支付品类相关信息。
+
+ if (categoryIds == null || "".equals(categoryIds)) return false;
+ // 判断categoryIds是否为空(即不存在支付品类ID集合)或者是否为空字符串(可能表示没有实际有效的支付品类ID),
+ // 如果满足这两种情况之一,则返回false,表示当前这个键值对对应的元素不符合筛选条件,将会被过滤掉;
+ // 只有当categoryIds不为空且不是空字符串时,才表示存在支付品类相关信息,该元素符合筛选条件,会保留在后续生成的payActionRDD中。
+
+ return true;
+ // 返回true,表示当前处理的这个键值对对应的元素满足筛选条件,应该保留在经过筛选后的payActionRDD中,用于后续进一步处理。
}
- return orderCategoryIds;
- }
- });
+ });
+
+ // 映射成为新的Pair
+ JavaPairRDD payCategoryRDD = payActionRDD.flatMapToPair(new PairFlatMapFunction, Long, Long>() {
+ // 调用payActionRDD的flatMapToPair方法,传入一个实现了PairFlatMapFunction接口的匿名内部类实例,
+ // 此操作的目的是将payActionRDD中的元素(类型为Tuple2)按照自定义的逻辑转换为零个、一个或多个新的键值对(输出类型为Tuple2),
+ // 以便将支付品类相关信息整理成更便于后续处理(比如计算支付品类次数等)的键值对形式。
+
+ @Override
+ public Iterable> call(Tuple2 stringRowTuple2) throws Exception {
+ // 重写了PairFlatMapFunction接口中的call方法,当执行flatMapToPair操作时,会针对payActionRDD中的每一个元素(每个Tuple2类型的键值对)调用这个call方法,
+ // 参数stringRowTuple2就是当前正在处理的那个键值对元素,其类型符合接口定义中的Tuple2。
+
+ List> orderCategoryIds = new ArrayList>();
+ // 创建一个名为orderCategoryIds的ArrayList列表,用于存放即将生成的与支付品类相关的键值对信息,
+ // 其键和值的类型都为Long,后续会根据从数据中提取出的支付品类ID来构建并添加这些键值对到列表中。
+
+ Row row = stringRowTuple2._2;
+ // 从传入的键值对stringRowTuple2中获取其值部分(即Row类型的数据),赋值给row变量,再次获取数据行对象,方便后续提取支付品类ID信息。
+
+ String payCategoryIdsSplited[] = row.getString(10).split(",");
+ // 从row数据行中获取索引为10的字段(前面已提到该字段存储支付品类的ID集合,以逗号分隔的字符串形式存在),
+ // 通过split方法以逗号作为分隔符将其拆分成一个字符串数组payCategoryIdsSplited,数组中的每个元素就是一个支付品类的ID(以字符串形式呈现)。
+
+ for (String payCategoryId :
+ payCategoryIdsSplited) {
+ orderCategoryIds.add(new Tuple2(Long.valueOf(payCategoryId), Long.valueOf(payCategoryId)));
+ // 遍历拆分后的支付品类ID字符串数组payCategoryIdsSplited,对于其中的每个字符串形式的支付品类ID(payCategoryId),
+ // 先将其转换为Long类型,然后创建一个键值对,键和值都设置为这个转换后的Long类型的支付品类ID,
+ // 最后将这个键值对添加到orderCategoryIds列表中,这样就将每个支付品类ID整理成了方便后续统计等操作的键值对形式。
+ }
+ return orderCategoryIds;
+ // 返回包含了所有支付品类相关键值对信息的orderCategoryIds列表,这些键值对将会构成新的JavaPairRDD(即前面定义的payCategoryRDD)中的元素,
+ // 用于后续计算支付品类的次数等操作。
+ }
+ });
+
+ // 计算次数
+ JavaPairRDD payCategoryCountRDD = payCategoryRDD.reduceByKey(new Function2() {
+ // 调用payCategoryRDD的reduceByKey方法,传入一个实现了Function2接口的匿名内部类实例,
+ // 这个操作的目的是对payCategoryRDD中具有相同键(这里推测键是支付品类ID)的元素的值(同样推测是与支付品类相关的某个计数信息,比如出现次数等)进行聚合操作,
+ // 最终生成一个新的JavaPairRDD类型的payCategoryCountRDD,其值就是经过聚合计算后的每个支付品类对应的次数等统计信息。
+
+ @Override
+ public Long call(Long aLong, Long aLong2) throws Exception {
+ // 重写了Function2接口中的call方法,当执行reduceByKey操作时,对于payCategoryRDD中具有相同键的每一组元素,
+ // 会调用这个call方法来执行具体的聚合逻辑,参数aLong和aLong2就是同一组中不同元素的值部分(都是Long类型,根据前面推测可能是计数相关的值)。
+
+ return aLong + aLong2;
+ // 在这里定义的聚合逻辑很简单,就是将同一组中不同元素的值相加,也就是将同一个支付品类ID对应的多个计数信息进行累加,
+ // 得到这个支付品类总的计数(比如总的支付次数等,结合业务逻辑推测),返回的结果就是聚合后该支付品类对应的最终次数信息。
+ }
+ });
+
+ return payCategoryCountRDD;
+ // 将经过前面一系列处理,最终得到的包含支付品类ID以及对应的支付次数信息(通过聚合计算得出)的JavaPairRDD类型的payCategoryCountRDD返回,
+ // 方便外部代码根据需要进一步使用这些数据,例如和其他品类相关数据(如点击品类、下单品类的数据)进行整合分析等操作。
+ }
- //计算次数
- JavaPairRDD payCategoryCountRDD=payCategoryRDD.reduceByKey(new Function2() {
- @Override
- public Long call(Long aLong, Long aLong2) throws Exception {
- return aLong+aLong2;
- }
- });
- return payCategoryCountRDD;
- }
//获取下单品类RDD
- private static JavaPairRDD getOrderCategoryRDD(JavaPairRDD sessionId2DetailRDD) {
- JavaPairRDD orderActionRDD=sessionId2DetailRDD.filter(new Function, Boolean>() {
- @Override
- public Boolean call(Tuple2 stringRowTuple2) throws Exception {
- Row row=stringRowTuple2._2;
- String categoryIds=row.getString(8);
- if(categoryIds==null||"".equals(categoryIds)) return false;
- return true;
- }
- });
- //映射成为新的Pair
- JavaPairRDD orderCategoryRDD=orderActionRDD.flatMapToPair(new PairFlatMapFunction, Long, Long>() {
- @Override
- public Iterable> call(Tuple2 stringRowTuple2) throws Exception {
- List> orderCategoryIds=new ArrayList>();
- Row row=stringRowTuple2._2;
- String orderCategoryIdsSplited[]=row.getString(8).split(",");
- for (String orderCategoryId:
- orderCategoryIdsSplited) {
- orderCategoryIds.add(new Tuple2(Long.valueOf(orderCategoryId),Long.valueOf(orderCategoryId)));
+ private static JavaPairRDD getOrderCategoryRDD(JavaPairRDD